From 17897dc7e2ed84e644e362d93a24a7bdae95245f Mon Sep 17 00:00:00 2001 From: Gergely POLONKAI Date: Wed, 28 Nov 2012 11:48:40 +0100 Subject: [PATCH 1/2] Removed unneeded base.html.twig --- app/Resources/views/base.html.twig | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 app/Resources/views/base.html.twig diff --git a/app/Resources/views/base.html.twig b/app/Resources/views/base.html.twig deleted file mode 100644 index bafd28d..0000000 --- a/app/Resources/views/base.html.twig +++ /dev/null @@ -1,13 +0,0 @@ - - - - - {% block title %}Welcome!{% endblock %} - {% block stylesheets %}{% endblock %} - - - - {% block body %}{% endblock %} - {% block javascripts %}{% endblock %} - - From 46dbf874cb2f9ec18516fc957550109bdc444cb5 Mon Sep 17 00:00:00 2001 From: Gergely POLONKAI Date: Wed, 28 Nov 2012 11:48:57 +0100 Subject: [PATCH 2/2] Redesigned menu and tag-cloud. --- .../Resources/public/css/front.css | 26 +++++++++++++++--- .../Resources/public/images/tagcloud.png | Bin 0 -> 1387 bytes .../views/Default/front_base.html.twig | 23 ++++++++++------ 3 files changed, 37 insertions(+), 12 deletions(-) create mode 100644 src/GergelyPolonkai/FrontBundle/Resources/public/images/tagcloud.png diff --git a/src/GergelyPolonkai/FrontBundle/Resources/public/css/front.css b/src/GergelyPolonkai/FrontBundle/Resources/public/css/front.css index c13deac..91c9f62 100644 --- a/src/GergelyPolonkai/FrontBundle/Resources/public/css/front.css +++ b/src/GergelyPolonkai/FrontBundle/Resources/public/css/front.css @@ -71,21 +71,28 @@ body { } #menu { - background-color: #b5b5b5; + background-color: #f18137; height: 39px; + margin-top: 15px; +} + +#tagcloud-button { + float: left; + padding-top: 2px; + padding-left: 6px; + cursor: pointer; } #menu ul { margin: 8px; padding: 0; list-style-type: none; - text-align: right; - vertical-align: middle; + float: right; } #menu ul li { float: right; - margin-top: 10px; + margin-top: 1px; margin-bottom: 10px; margin-left: 1em; height: 30px; @@ -186,6 +193,17 @@ dd p { text-align: right; } +#tag-cloud { + position: absolute; + width: 600px; + padding: 8px; + border: 1px solid black; + background-color: #303030; + margin-left: 5px; + margin-top: 2px; + display: none; +} + #tag-cloud a { color: #b3b3b3; text-decoration: none; diff --git a/src/GergelyPolonkai/FrontBundle/Resources/public/images/tagcloud.png b/src/GergelyPolonkai/FrontBundle/Resources/public/images/tagcloud.png new file mode 100644 index 0000000000000000000000000000000000000000..a58e4e941e31d18b49bf81d075dcda3828431783 GIT binary patch literal 1387 zcmV-x1(f=UP)J z``+)}bI;c^q#%;k09C+IpaggwSPKZ40{#KofS-U4W6T^YO(eZ5sYy~$(wO4Qti5Jf z(if6euM~(}Nk2%MkTj#@Wm3{3Nj0w;WV58dBu#7SGAZeMNw2*M5T~Rk)?}7TCMC5= za-` z-@qzXo=gHwz|mOgQO1J*yR6NwM9Bp{1Zrblun?wrId)}cW@btH1VG1PouP#=Yk`y_ z^Tfmib#--|Jb5zib?48Yr?$41d-v|8a+@6B%V>(M1^;J(IUqBc)yK!jxpe6gO-)S% zgF%XliV`^)0)YU5KmeD^g~#Jz)22CFWLT+x{d8=1HuLe3hJL&A~q`bTwuh&aSNy%bvJq?rrfq34m3aA4L;;l3?GD1T` z16QwJB@_zHkFQ&|jw45oP+3`t!{La#Gd(>$_V_#={=i1#HEFIyWJc=ewbNB9D>g(&dapMM(=Eofl2bGnT96EG}_3PIs^In2R(pW0BOE?@R5D4J+`(KLW zWo2cYK7Bgo+$&eEaPHi>h_Sr9JofM3&w&F6$j?uylp4$eez6H$Qugu84EFBb%gviN zxp3jayn7uP8Hqdh@#Du4ZvEiFgH%;jk&}~?>X8cr*Rp_9!25~3Sv*g)d-rb2%gecS z>lXF(^)H!UG$|}BY1PaW;v_N2M->^)ejC1DjW_kXJh2l zi$NUPTh<^V%BgTDs+noJXLN!g*K0$>ZU*?vJQ1KzQTYo6^Vych|m tY$ZEkUqT
-{% if tagCloud|length > 0 %} -
-{% for cloudItem in tagCloud %} - {{ cloudItem.name }}{% if not loop.last %} | {% endif %} -{% endfor %} -
-{% endif %} +{% if tagCloud|length > 0 %} +
+{% for cloudItem in tagCloud %} + {{ cloudItem.name }}{% if not loop.last %} | {% endif %} +{% endfor %} +
+{% endif %}
{% block content %}{% endblock content %}
@@ -59,7 +60,13 @@