From 30b38f5d7eca856a21803e1266e488829f18e435 Mon Sep 17 00:00:00 2001 From: aiora Date: Tue, 27 Sep 2011 14:39:11 +0200 Subject: [PATCH 1/4] title change for the new menu --- css/main2.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/css/main2.css b/css/main2.css index bc523df81..491f4cdad 100644 --- a/css/main2.css +++ b/css/main2.css @@ -98,8 +98,8 @@ ul#links { top: 20px; } ul#links { - background-image: url(../images/style/menu-second.png); - /*border-color: #C8E1E2; + /*background-image: url(../images/style/menu-second.png); + border-color: #C8E1E2; border-style: dotted;*/ top: 20px /*300px; to be set once the menu is in all pages*/ } From 0238f20616d0cf6f74ecbc22510e067f1e2d1f2c Mon Sep 17 00:00:00 2001 From: aiora Date: Tue, 27 Sep 2011 15:42:49 +0200 Subject: [PATCH 2/4] title change, again... --- css/main2.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/css/main2.css b/css/main2.css index bc523df81..1ab2fe4ff 100644 --- a/css/main2.css +++ b/css/main2.css @@ -1,5 +1,5 @@ /*This CSS file has been edited for CUCC - Expo website by A. Zabala on 2011*/ -/* code of colours TEST +/* code of colours #C8E1E2 very light #99CCCC light blue #008787 darker blue for fonts @@ -98,8 +98,8 @@ ul#links { top: 20px; } ul#links { - background-image: url(../images/style/menu-second.png); - /*border-color: #C8E1E2; + /*background-image: url(../images/style/menu-second.png); + border-color: #C8E1E2; border-style: dotted;*/ top: 20px /*300px; to be set once the menu is in all pages*/ } From 40c51ced4327a3ba86e7ddeb476ed7f05b34f0e7 Mon Sep 17 00:00:00 2001 From: aiora Date: Tue, 27 Sep 2011 16:58:00 +0200 Subject: [PATCH 3/4] style & images for menu --- css/main2.css | 18 ++++++++++++++++-- images/style/cave-picto.png | Bin 0 -> 263 bytes images/style/edit-picto.png | Bin 0 -> 584 bytes 3 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 images/style/cave-picto.png create mode 100644 images/style/edit-picto.png diff --git a/css/main2.css b/css/main2.css index 1ab2fe4ff..48d1d4015 100644 --- a/css/main2.css +++ b/css/main2.css @@ -114,10 +114,10 @@ p#topheader { .menu li, ul#links li { margin: 5px 0; - list-style: square outside none; + list-style: none outside none; } ul#links li { - margin: 5px 0 0 15px; + margin: 5px 0 0 0; } ul#links li ul { padding: 5px 0 5px 10px; @@ -125,10 +125,24 @@ ul#links li { ul#links li li { margin: 0 0 0 5px; } +.menu li a, +ul#links li a { + background: url(../images/style/cave-picto.png) no-repeat 0 8px; + padding-left: 18px; + } .menu li a:hover, ul#links li a:hover { + background-position: 0 -8px; border-bottom: 2px solid #d7442b; } +ul#links li a.editlink { + background: url(../images/style/edit-picto.png) no-repeat 100% 0; + font-size: 85%; + padding: 0 18px; + } + ul#links li a.editlink:hover { + background-position: 100% -18px; + } /* TABLES */ table.trad, table.centre { diff --git a/images/style/cave-picto.png b/images/style/cave-picto.png new file mode 100644 index 0000000000000000000000000000000000000000..35e563942960783f0ff5a5d3fd7d0e467c4d0218 GIT binary patch literal 263 zcmeAS@N?(olHy`uVBq!ia0vp^AhrkxGmvaHh)DrbjKx9jP7LeL$-D$|Yyx~jTsPXO z?zB~8>FT^5VR0kg@orw2?czlbs*|6z6$Y+fpR{$`v#AZ)d-pXSIr#0_!>6A<|M>jz z%g;am|NQ#*{||d}MKaJF&H|6fVg?3oVGw3ym^DWND9B#o>FdgVn^T(4f_uxiJ-2{D zfu1goAspBD9y`fn_0_onAqHF;C`7P~iSZkBSmacb?xyyYJm*rZp8 z>#hB1_3#V(`^m*#97gea3+H%FD{ec@{rT`Ljb}2NSJ_?7xVKC2G=u{UXYh3Ob6Mw< G&;$S=`eZo( literal 0 HcmV?d00001 diff --git a/images/style/edit-picto.png b/images/style/edit-picto.png new file mode 100644 index 0000000000000000000000000000000000000000..fe65fae5e2a0a3a4644650840ac7ef9be717b42d GIT binary patch literal 584 zcmV-O0=NB%P)Px#32;bRa{vGf6951U69E94oEQKA00(qQO+^RW2^$U(6n(fZ!~g&R+DSw~R5;7c z(mzNWVHgJR=f1meA>yG?iC|JA9Xd2nQygNGEDBC8x)s3&tth1w>Qcp_7;y8?A`V^Z z)X7n@c!Gmy{$Ob_1c!>jaCf1m6s_lxOYS=dYcb}G9euVJe(-&~?*r2+aan$~zOI~~ zUyTG+Nhr#sC_>j?$6|R^1#lZB6=hNshrQm_fdLmV8jIysl`&28rg$%k!(Q)rIJ}w7 z{>bIlj*eOz8%YhZD@lJ$bHeW@HN-)&xX{}hbi2vD;_t`bZEQRhgj-_%S^!|fkw{XO zv#R?2@X%%$|3v6o0AQlq+b`PM0DRcmYGK*ml+O3`ggl;`d*OB@N#J>dQi11x>H1=o z0KgSAZC8@~F4t5b(AUuct5huWt`Pi39wf4C=EZ&@_c2mBk?(A#mQH3?qGqXhJU3A; zC>GCYnN(&a+TIoP%zfc(wkyX_N-M Date: Tue, 27 Sep 2011 17:05:34 +0200 Subject: [PATCH 4/4] fine tune --- css/main2.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/css/main2.css b/css/main2.css index 48d1d4015..f236072d9 100644 --- a/css/main2.css +++ b/css/main2.css @@ -81,7 +81,7 @@ table.imgtable td { vertical-align: middle; text-align: center; /*Menu*/ .menu, ul#links { - background: #fff url(../images/style/menu-main.png) no-repeat 0 0; + background: #fff url(../images/style/menu-main.png) no-repeat 16px 4px; clear: both; border: 2px solid #99CCCC; position: absolute; @@ -90,7 +90,7 @@ ul#links { font-size: 75%; color: #888; width: 150px; - padding: 32px 20px 15px; + padding: 42px 20px 18px; text-align: left; border-top-right-radius: 1em; } @@ -113,7 +113,7 @@ p#topheader { } .menu li, ul#links li { - margin: 5px 0; + margin: 6px 0; list-style: none outside none; } ul#links li {