From 6c95e46a15512a45637ea3f1f4adc5ae77ba3161 Mon Sep 17 00:00:00 2001 From: Sam Hemelryk Date: Wed, 27 Jul 2011 16:35:07 +0800 Subject: [PATCH] MDL-26979 custommenu Improved the custom menu CSS in base and all other core themes * The custom menu now requires the YUI module directly rather than in its initialisation * Improved the CSS in base so that it was more precise and more easily overrideable * Reviewed the CSS for all core themes improving and removing !important from rules --- lib/outputrenderers.php | 6 +- theme/anomaly/style/general.css | 46 +- theme/arialist/style/core.css | 95 ++-- .../pix/horizontal-menu-submenu-indicator.png | Bin 0 -> 879 bytes .../pix/vertical-menu-submenu-indicator.png | Bin 0 -> 880 bytes theme/base/style/core.css | 21 +- theme/binarius/style/core.css | 78 +-- theme/boxxie/style/core.css | 28 +- theme/brick/style/core.css | 533 +++++++++--------- theme/formfactor/style/core.css | 71 ++- theme/formfactor/style/selected.css | 2 - theme/fusion/style/menus.css | 237 ++------ theme/leatherbound/style/core.css | 70 +-- theme/magazine/style/core.css | 81 +-- .../pix/horizontal-menu-submenu-indicator.png | Bin 0 -> 938 bytes .../pix/vertical-menu-submenu-indicator.png | Bin 0 -> 942 bytes theme/nimble/style/colors.css | 41 +- theme/nimble/style/menu.css | 234 ++------ theme/nonzero/style/core.css | 83 +-- theme/sky_high/style/menu.css | 26 +- theme/splash/style/sl.css | 36 +- 21 files changed, 662 insertions(+), 1026 deletions(-) create mode 100644 theme/base/pix/horizontal-menu-submenu-indicator.png create mode 100644 theme/base/pix/vertical-menu-submenu-indicator.png create mode 100644 theme/nimble/pix/horizontal-menu-submenu-indicator.png create mode 100644 theme/nimble/pix/vertical-menu-submenu-indicator.png diff --git a/lib/outputrenderers.php b/lib/outputrenderers.php index be7eba72083..b832df47ed1 100644 --- a/lib/outputrenderers.php +++ b/lib/outputrenderers.php @@ -2427,8 +2427,10 @@ EOD; // Increment the menu count. This is used for ID's that get worked with // in JavaScript as is essential $menucount++; - // Initialise this custom menu - $this->page->requires->js_init_call('M.core_custom_menu.init', array('custom_menu_'.$menucount)); + // Initialise this custom menu (the custom menu object is contained in javascript-static + $jscode = js_writer::function_call_with_Y('M.core_custom_menu.init', array('custom_menu_'.$menucount)); + $jscode = "(function(){{$jscode}})"; + $this->page->requires->yui_module('node-menunav', $jscode); // Build the root nodes as required by YUI $content = html_writer::start_tag('div', array('id'=>'custom_menu_'.$menucount, 'class'=>'yui3-menu yui3-menu-horizontal javascript-disabled')); $content .= html_writer::start_tag('div', array('class'=>'yui3-menu-content')); diff --git a/theme/anomaly/style/general.css b/theme/anomaly/style/general.css index c98d5886468..671d2ee8415 100644 --- a/theme/anomaly/style/general.css +++ b/theme/anomaly/style/general.css @@ -223,29 +223,25 @@ html, body {background-color:#C8C9C7;} .dir-rtl #page-header .navbar .navbutton {float:left;} /** Custom menu **/ -/*YUI Reset */ -.yui3-skin-sam #page .yui3-menu-horizontal .yui3-menu-content, -.yui3-skin-sam #page .yui3-menu-horizontal .yui3-menu-label, -.yui3-skin-sam #page .yui3-menu-horizontal .yui3-menu-label-active, -.yui3-skin-sam #page .yui3-menu-horizontal .yui3-menuitem-active .yui3-menuitem-content, -.yui3-skin-sam #page .yui3-menu-horizontal .yui3-menu-label-menuvisible {background-position: -10000px -10000px;} -.yui3-skin-sam #page .yui3-menu-label, -.yui3-skin-sam #page .yui3-menu .yui3-menu .yui3-menu-label, -.yui3-skin-sam #page .yui3-menubuttonnav .yui3-menu-label em { background-position: right center; } -.yui3-skin-sam #page .yui3-splitbuttonnav .yui3-menu-label .yui3-menu-toggle {background-position: 3px center;} -.yui3-skin-sam #page .yui3-splitbuttonnav .yui3-menu-label-menuvisible .yui3-menu-toggle {background-position: 0% 50%;} -#custommenu {clear: both;padding-left: 4px;margin-bottom: 0px;padding-bottom: 2px;} -.yui3-skin-sam #page .yui3-menu-label, -.yui3-skin-sam #page .yui3-menuitem-content {color: #fff;font-weight: 800;line-height: 30px;} -.yui3-skin-sam #page .custom_menu_submenu .yui3-menu-label, -.yui3-skin-sam #page .custom_menu_submenu .yui3-menuitem-content {color: #000 !important;text-shadow: none !important;line-height: 25px;} -.yui3-skin-sam #page .yui3-menu-label.yui3-menu-label-active, -.yui3-skin-sam #page .yui3-menuitem-active .yui3-menuitem-content {color: #000;background-color: #697F55;} -.yui3-skin-sam #page .yui3-menu-content, -.yui3-skin-sam #page .yui3-menu .yui3-menu .yui3-menu-content, -.yui3-skin-sam #page .yui3-menu-horizontal .yui3-menu-label, -.yui3-skin-sam #page .yui3-menu-horizontal .yui3-menuitem-content {border: none !important;} -.yui3-skin-sam .yui3-menu-horizontal .yui3-menu-label, -.yui3-skin-sam .yui3-menu-horizontal .yui3-menuitem-content {border-color:#808080;border-style:solid;border-width:0px 0;} +#custommenu {margin-bottom: 0;} -#page .custom_menu_submenu {border: 1px solid #697F55 !important;-webkit-border-bottom-right-radius: 5px;-webkit-border-bottom-left-radius: 5px;-moz-border-radius-bottomright: 5px;-moz-border-radius-bottomleft: 5px;border-bottom-right-radius: 5px;border-bottom-left-radius: 5px;} +#custommenu .yui3-menu-horizontal .yui3-menu-content, +#custommenu .yui3-menu-horizontal.javascript-disabled .yui3-menu-content, +#custommenu .yui3-menu-horizontal .yui3-menu-content ul, +#custommenu .yui3-menu-horizontal.javascript-disabled .yui3-menu-content ul, +#custommenu .yui3-menu-horizontal.javascript-disabled .yui3-menu-content li li:hover > a, +#custommenu .yui3-menu-horizontal .yui3-menu-label, +#custommenu .yui3-menuitem, +#custommenu .yui3-menuitem .yui3-menuitem-content {border-width: 0;} + +#custommenu .yui3-menu .yui3-menu-label, +#custommenu .yui3-menu .yui3-menuitem-content {color: #FFF;font-weight: bold;line-height:30px;padding:0 14px;} + +#custommenu .custom_menu_submenu .yui3-menu-content{background-color: #3A4D28;} + +#custommenu .custom_menu_submenu .yui3-menu-label, +#custommenu .custom_menu_submenu .yui3-menuitem-content {line-height: 25px;padding:0 20px;} + +#custommenu .yui3-menu-label-active, +#custommenu .yui3-menu-label-menuvisible, +#custommenu .yui3-menu .yui3-menu .yui3-menuitem-active .yui3-menuitem-content {background-color: #697F55;} \ No newline at end of file diff --git a/theme/arialist/style/core.css b/theme/arialist/style/core.css index 87037cfeae0..c2b442a32a1 100644 --- a/theme/arialist/style/core.css +++ b/theme/arialist/style/core.css @@ -245,78 +245,57 @@ h2.headingblock { margin-top:30px; } -/*YUI Reset */ -/*full menu bar */ -.yui3-skin-sam .yui3-menu-horizontal .yui3-menu-content { - background: none !important; -} -/*single items */ -.yui3-skin-sam .yui3-menu-horizontal .yui3-menu-label { - background: none !important; -} -/*active items */ -.yui3-skin-sam .yui3-menu-horizontal .yui3-menu-label-active, .yui3-skin-sam .yui3-menu-horizontal .yui3-menuitem-active .yui3-menuitem-content, .yui3-skin-sam .yui3-menu-horizontal .yui3-menu-label-menuvisible { - background: #f9f9f9 !important; - border-color:inherit; -} - -#custommenu .yui3-menu-horizontal, -#custommenu .yui3-menu-horizontal.javascript-disabled { - padding-left:100px; - border-bottom:1px solid #DDD; - background-color:#EEE; -} - .has-custom-menu #wrapper, #custommenu .yui3-menu-horizontal .yui3-menu-content, #custommenu .yui3-menu-horizontal.javascript-disabled .yui3-menu-content, #custommenu .yui3-menu-horizontal .yui3-menu-content ul, #custommenu .yui3-menu-horizontal.javascript-disabled .yui3-menu-content ul, -#custommenu .yui3-menu-horizontal.javascript-disabled .yui3-menu-content li li:hover > a { - border-width:0; +#custommenu .yui3-menu-horizontal.javascript-disabled .yui3-menu-content li li:hover > a, +#custommenu .yui3-menu-horizontal .yui3-menu-label, +#custommenu .yui3-menuitem, +#custommenu .yui3-menuitem .yui3-menuitem-content { + border-width: 0; } -#custommenu .yui3-menu-horizontal .yui3-menu-content ul ul, -#custommenu .yui3-menu-horizontal.javascript-disabled .yui3-menu-content ul ul { - background-color:#F9F9F9; - border:1px solid #DDD; - border-top-width:0; +#custommenu { + padding-left:100px; + border-bottom:1px solid #DDD; + background-color:#EEE; } -#custommenu .yui3-menu-horizontal .yui3-menu-content li a { - display:block; - height:24px; - vertical-align: bottom; - padding:5px 10px 0 10px; - cursor:pointer; +#custommenu .yui3-menu-content { + background-color: transparent; } -#custommenu .yui3-menu-horizontal .yui3-menu-content li:hover, -#custommenu .yui3-menu-horizontal .yui3-menu-content .yui3-menu-label-active { - background-color:#F9F9F9; +#custommenu .yui3-menu .yui3-menu-label, +#custommenu .yui3-menu .yui3-menuitem-content { + color:#F25F0F; + line-height:24px; + padding: 5px 10px; } -#custommenu .yui3-menu-horizontal.javascript-disabled .yui3-menu-content li:hover > a { +#custommenu .custom_menu_submenu .yui3-menu-label, +#custommenu .custom_menu_submenu .yui3-menuitem-content { + padding: 5px 20px; +} + +#custommenu .custom_menu_submenu .yui3-menu-content, +#custommenu .yui3-menu-label-active, +#custommenu .yui3-menu-label-menuvisible { + background-color: #f9f9f9; +} + +#custommenu .custom_menu_submenu .yui3-menu-label-active, +#custommenu .custom_menu_submenu .yui3-menu-label-menuvisible, +#custommenu .yui3-menu .yui3-menu .yui3-menuitem-active .yui3-menuitem-content { + background-color: #fefefe; +} + +#custommenu .custom_menu_submenu .yui3-menu-content { border-left:1px solid #DDD; border-right:1px solid #DDD; - padding:5px 9px 0 9px; + border-bottom:1px solid #DDD; } - -.yui3-skin-sam #custommenu .yui3-menu-label, -.yui3-skin-sam #custommenu .yui3-menu .yui3-menu .yui3-menu-label, -.yui3-skin-sam #custommenu .yui3-menuitem-content, -.yui3-skin-sam #custommenu .yui3-menu .yui3-menu .yui3-menuitem-content { - color:#F25F0F; - border-width:0; - padding-right: 25px; -} - -.yui3-skin-sam #custommenu .yui3-menu-content, -.yui3-skin-sam #custommenu .yui3-menu .yui3-menu .yui3-menu-content { - padding:0; -} - -#custommenu .yui3-menu-horizontal.javascript-disabled .yui3-menu-content li li:hover, -.yui3-skin-sam #custommenu .yui3-menu .custom_menu_submenu .yui3-menuitem.yui3-menuitem-active .yui3-menuitem-content, #custommenu .yui3-menu-horizontal .custom_menu_submenu .yui3-menu-content .yui3-menu-label-active { - background-color:#FFF !important; +#custommenu .custom_menu_submenu .custom_menu_submenu .yui3-menu-content { + border-top:1px solid #DDD; } \ No newline at end of file diff --git a/theme/base/pix/horizontal-menu-submenu-indicator.png b/theme/base/pix/horizontal-menu-submenu-indicator.png new file mode 100644 index 0000000000000000000000000000000000000000..2ef3454cac8bb059622b01ea1676c5e4fd010180 GIT binary patch literal 879 zcmV-#1CacQP)6ciK{6%`g178e&67#J8C85tTH8XFrM92^`S9UUGX9v>ecARr(iAt53nA|oRs zBqSsyB_$>%CMPE+C@3f?DJd!{Dl021EG#T7EiEoCE-x=HFfcGNF)=bSGBYzXG&D3d zH8nOiHa9mnI5;>tIXOByIy*Z%JUl!-Jv}}?K0iM{KtMo2K|w-7LPJACL_|bIMMXwN zMn^|SNJvOYNl8jdN=r*iOiWBoO-)WtPESuyP*6}&QBhJ-Qd3h?R8&+|RaI72R##V7 zSXfwDSy@_IT3cINTwGjTU0q&YUSD5dU|?WjVPRroVq;@tWMpJzWo2e&W@l$-XlQ6@ zX=!R|YHMq2Y;0_8ZEbFDZf|dIaBy&OadC2Ta&vQYbaZreb#-=jc6WDoczAeud3kzz zdV70&e0+R;eSLm@et&;|fPjF3fq{a8f`fyDgoK2Jg@uNOhKGlTh=_=ZiHVAeii?Yj zjEszpjg5|uj*pLzkdTm(k&%*;l9Q8@l$4Z}m6ev3mY0{8n3$NEnVFiJnwy)OoSdAU zot>VZo}ZteprD|kp`oIpqNAguq@<*!rKP5(rl+T;sHmu^si~@}s;jH3tgNi9t*x%E zuCK4Ju&}VPv9YqUva_?Zw6wIfwY9dkwzs#pxVX5vxw*Q!y1To(yu7@dCU$jHda$;ryf%FD~k%*@Qq&CSlv&d<-!(9qD) z(b3Y<($mw^)YR0~)z#M4*4Nk9*x1lt)=I7_<=;-L_>FMg~>g((4?Ck9A?d|UF?(gsK@bK{Q@$vHV^7Hfa z^z`)g_4W4l_V@Sq`1ttw`T6?#`uqF){QUg={r&#_{{R2~`6RjA00002bW%=J{{ZE; zFiHRb031m~K~xCWV_<*)Mi^jVMCAho7*Y5j0Y+p#BLD@m05JvHrdj|1002ovPDHLk FV1l|tohkqT literal 0 HcmV?d00001 diff --git a/theme/base/pix/vertical-menu-submenu-indicator.png b/theme/base/pix/vertical-menu-submenu-indicator.png new file mode 100644 index 0000000000000000000000000000000000000000..4f4cf998b29cae6bc8af31315ad18a6f633b0480 GIT binary patch literal 880 zcmV-$1CRWPP)6ciK{6%`g178e&67#J8C85tTH8XFrM92^`S9UUGX9v>ecARr(iAt53nA|oRs zBqSsyB_$>%CMPE+C@3f?DJd!{Dl021EG#T7EiEoCE-x=HFfcGNF)=bSGBYzXG&D3d zH8nOiHa9mnI5;>tIXOByIy*Z%JUl!-Jv}}?K0iM{KtMo2K|w-7LPJACL_|bIMMXwN zMn^|SNJvOYNl8jdN=r*iOiWBoO-)WtPESuyP*6}&QBhJ-Qd3h?R8&+|RaI72R##V7 zSXfwDSy@_IT3cINTwGjTU0q&YUSD5dU|?WjVPRroVq;@tWMpJzWo2e&W@l$-XlQ6@ zX=!R|YHMq2Y;0_8ZEbFDZf|dIaBy&OadC2Ta&vQYbaZreb#-=jc6WDoczAeud3kzz zdV70&e0+R;eSLm@et&;|fPjF3fq{a8f`fyDgoK2Jg@uNOhKGlTh=_=ZiHVAeii?Yj zjEszpjg5|uj*pLzkdTm(k&%*;l9Q8@l$4Z}m6ev3mY0{8n3$NEnVFiJnwy)OoSdAU zot>VZo}ZteprD|kp`oIpqNAguq@<*!rKP5(rl+T;sHmu^si~@}s;jH3tgNi9t*x%E zuCK4Ju&}VPv9YqUva_?Zw6wIfwY9dkwzs#pxVX5vxw*Q!y1To(yu7@dCU$jHda$;ryf%FD~k%*@Qq&CSlv&d<-!(9qD) z(b3Y<($mw^)YR0~)z#M4*4Nk9*x1lt)=I7_<=;-L_>FMg~>g((4?Ck9A?d|UF?(gsK@bK{Q@$vHV^7Hfa z^z`)g_4W4l_V@Sq`1ttw`T6?#`uqF){QUg={r&#_{{R2~`6RjA00002bW%=J{{ZE; zFiHRb03At0K~xA^V`N}tfCEM_LU0f~FayRzmqFHpWEubi8~_iDFE~{I0000.yui3-menu-content>ul>li {float:left;} #custommenu .yui3-menu-horizontal.javascript-disabled li a {padding:0 10px;} #custommenu .yui3-menu-horizontal.javascript-disabled .yui3-menu {position:absolute;top:-10000px;left:-10000px;visibility:hidden;white-space: nowrap;max-width: 250px;background-color:#FFF;} @@ -581,6 +582,20 @@ body.tag .managelink {padding: 5px;} #custommenu .yui3-menu-horizontal.javascript-disabled .yui3-menu-content {font-size:93%;line-height:2;padding:0;} #custommenu .yui3-menu-horizontal.javascript-disabled .yui3-menu-content .yui3-menu-content {font-size:100%;} +/** + * Fix for broken YUI images in the menunav component + */ +#custommenu .yui3-menu-label, +#custommenu .yui3-menuitem-content {cursor:pointer;} +#custommenu .yui3-menuitem-active {background-color:#B3D4FF;} +#custommenu .yui3-menuitem-active, +#custommenu .yui3-menuitem-active .yui3-menuitem-content, +#custommenu .yui3-menu-horizontal .yui3-menu-label, +#custommenu .yui3-menu-horizontal .yui3-menu-content {background-image:none;background-position:right center;background-repeat:no-repeat;} +#custommenu .yui3-menu-label, +#custommenu .yui3-menu .yui3-menu .yui3-menu-label {background-image:url([[pix:theme|vertical-menu-submenu-indicator]]);} +#custommenu .yui3-menu .yui3-menu .yui3-menu-label-menuvisible {background-image:url([[pix:theme|horizontal-menu-submenu-indicator]]);} + /** * Smart Select Element */ @@ -694,12 +709,6 @@ body.tag .managelink {padding: 5px;} */ .ie.dir-rtl .mform .fitem .felement {margin-right:0;text-align:right;float:right;} -/** - * Fix for broken YUI images in the menunav component - */ -.yui3-skin-sam .yui3-menu-horizontal .yui3-menu-label, -.yui3-skin-sam .yui3-menu-horizontal .yui3-menu-content {background-image:none;} - .mod-indent-1 {margin-left:20px;} .mod-indent-2 {margin-left:40px;} .mod-indent-3 {margin-left:60px;} diff --git a/theme/binarius/style/core.css b/theme/binarius/style/core.css index fba723d651f..d6299eaf913 100644 --- a/theme/binarius/style/core.css +++ b/theme/binarius/style/core.css @@ -275,66 +275,48 @@ body.has_dock { #custommenu .yui3-menu-horizontal .yui3-menu-content ul, #custommenu .yui3-menu-horizontal.javascript-disabled .yui3-menu-content ul, #custommenu .yui3-menu-horizontal.javascript-disabled .yui3-menu-content li li:hover > a, -#custommenu .yui3-menu-horizontal .yui3-menu-label, .yui3-skin-sam .yui3-menu-horizontal .yui3-menuitem-content { - border-width:0; +#custommenu .yui3-menu-horizontal .yui3-menu-label, +#custommenu .yui3-menuitem, +#custommenu .yui3-menuitem .yui3-menuitem-content { + border-width: 0; } -/*YUI Reset */ -/*full menu bar */ -.yui3-skin-sam .yui3-menu-horizontal .yui3-menu-content { - background: none !important; + +#custommenu .yui3-menu .yui3-menu {background-color:#F9F9F9;border:1px solid #F14E16;} + +#custommenu .yui3-menu .yui3-menu-label, +#custommenu .yui3-menu .yui3-menuitem-content { + color: #FFF; } -/*single items */ -.yui3-skin-sam .yui3-menu-horizontal .yui3-menu-label { - background: none !important; +#custommenu .yui3-menu .yui3-menu .yui3-menu-label, +#custommenu .yui3-menu .yui3-menu .yui3-menuitem-content { + color: #000; } -/*active items */ -.yui3-skin-sam .yui3-menu-horizontal .yui3-menu-label-active, .yui3-skin-sam .yui3-menu-horizontal .yui3-menuitem-active .yui3-menuitem-content, .yui3-skin-sam .yui3-menu-horizontal .yui3-menu-label-menuvisible { - background: none !important; - border-color:inherit; +#custommenu .yui3-menuitem-active .yui3-menuitem-content { + color: #F14E16 } -.yui3-menuitem, .yui3-menuitem .yui3-menuitem-content { - border: none !important; -} - -#custommenu .yui3-menu-horizontal .yui3-menu-content ul ul, -#custommenu .yui3-menu-horizontal.javascript-disabled .yui3-menu-content ul ul { - background-color:#F9F9F9; - border:1px solid #F14E16; - border-top-width:0; -} - -#custommenu .yui3-menu-horizontal .yui3-menu-content .yui3-menu-label, .yui3-menuitem .yui3-menuitem-content, .yui3-menuitem { - color:#FFF !important; -} - -.yui3-skin-sam #custommenu .yui3-menu-content, -.yui3-skin-sam #custommenu .yui3-menu .yui3-menu .yui3-menu-content { +#custommenu .yui3-menu-content, +#custommenu .yui3-menu .yui3-menu .yui3-menu-content { padding:0; } -#custommenu .custom_menu_submenu .yui3-menu-content .yui3-menu-label, .custom_menu_submenu .yui3-menuitem .yui3-menuitem-content { - color: #000 !important; +#custommenu .yui3-menu-label-active, +#custommenu .yui3-menu-label-menuvisible, +#custommenu .yui3-menu .yui3-menu .yui3-menuitem-active .yui3-menuitem-content { + background-color:#F14E16; + color:#FFF; } +#custommenu .yui3-menuitem-active .yui3-menuitem-content { + background-color: #F9F9F9; +} + + #custommenu .yui3-menu-horizontal.javascript-disabled .yui3-menu-content li li:hover, -#custommenu .yui3-menu-horizontal.javascript-disabled .yui3-menu-content li li:hover a, -.yui3-skin-sam #custommenu .yui3-menu .custom_menu_submenu .yui3-menuitem.yui3-menuitem-active .yui3-menuitem-content { - background-color:#F14E16 !important; - color:#FFF !important; -} - -.yui3-skin-sam .yui3-menu-label-active, -.yui3-skin-sam .yui3-menu-label-menuvisible, -.yui3-skin-sam .yui3-menu .yui3-menu .yui3-menu-label-active, -.yui3-skin-sam .yui3-menu .yui3-menu .yui3-menu-label-menuvisible, #custommenu .custom_menu_submenu .yui3-menu-content .yui3-menu-label-active, #custommenu .custom_menu_submenu .yui3-menu-content .yui3-menu-label-menuvisible { - background-color:#F14E16 !important; - color:#FFF !important; -} - -#custommenu .yui3-menu-horizontal .yui3-menu-content li a { - cursor:pointer; +#custommenu .yui3-menu-horizontal.javascript-disabled .yui3-menu-content li li:hover a { + background-color:#F14E16; + color:#FFF; } .pagelayout-redirect #content p, diff --git a/theme/boxxie/style/core.css b/theme/boxxie/style/core.css index 448e67682e2..a5b9c570406 100644 --- a/theme/boxxie/style/core.css +++ b/theme/boxxie/style/core.css @@ -1053,9 +1053,12 @@ h2.headingblock { } .myclear { - clear: both; + clear: both; } +#custommenu { + overflow:hidden; +} #custommenu .yui3-menu-horizontal .yui3-menu-content, #custommenu .yui3-menu-horizontal.javascript-disabled .yui3-menu-content, #custommenu .yui3-menu-horizontal .yui3-menu-content ul, @@ -1072,24 +1075,23 @@ h2.headingblock { #custommenu .yui3-menu-horizontal.javascript-disabled .yui3-menu-content li li:hover, #custommenu .yui3-menu-horizontal.javascript-disabled .yui3-menu-content li li:hover a, -.yui3-skin-sam #custommenu .yui3-menu .yui3-menuitem.yui3-menuitem-active .yui3-menuitem-content { +#custommenu .yui3-menu .yui3-menuitem.yui3-menuitem-active .yui3-menuitem-content { background-color:#4E6632; } -.yui3-skin-sam .yui3-menu-label-active, -.yui3-skin-sam .yui3-menu-label-menuvisible, -.yui3-skin-sam .yui3-menu .yui3-menu .yui3-menu-label-active, -.yui3-skin-sam .yui3-menu .yui3-menu .yui3-menu-label-menuvisible { - background-color:#4E6632; +#custommenu .yui3-menu-label-active, +#custommenu .yui3-menu-label-menuvisible, +#custommenu .yui3-menu .yui3-menu .yui3-menu-label-active, +#custommenu .yui3-menu .yui3-menu .yui3-menu-label-menuvisible { + background-color:#4E6632; } - -#custommenu .yui3-menu-horizontal .yui3-menu-content li a { - cursor:pointer; +#custommenu .yui3-menu-content, +#custommenu .yui3-menu .yui3-menu .yui3-menu-content { + padding:0; } -.yui3-skin-sam #custommenu .yui3-menu-content, -.yui3-skin-sam #custommenu .yui3-menu .yui3-menu .yui3-menu-content { - padding:0; +#custommenu .yui3-menuitem .yui3-menuitem-content { + border-width:0; } \ No newline at end of file diff --git a/theme/brick/style/core.css b/theme/brick/style/core.css index 34d710957d4..3a32b7da600 100644 --- a/theme/brick/style/core.css +++ b/theme/brick/style/core.css @@ -4,275 +4,275 @@ ---------------------------*/ html, body { - background: #eee; + background: #eee; } #mypagewrapper { - width: 100%; - border-top: 1px solid #fff; + width: 100%; + border-top: 1px solid #fff; } #page { - margin-top: 15px; - width: 90%; - min-width: 960px; - margin-left: auto; - margin-right: auto; - clear: both; - border: 1px solid #dadada; - background: #fff; + margin-top: 15px; + width: 90%; + min-width: 960px; + margin-left: auto; + margin-right: auto; + clear: both; + border: 1px solid #dadada; + background: #fff; } #wrapper { - padding: 20px; - padding-left: 20px; - padding-right: 17px; + padding: 20px; + padding-left: 20px; + padding-right: 17px; } #wrapper.notathome { - padding-top: 15px; + padding-top: 15px; } .content-only #wrapper { - padding-right: 0px; + padding-right: 0px; } /* Header ----------------------------*/ #page-header { - width: 100%; - top: 0px; - height: 140px; - float: none; + width: 100%; + top: 0px; + height: 140px; + float: none; } #header { - width: 90%; - min-width: 960px; - margin-left: auto; - margin-right: auto; + width: 90%; + min-width: 960px; + margin-left: auto; + margin-right: auto; } #logo { - background-position: 0% 40%; - width: 300px; - height: 70px; - float: left; + background-position: 0% 40%; + width: 300px; + height: 70px; + float: left; } #nologo { - width: 590px; - height: 70px; - float: left; - margin-left: 6px; - overflow: hidden; + width: 590px; + height: 70px; + float: left; + margin-left: 6px; + overflow: hidden; } #nologo a, #nologo { - font-family: Georgia, Palatino, serif; - line-height: 70px; - font-size: 28px; - font-weight: 600; - letter-spacing: -1px; + font-family: Georgia, Palatino, serif; + line-height: 70px; + font-size: 28px; + font-weight: 600; + letter-spacing: -1px; } #loggedinas { - min-width: 300px; - height: 65px; - float: right; - text-align: right; - line-height: 65px; - font-size: 10px; + min-width: 300px; + height: 65px; + float: right; + text-align: right; + line-height: 65px; + font-size: 10px; } #loggedinas a { - color: #fff; + color: #fff; } #headerbottom { - clear: both; + clear: both; } #headingtitle { - float: right; - width: 280px; - padding-right: 5px; - text-align: right; - height: 70px; - overflow: hidden; - background: url([[pix:theme|youare]]) no-repeat; - background-position: 95% 110%; - position: relative; - bottom: -2px; + float: right; + width: 280px; + padding-right: 5px; + text-align: right; + height: 70px; + overflow: hidden; + background: url([[pix:theme|youare]]) no-repeat; + background-position: 95% 110%; + position: relative; + bottom: -2px; } #headingtitle h1 { - line-height: 67px; - font-weight: 200; - font-size: 13px; - text-transform: uppercase; - color: #fff; + line-height: 67px; + font-weight: 200; + font-size: 13px; + text-transform: uppercase; + color: #fff; } /* end Header ----------------------------*/ #region-post2 .region-content div.navbutton { - display: inline-block !important; - width: 100%; - float: none; - margin-bottom: 5px; - margin-top: 5px; - clear: both; + display: inline-block !important; + width: 100%; + float: none; + margin-bottom: 5px; + margin-top: 5px; + clear: both; } body,h1,h2,h3,h4,h5,h6,p,ul,ol,dl,input,textarea { - font-family: Georgia, Palatino, serif; - line-height: 1.5; - color: #333; + font-family: Georgia, Palatino, serif; + line-height: 1.5; + color: #333; } h1, h2, h3, h4 { - font-family: Georgia, Times, "Times New Roman", serif !important; + font-family: Georgia, Times, "Times New Roman", serif !important; } h2,h3,h4,h5,h6 { - color: #999; - font-weight: normal; + color: #999; + font-weight: normal; } blockquote { - border-left: 1px solid #eee; - padding-left: 15px; - color: #666; + border-left: 1px solid #eee; + padding-left: 15px; + color: #666; } .mform fieldset { - border-color: #eee; + border-color: #eee; } .mform fieldset legend { - color: #555; - font-weight: normal; - font-size: 1.2em; - border: 1px solid #eee; - padding: 2px 5px; - background: #fff; + color: #555; + font-weight: normal; + font-size: 1.2em; + border: 1px solid #eee; + padding: 2px 5px; + background: #fff; } div.navbar { - border-bottom: 1px solid #eee; - border-top: 1px solid #eee; - background: #fafafa url([[pix:theme|block]]) no-repeat; - background-position: 100% 0%; - font-size: 0.85em; - font-style: italic; - font-weight: 200; - padding:0 10px; - margin-bottom: 7px; + border-bottom: 1px solid #eee; + border-top: 1px solid #eee; + background: #fafafa url([[pix:theme|block]]) no-repeat; + background-position: 100% 0%; + font-size: 0.85em; + font-style: italic; + font-weight: 200; + padding:0 10px; + margin-bottom: 7px; } div.breadcrumb li { - line-height: 30px; - font-family: Georgia, serif; + line-height: 30px; + font-family: Georgia, serif; } .breadcrumb li img { - vertical-align: middle; + vertical-align: middle; } /** breadcrumb image replacement **/ div.navbar span.arrow.sep { - font-size: 1px; - color: #fafafa; - background: url([[pix:theme|crumber]]) no-repeat; - background-position: 50% 25%; - display: inline-block; - width: 16px; - height: 30px; + font-size: 1px; + color: #fafafa; + background: url([[pix:theme|crumber]]) no-repeat; + background-position: 50% 25%; + display: inline-block; + width: 16px; + height: 30px; } .navbutton { - float: none; - width: 100%; - padding: 5px 0 15px; - text-align: center; + float: none; + width: 100%; + padding: 5px 0 15px; + text-align: center; } /* Blocks ----------------------------*/ .block { - border: none; + border: none; } div.block { - padding: 2px; - border: 1px solid #dadada; - margin-left: -10px; + padding: 2px; + border: 1px solid #dadada; + margin-left: -10px; } #region-main div.block { - margin-left: 0px; - background-image: none; + margin-left: 0px; + background-image: none; } .block div.header { - min-height: 33px; - padding-top: 3px; - padding-left: 3px; + min-height: 33px; + padding-top: 3px; + padding-left: 3px; } div.block.hidden div.header { - border-bottom: none; + border-bottom: none; } .block .header h2 { - font-size: 13px; - font-weight: 200; - text-transform: uppercase; + font-size: 13px; + font-weight: 200; + text-transform: uppercase; } .block div.content { - background: #fff; - border: 1px solid #dadada; - border-top: none; - padding: 4px; + background: #fff; + border: 1px solid #dadada; + border-top: none; + padding: 4px; } .block div.content h1, .block div.content h2.main, .block div.content h3.main { - font-size: 13px; - background-image: none; + font-size: 13px; + background-image: none; } .block_calendar_month table.minicalendar.calendartable td,.block_calendar_month table.minicalendar.calendartable th { - border: none !important; + border: none !important; } .block_calendar_month table.minicalendar { - margin-bottom: 0px !important; + margin-bottom: 0px !important; } .block_calendar_month table.minicalendar.calendartable th abbr { - border: none !important; - text-decoration: none; + border: none !important; + text-decoration: none; } /** main headings **/ .generalbox h2,h3.sectionname, h2.headingblock,h2.main,h3.main, h2.main a, h3.main a, div.loginpanel h2, div.signuppanel h2 { - font-weight: 600; - letter-spacing: -1px; - line-height: 1.3em; - font-size: 28px; - border-bottom: 0px solid #eee; - padding-bottom: 2px; - background: url([[pix:theme|mainbar]]) repeat-x; - background-position: 0% 100%; + font-weight: 600; + letter-spacing: -1px; + line-height: 1.3em; + font-size: 28px; + border-bottom: 0px solid #eee; + padding-bottom: 2px; + background: url([[pix:theme|mainbar]]) repeat-x; + background-position: 0% 100%; } .generalbox h2, #page-course-info h2.main, h3.sectionname, h2.main a, h3.main a, div.loginpanel h2, div.signuppanel h2, div.hd h3.main { - font-size: 22px; - background: none; + font-size: 22px; + background: none; } @@ -281,263 +281,266 @@ div.block.hidden div.header { ----------------------------*/ .coursebox { - border-color: #eee; + border-color: #eee; } .coursebox .info { - width: 35%; + width: 35%; } .coursebox .info .name { - margin-bottom: 0; + margin-bottom: 0; } .coursebox .info .teachers { - font-size: 0.9em; - color: #888; + font-size: 0.9em; + color: #888; } .coursebox .summary { - width: 63%; + width: 63%; } .course-content .section.main { - border-bottom: 1px solid #eee; + border-bottom: 1px solid #eee; } .course-content .section.main .content { - padding: 5px 5px 10px; + padding: 5px 5px 10px; } .course-content .weeks .section.main .content { - margin-left: 0; + margin-left: 0; } .course-content .weeks .section.main .left { - display: none; + display: none; } .course-content .section.main.current { - background: #fffcdc; + background: #fffcdc; } .course-content .weeks .section.main h3.weekdates { - color: #999; + color: #999; } .course-content .current .left, .course-content .current h3.weekdates { - color: #92310c !important; + color: #92310c !important; } span.completionprogress { - font-size: 11px; - color: #666666; + font-size: 11px; + color: #666666; } /* Forum --------------------------*/ .forumpost .topic { - background: #eee url([[pix:theme|block]]) no-repeat; - background-position: 100% 0%; - border-width: 0; - border: 1px solid #dadada; - padding: 0 10px 0; + background: #eee url([[pix:theme|block]]) no-repeat; + background-position: 100% 0%; + border-width: 0; + border: 1px solid #dadada; + padding: 0 10px 0; } .forumpost .subject { - font-size: 1.45em; - font-family: Georgia, serif; + font-size: 1.45em; + font-family: Georgia, serif; } .forumpost .author { - font-size: 0.9em; - font-style: italic; + font-size: 0.9em; + font-style: italic; } td.picture.left img { - background: #fafafa; - padding: 4px; - padding-bottom: 9px; - border: 1px solid #dadada; + background: #fafafa; + padding: 4px; + padding-bottom: 9px; + border: 1px solid #dadada; } .forumpost .content { - border-width: 0 1px 1px; - border-style: solid; - border-color: #aaa #dadada #dadada; - padding: 5px 10px 10px; + border-width: 0 1px 1px; + border-style: solid; + border-color: #aaa #dadada #dadada; + padding: 5px 10px 10px; } /* Footer ----------------------------*/ #page-footer .helplink { - margin: 1em 0; + margin: 1em 0; } /* Dock */ body.has_dock { - margin: 0px; + margin: 0px; } .has_dock #page, .has_dock #header { - margin-left: 5%; + margin-left: 5%; } #dock { - left: 5%; - top: 107px; - margin-left: -29px; - border-width: 0; - background-color: transparent; - position: absolute; + left: 5%; + top: 107px; + margin-left: -29px; + border-width: 0; + background-color: transparent; + position: absolute; } #dock .controls { - bottom: auto; - -webkit-border-bottom-left-radius: 3px; - -moz-border-radius-bottomleft: 3px; - border-bottom-left-radius: 3px; + bottom: auto; + -webkit-border-bottom-left-radius: 3px; + -moz-border-radius-bottomleft: 3px; + border-bottom-left-radius: 3px; } #dock .dockeditem_container { - position: relative; + position: relative; } #dock .dockeditem.firstdockitem { - margin-top: 50px; - border-top: 1px solid #dadada; - -webkit-border-top-left-radius: 3px; - -moz-border-radius-topleft: 3px; - border-top-left-radius: 3px; + margin-top: 50px; + border-top: 1px solid #dadada; + -webkit-border-top-left-radius: 3px; + -moz-border-radius-topleft: 3px; + border-top-left-radius: 3px; } #dock .dockeditem { - background-color: #fff; - padding: 2px; - padding-right: 0px; - border-left: 1px solid #dadada; - border-right: 0px solid #fafafa; - border-top: 1px solid #fafafa; + background-color: #fff; + padding: 2px; + padding-right: 0px; + border-left: 1px solid #dadada; + border-right: 0px solid #fafafa; + border-top: 1px solid #fafafa; } #dock .dockedtitle { - border-width: 0; + border-width: 0; } #dock .dockedtitle h2 { - margin: 0; - padding: 10px 3px; + margin: 0; + padding: 10px 3px; } #dock .dockedtitle.activeitem { - color: #fff !important; - width: 35px; - -webkit-border-top-left-radius: 3px; - -moz-border-radius-topleft: 3px; - border-top-left-radius: 3px; - -webkit-border-bottom-left-radius: 3px; - -moz-border-radius-bottomleft: 3px; - border-bottom-left-radius: 3px; + color: #fff !important; + width: 35px; + -webkit-border-top-left-radius: 3px; + -moz-border-radius-topleft: 3px; + border-top-left-radius: 3px; + -webkit-border-bottom-left-radius: 3px; + -moz-border-radius-bottomleft: 3px; + border-bottom-left-radius: 3px; } #dock .dockedtitle.activeitem h2 { - color: #fff !important; + color: #fff !important; } #dockeditempanel { - margin-left: 0px; + margin-left: 0px; } #dockeditempanel .dockeditempanel_content { - background-color: #fff; - margin: 0 3px; - position: relative; - min-height: 100px; - -webkit-border-radius: 3px; - -webkit-border-top-left-radius: 0; - -moz-border-radius: 3px; - -moz-border-radius-topleft: 0; - border-radius: 3px; - border-top-left-radius: 0; + background-color: #fff; + margin: 0 3px; + position: relative; + min-height: 100px; + -webkit-border-radius: 3px; + -webkit-border-top-left-radius: 0; + -moz-border-radius: 3px; + -moz-border-radius-topleft: 0; + border-radius: 3px; + border-top-left-radius: 0; } #dockeditempanel .dockeditempanel_hd { - border-width: 0; - padding: 2px; + border-width: 0; + padding: 2px; } #dockeditempanel .dockeditempanel_hd h2 { - font-size: 0.9em; - color: #fff; + font-size: 0.9em; + color: #fff; } /** yui menu styles **/ #menustuff { - width: 600px; - float: left; - clear: left; - height: 65px; + width: 600px; + float: left; + clear: left; + height: 65px; } -#custommenu { - border: none !important; +#custommenu, +#custommenu .yui3-menu-content { + border-width:0; } -div.yui3-menu-content { - border: none !important; +#custommenu .yui3-menu-content li a { + font-size: 14px; + font-family: Georgia, serif; + font-weight: 200; + text-transform: lowercase; + line-height: 70px; + cursor: pointer; + border-width:0; } -.yui3-menu-content li a { - font-size: 14px; - font-family: Georgia, serif !important; - font-weight: 200; - text-transform: lowercase; - line-height: 70px; - cursor: pointer; - border-right: none !important; - border-top: none !important; - border-bottom: none !important; +#custommenu .yui3-menu-content li li a { + line-height: 30px; + text-shadow:none; } -.yui3-menu-content li a:hover { - text-decoration: underline; +#custommenu .yui3-menu-content li a:hover { + text-decoration: underline; } -div.custom_menu_submenu li a { - line-height: 30px; - text-shadow: none !important; +#custommenu .yui3-menu-content .yui3-menu-content { + background-image: url([[pix:theme|youare]]); + background-position: 30px 0; + background-repeat: no-repeat; + background-color:transparent; + margin-top:-10px; + min-width: 200px; } -div.yui3-menu.custom_menu_submenu { - background: url([[pix:theme|youare]]) no-repeat; - background-position: 30px 10px; - top: 120px !important; - border: none; - min-width: 100px; - z-index: 99998; +#custommenu .yui3-menu-content .yui3-menu-content ul { + margin-top:10px; + background-color:#FFF; + border: 1px solid #dadada } -div.yui3-menu.custom_menu_submenu div.yui3-menu-content { - margin-top: 22px; - border: 1px solid #dadada !important; - border-top: none !important; +#custommenu .yui3-menu-content .yui3-menu-content .yui3-menu-content, +#custommenu .yui3-menu-content .yui3-menu-content .yui3-menu-content ul { + margin-top:0; + background-image:none; } -/** below style to move sub subs to the left to keep from going off the page **/ +#custommenu .yui3-menuitem-active, +#custommenu .yui3-menuitem-active .yui3-menuitem-content { + background-color:transparent; +} -div.yui3-menu.custom_menu_submenu div.yui3-menu-content div.yui3-menu.custom_menu_submenu div.yui3-menu-content { - background-image: none !important; - min-width: 200px; - position: relative; - margin-top: -50px; - border-top: 1px solid #dadada !important; +#custommenu .yui3-menu .yui3-menu .yui3-menu-label-active, +#custommenu .yui3-menu .yui3-menu .yui3-menu-label-menuvisible, +#custommenu .yui3-menu .yui3-menu .yui3-menuitem-active, +#custommenu .yui3-menu .yui3-menu .yui3-menuitem-active .yui3-menuitem-content { + background-color: #FFF0A5; } .logininfo a { - color: #fff; + color: #fff; } \ No newline at end of file diff --git a/theme/formfactor/style/core.css b/theme/formfactor/style/core.css index 69128eb2b43..c58c413d82a 100644 --- a/theme/formfactor/style/core.css +++ b/theme/formfactor/style/core.css @@ -55,38 +55,63 @@ body,h1,h2,h3,h4,h5,h6,p,ul,ol,dl,input,textarea { font-family: "Trebuchet MS", #page-footer .logininfo { margin: 1em 0; } /* custum menu */ -#custommenu { margin:0 50px; } +#custommenu { + margin:0 50px; +} -#custommenu, div.yui3-menu, div.yui3-menu-content { - border: none !important; +#custommenu, +#custommenu .yui3-menu, +#custommenu .yui3-menu-content { + border-width:0; } #custommenu { - background:url([[pix:theme|gradient-sb]]) repeat-x 0 30%; - padding-top: 4px; - padding-bottom: 4px; - border-bottom: 1px solid #ccc !important; - border-left: 1px solid #eee !important; - border-right: 1px solid #eee !important; - + background:url([[pix:theme|gradient-sb]]) repeat-x 0 30%; + padding-top: 4px; + padding-bottom: 4px; + border-bottom: 1px solid #ccc; + border-left: 1px solid #eee; + border-right: 1px solid #eee; } -a.yui3-menu-label { - border: none !important; +#custommenu .yui3-menu-label, +#custommenu .yui3-menuitem-content { + border-width:0; } -div.yui3-menu-content .yui3-menu-content { - border: 1px solid #ccc !important; - border-top: none !important; - margin-top: 3px; - padding: 10px; +#custommenu .yui3-menu-content .yui3-menu-content { + border: 1px solid #ccc; + border-top-width: 0; + margin-top: 3px; } -div.yui3-menu-content .yui3-menu-content .yui3-menu-content { - border-top: 1px solid #ccc !important; +#custommenu .yui3-menu-content .yui3-menu-content .yui3-menu-content { + border-top: 1px solid #ccc; } -div.yui3-menu-content .yui3-menu-content .yui3-menuitem-content, div.yui3-menu-content .yui3-menu-content .yui3-menu-label{ - padding-top: 5px !important; - -} \ No newline at end of file +#custommenu .yui3-menu-content .yui3-menu-content .yui3-menuitem-content, +#custommenu .yui3-menu-content .yui3-menu-content .yui3-menu-label { + padding-top: 5px; +} + +#custommenu .yui3-menu-label, +#custommenu .yui3-menuitem-content { + color:#BF3503; +} + +#custommenu .yui3-menu .yui3-menuitem-active, +#custommenu .yui3-menu-label-menuvisible, +#custommenu .yui3-menu-label-active, +#custommenu .yui3-menuitem-active .yui3-menuitem-content { + background-color: #BF3503; +} + +#custommenu .yui3-menu-label-active, +#custommenu .yui3-menu-label-menuvisible, +#custommenu .yui3-menuitem-active .yui3-menuitem-content { + color:#FFF; +} + +#custommenu .yui3-menu-horizontal.javascript-disabled .yui3-menu-content { + border-width:0; +} diff --git a/theme/formfactor/style/selected.css b/theme/formfactor/style/selected.css index 5d0dc62910b..a7aca20b419 100644 --- a/theme/formfactor/style/selected.css +++ b/theme/formfactor/style/selected.css @@ -1,8 +1,6 @@ a:link, a:visited { color: #bf3503; } -a.yui3-menu-label, div.yui3-menu-content .yui3-menu-content .yui3-menuitem-content { color: #bf3503 !important; } - a:hover, a:active { color:#3f5c10; } diff --git a/theme/fusion/style/menus.css b/theme/fusion/style/menus.css index 33e17499bc5..f5b7d70f341 100644 --- a/theme/fusion/style/menus.css +++ b/theme/fusion/style/menus.css @@ -1,197 +1,40 @@ -#custommenu { - font-size: 1.2em; - line-height: 1.2; - float: left; - width:60%; -} - -.yui3-skin-sam .yui3-menu-content, -.yui3-skin-sam .yui3-menu .yui3-menu .yui3-menu-content { - border: none; - padding: 0 !important; -} - -.yui3-skin-sam .yui3-menu .yui3-menu .yui3-menu-content { - background: #fff; - filter:alpha(opacity=95); - -moz-opacity:0.95; - -khtml-opacity: 0.95; - opacity: 0.95; - padding: 5px 0; -} - - -/* Horizontal menus */ - -.yui3-skin-sam .yui3-menu-horizontal .yui3-menu-content { - - -} - - -.yui3-skin-sam .yui3-menu ul, -.yui3-skin-sam .yui3-menu ul ul { - -} - -.yui3-skin-sam .yui3-menu ul.first-of-type { -} - -.yui3-skin-sam .yui3-menu-horizontal ul { -} - - -.yui3-skin-sam .yui3-menu li, -.yui3-skin-sam .yui3-menu .yui3-menu li { - -} - -.yui3-skin-sam .yui3-menu-horizontal li { - -} - -.yui3-skin-sam .yui3-menubuttonnav li { - -} - -.yui3-skin-sam .yui3-splitbuttonnav li { - -} - -.yui3-skin-sam .yui3-menubuttonnav li li, -.yui3-skin-sam .yui3-splitbuttonnav li li { - -} - - -/* Menuitems and menu labels */ -.yui3-skin-sam .yui3-menu .yui3-menu { - padding-top: 5px; - background: url([[pix:theme|menu-top]]) no-repeat 20px 0; - filter:alpha(opacity=95); - -moz-opacity:0.95; - -khtml-opacity: 0.95; - opacity: 0.95; -} - -.custom_menu_submenu .custom_menu_submenu { - - filter:alpha(opacity=100); - -moz-opacity:1 !important; - -khtml-opacity: 1 !important; - opacity: 1 !important; -} - - -.yui3-skin-sam .yui3-menu .yui3-menu .yui3-menu { - padding-top: 0; - background: none; -} - -.yui3-skin-sam .yui3-menuitem-content, -.yui3-skin-sam .yui3-menu-label { - color: #a2a3a6; -} - -.yui3-skin-sam .yui3-menuitem-content, -.yui3-skin-sam .yui3-menu .yui3-menu .yui3-menuitem-content { - padding-top: 3px; - padding-bottom: 4px; -} - -.yui3-skin-sam .yui3-menu-horizontal .yui3-menu-label, -.yui3-skin-sam .yui3-menu-horizontal .yui3-menuitem-content { - border: none; - padding: 0 20px 0 0; -} - -.yui3-skin-sam .yui3-menu-label, -.yui3-skin-sam .yui3-menu .yui3-menu .yui3-menu-label { - padding-top: 3px; - padding-bottom: 4px; - -} - -.yui3-skin-sam .yui3-menu-horizontal .yui3-menu-label { - - -} - -.yui3-skin-sam .yui3-menubuttonnav .yui3-menu-label, -.yui3-skin-sam .yui3-splitbuttonnav .yui3-menu-label { - - -} - -.yui3-skin-sam .yui3-menubuttonnav .yui3-menu-label { - - -} - -.yui3-skin-sam .yui3-menubuttonnav .yui3-menu-label em { - - -} - - -.yui3-skin-sam .yui3-splitbuttonnav .yui3-menu-label { - - -} - -.yui3-skin-sam .yui3-splitbuttonnav .yui3-menu-label a { - - -} - -.yui3-skin-sam .yui3-splitbuttonnav .yui3-menu-label .yui3-menu-toggle { - - -} - - -/* Selected menuitem */ - -.yui3-skin-sam .yui3-menu-label-active, -.yui3-skin-sam .yui3-menu-label-menuvisible, -.yui3-skin-sam .yui3-menu .yui3-menu .yui3-menu-label-active, -.yui3-skin-sam .yui3-menu .yui3-menu .yui3-menu-label-menuvisible { - color: #fff; - background-color: #2d83d5; -} - -.yui3-skin-sam .yui3-menuitem-active .yui3-menuitem-content, -.yui3-skin-sam .yui3-menu .yui3-menu .yui3-menuitem-active .yui3-menuitem-content { - color: #fff; - background-color: #2d83d5; - -} - -.yui3-skin-sam .yui3-menu-horizontal .yui3-menu-label-active, -.yui3-skin-sam .yui3-menu-horizontal .yui3-menuitem-active .yui3-menuitem-content, -.yui3-skin-sam .yui3-menu-horizontal .yui3-menu-label-menuvisible { -} - -.yui3-skin-sam .yui3-menubuttonnav .yui3-menu-label-active, -.yui3-skin-sam .yui3-menubuttonnav .yui3-menuitem-active .yui3-menuitem-content, -.yui3-skin-sam .yui3-menubuttonnav .yui3-menu-label-menuvisible, -.yui3-skin-sam .yui3-splitbuttonnav .yui3-menu-label-active, -.yui3-skin-sam .yui3-splitbuttonnav .yui3-menuitem-active .yui3-menuitem-content, -.yui3-skin-sam .yui3-splitbuttonnav .yui3-menu-label-menuvisible { - - -} - -.yui3-skin-sam .yui3-splitbuttonnav .yui3-menu-label-menuvisible { - - -} - -.yui3-skin-sam .yui3-splitbuttonnav .yui3-menu-label-menuvisible .yui3-menu-toggle { - - -} - -#custommenu .yui3-menu-horizontal.javascript-disabled .yui3-menu-content, -#custommenu .yui3-menu-horizontal.javascript-disabled .yui3-menu-content .ul {border:none !important;} -#custommenu .yui3-menu-horizontal.javascript-disabled li a {padding:0 20px 0 0;} +#custommenu {font-size: 1.2em;line-height: 1.2;float: left;width:60%;} + +#custommenu .yui3-menu .yui3-menuitem {padding-right:20px;} +#custommenu .yui3-menu .yui3-menu .yui3-menuitem {padding-right:0;} +#custommenu .yui3-menu .yui3-menu .yui3-menu-content {border-width: 0;background-color: #fff;padding: 5px 0;} + +#custommenu .yui3-menu .yui3-menu {padding-top: 5px;background-image: url([[pix:theme|menu-top]]);background-repeat: no-repeat;background-position: 20px 0;} +#custommenu .yui3-menu .yui3-menu .yui3-menu {padding-top: 0;background-image: none;} + +#custommenu .yui3-menuitem-content, +#custommenu .yui3-menu-label {color: #a2a3a6;} + +#custommenu .yui3-menu-label, +#custommenu .yui3-menuitem-content, +#custommenu .yui3-menu .yui3-menu .yui3-menu-label, +#custommenu .yui3-menu .yui3-menu .yui3-menuitem-content {padding-top: 3px;padding-bottom: 4px;} + +#custommenu .yui3-menu-content, +#custommenu .yui3-menu-horizontal .yui3-menu-label, +#custommenu .yui3-menu-horizontal .yui3-menuitem-content {border-width: 0;} + +#custommenu .yui3-menuitem-active {background-color: transparent;} + +#custommenu .yui3-menu-label-active, +#custommenu .yui3-menu-label-menuvisible, +#custommenu .yui3-menu .yui3-menu .yui3-menu-label-menuvisible, +#custommenu .yui3-menuitem-active .yui3-menuitem-content, +#custommenu .yui3-menu .yui3-menu .yui3-menuitem-active .yui3-menuitem-content {color: #fff;background-color: #2d83d5;} + +/** + * Don't set opacity in IE it prevents level 3+ submenu's from displaying due to + * a bug with the way IE applies opacity to children + */ +#custommenu .yui3-menu .yui3-menu {-moz-opacity:0.95;-khtml-opacity: 0.95;opacity: 0.95;} +#custommenu .yui3-menu .yui3-menu .yui3-menu {-moz-opacity:1;-khtml-opacity: 1;opacity: 1;} + +#custommenu .yui3-menu.javascript-disabled .yui3-menu-content, +#custommenu .yui3-menu.javascript-disabled .yui3-menu-content .ul {border:none;} +#custommenu .yui3-menu.javascript-disabled .yui3-menuitem {padding-right:20px;} +#custommenu .yui3-menu.javascript-disabled .yui3-menu .yui3-menuitem {padding-right:0;} \ No newline at end of file diff --git a/theme/leatherbound/style/core.css b/theme/leatherbound/style/core.css index 9a42ec52267..80263d58370 100644 --- a/theme/leatherbound/style/core.css +++ b/theme/leatherbound/style/core.css @@ -301,69 +301,42 @@ h2.headingblock { } #custommenu { - border: none !important; - border: 0px solid #fff !important; + border-width: 0; margin: 0 25px; } -#custommenu * { - border: none !important; -} - /*YUI Reset */ -.yui3-skin-sam #page .yui3-menu-horizontal .yui3-menu-content{ - background-position: -10000px -10000px; -} - -.yui3-skin-sam #page .yui3-menu-horizontal .yui3-menu-label{ - background-position: -10000px -10000px; -} - -.yui3-skin-sam #page .yui3-menu-horizontal .yui3-menu-label-active,.yui3-skin-sam #page .yui3-menu-horizontal .yui3-menuitem-active .yui3-menuitem-content,.yui3-skin-sam #page .yui3-menu-horizontal .yui3-menu-label-menuvisible{ - background-position: -10000px -10000px; -} - -.yui3-skin-sam #page .yui3-menu-label, -.yui3-skin-sam #page .yui3-menu .yui3-menu .yui3-menu-label { - background-position: right center; -} - -.yui3-skin-sam #page .yui3-menubuttonnav .yui3-menu-label em { - background-position: right center; -} - -.yui3-skin-sam #page .yui3-splitbuttonnav .yui3-menu-label .yui3-menu-toggle { - background-position: 3px center; -} - -.yui3-skin-sam #page .yui3-splitbuttonnav .yui3-menu-label-menuvisible .yui3-menu-toggle { - background-position: 0% 50%; -} - -.yui3-skin-sam #page .yui3-menu-label, .yui3-skin-sam #page .yui3-menuitem-content { +#custommenu .yui3-menu-label, +#custommenu .yui3-menuitem-content { color: #35251B; font-weight: 400; + border-width: 0; } -.custom_menu_submenu .yui3-menu-label, .custom_menu_submenu .yui3-menuitem-content { - color: #35251B !important; +#custommenu .custom_menu_submenu .yui3-menu-label, +#custommenu .custom_menu_submenu .yui3-menuitem-content { + color: #35251B; } -.yui3-skin-sam #page .yui3-menu-label.yui3-menu-label-active, .yui3-skin-sam #page .yui3-menuitem-active .yui3-menuitem-content { +#custommenu .yui3-menu-label.yui3-menu-label-active, +#custommenu .yui3-menuitem-active .yui3-menuitem-content { color: #DA5013; } -.yui3-skin-sam #page .yui3-menu-content, .yui3-skin-sam #page .yui3-menu-content, .yui3-skin-sam #page .yui3-menu .yui3-menu .yui3-menu-content, .yui3-skin-sam #page .yui3-menu-horizontal .yui3-menu-label, .yui3-skin-sam #page .yui3-menu-horizontal .yui3-menuitem-content { - border: none; +#custommenu .yui3-menu-content, +#custommenu .yui3-menu .yui3-menu .yui3-menu-content, +#custommenu .yui3-menu-horizontal .yui3-menu-label, +#custommenu .yui3-menu-horizontal .yui3-menuitem-content { + border-width: 0; } -.yui3-skin-sam .yui3-menu-horizontal .yui3-menu-label, .yui3-skin-sam .yui3-menu-horizontal .yui3-menuitem-content { - border-color:#808080; - border-style:solid; - border-width:0px 0; +#custommenu .yui3-menu-label-active, +#custommenu .yui3-menu-label-menuvisible, +#custommenu .yui3-menu .yui3-menu .yui3-menuitem-active .yui3-menuitem-content { + background-color:#F6F6F6; } -#page .custom_menu_submenu { +#custommenu .custom_menu_submenu { border: 2px solid #DA5013 !important; background: #fff; -webkit-border-radius: 2px; @@ -373,3 +346,8 @@ h2.headingblock { -moz-box-shadow: 0px 1px 3px #ccc; box-shadow: 0px 1px 3px #ccc; } + +#custommenu .yui3-menu.javascript-disabled .yui3-menu-content, +#custommenu .yui3-menu.javascript-disabled .yui3-menu-content .ul { + border-width:0; +} \ No newline at end of file diff --git a/theme/magazine/style/core.css b/theme/magazine/style/core.css index 80b0b278db8..176c598b3ce 100644 --- a/theme/magazine/style/core.css +++ b/theme/magazine/style/core.css @@ -463,105 +463,106 @@ div.yui3-widget-bd h1.helpheading { height: 45px; } -div.yui3-menu.yui3-menu-horizontal { - background: #fafafa url([[pix:theme|menubarback]]) repeat-x !important; - border-bottom: 1px solid #cccccc !important; - border-top: 1px solid #dadada !important; +#custommenu .yui3-menu.yui3-menu-horizontal { + background: #fafafa url([[pix:theme|menubarback]]) repeat-x; + border-bottom: 1px solid #cccccc; + border-top: 1px solid #dadada; border-left: none; border-right: 1px solid #cccccc; float: right; } -div.yui3-menu-content { - border: none !important; +#custommenu .yui3-menu-content { + border-width: 0; } -.yui3-menu-content li a { +#custommenu .yui3-menu-content li a { font-size: 12px; font-weight: 600; text-transform: lowercase; line-height: 45px; cursor: pointer; - border-right: none !important; - border-top: none !important; - border-bottom: none !important; + border-right-width: 0; + border-top-width: 0; + border-bottom-width: 0; } -.yui3-menu-horizontal .yui3-menu-label { +#custommenu .yui3-menu-label { padding-left: 16px !important; - background: url([[pix:theme|yuiarrows]]) no-repeat 7px 17px !important; - } - -.yui3-menu-horizontal .yui3-menu-label-menuvisible { - background-position: 5px -23px !important; + background: url([[pix:theme|yuiarrows]]) no-repeat 7px 17px; } -.yui3-menu-content li { +#custommenu .yui3-menu-label-menuvisible { + background-position: 5px -23px; +} + +#custommenu .yui3-menu-content li { border-left: 1px solid #dadada; - border-top: none !important; + border-top-width: 0; } -.yui3-menu-content li:hover { +#custommenu .yui3-menu-content li:hover { background: #eee; } -div.yui3-menu.custom_menu_submenu { +#custommenu .yui3-menu.custom_menu_submenu { background: url([[pix:theme|yuiarrow]]) no-repeat 40px 0; border: none; min-width: 100px; z-index: 99998; } -div.yui3-menu.custom_menu_submenu div.yui3-menu.custom_menu_submenu { - background: none !important; +#custommenu .yui3-menu.custom_menu_submenu .yui3-menu.custom_menu_submenu { + background-image: none; + background-color: transparent; min-width: 100px; } -div.yui3-menu.custom_menu_submenu div.yui3-menu-content { +#custommenu .yui3-menu.custom_menu_submenu .yui3-menu-content { background: #fff; z-index: 99999; min-width: 200px; - padding-top: 0 !important; - padding-bottom: 0 !important; + padding-top: 0; + padding-bottom: 0; margin: 20px 0px 0px -40px; } /** below style to move sub subs to the left to keep from going off the page **/ -div.yui3-menu.custom_menu_submenu div.yui3-menu-content div.yui3-menu.custom_menu_submenu div.yui3-menu-content { +#custommenu .yui3-menu.custom_menu_submenu .yui3-menu-content .yui3-menu.custom_menu_submenu .yui3-menu-content { margin-left: -400px !important; /** double the width of the menu item **/ position: absolute; top: -15px; } -div.yui3-menu.custom_menu_submenu .yui3-menu-content li { +#custommenu .yui3-menu.custom_menu_submenu .yui3-menu-content li { border-left: none; } -div.yui3-menu.custom_menu_submenu .yui3-menu-content li a { +#custommenu .yui3-menu.custom_menu_submenu .yui3-menu-content li a { font-size: 11px; - border-bottom: 1px solid #cccccc !important; - border-top: 0px solid #fff !important; + border-bottom: 1px solid #cccccc; + border-top-width: 0; text-transform: none; - background: #eee !important; - text-decoration: none !important; + background: #eee; + text-decoration: none; text-transform: lowercase; } -div.yui3-menu.custom_menu_submenu .yui3-menu-content li a:hover { - background: #cccccc !important; +#custommenu .yui3-menu.custom_menu_submenu .yui3-menu-content li a:hover { + background: #cccccc; cursor: pointer; - color: black !important; - text-decoration: none !important; + color: #000; + text-decoration: none; } -div.yui3-menu.custom_menu_submenu li a.yui3-menu-label { - background: #eee url([[pix:theme|yuiarrows]]) no-repeat 7px -72px !important; +#custommenu .yui3-menu.custom_menu_submenu li a.yui3-menu-label { + background: #eee url([[pix:theme|yuiarrows]]) no-repeat 7px -72px; } -div.yui3-menu.custom_menu_submenu li a.yui3-menu-label:hover { - background: #ccc url([[pix:theme|yuiarrows]]) no-repeat !important 7px -72px; +#custommenu .yui3-menu.custom_menu_submenu li a.yui3-menu-label:hover { + background: #ccc url([[pix:theme|yuiarrows]]) no-repeat 7px -72px; } /** yui moodle dock bar **/ diff --git a/theme/nimble/pix/horizontal-menu-submenu-indicator.png b/theme/nimble/pix/horizontal-menu-submenu-indicator.png new file mode 100644 index 0000000000000000000000000000000000000000..62a2772da3825faf1985d85e3f86014bbc9bf71e GIT binary patch literal 938 zcmV;b16BNqP)Px&08mU+MF0Q*|NsB}{r&v>{QLX+`uh6$`T6+x`1kks_V)Jm_4V}h^z-xc^78WW z@$vBR@bB;M?(XjG?d|OB?Cb06>gww0>FMa`=;!C>=H}+*<>ln$W+}qpR+S=OL+1c3G*w@$B*4Eb5)z#G0)YH?`($dn=(b3S*(9h4$ z&d$!w&CSfr%*)Hm%F4>g$;rsb$j8UW#>U3Q#l^(L#KXhG!otGA!NI`5z`wu0zP`S_ zy}i7=yt})*y1Kf#xw*KwxVN{rwzjslwY9Xgw6n9bva+(Vv9YkQu&=MLuCA`Ft*xxA ztgEZ5s;a7~si~-_sHdl=rlzK)rKO~#q@$ywqN1Xqp`oClpr4PVoSU1Q znwpxKnVFcFn3tEAmX?;4m6eo~l#`Q_l9G~@|DJdu@C?_W;CMG5&B_$*zBqJjuA|fIo zAt4|jARiwe9v&VY9UUAT92*-O8X6iI85tND7#9~878Vv26%`Z|6cZB@5)u*-5fKm& z5DyOz4h{|t4Gjzo3=0bj3JMAd2?+=Y2nPoT1_lNN1qB2I1Oo#D0s;a70RaF20GV%I zw*UYD0d!JMQvg8b*k%9#00Cl4M??UK1szBL000SaNLh0L01FcU01FcV0GgZ_00007 zbV*G`2ipS@0wg*;{ZH}$000(AL_t&t*JEIW00sm==YvHUPyq@b00UM45gx+s{{R30 M07*qoM6N<$f_>qlM*si- literal 0 HcmV?d00001 diff --git a/theme/nimble/pix/vertical-menu-submenu-indicator.png b/theme/nimble/pix/vertical-menu-submenu-indicator.png new file mode 100644 index 0000000000000000000000000000000000000000..2081588c28150a02d42d808aa0050d35025d8f46 GIT binary patch literal 942 zcmV;f15x~mP)Px&08mU+MF0Q*|NsB}{r&v>{QLX+`uh6$`T6+x`1kks_V)Jm_4V}h^z-xc^78WW z@$vBR@bB;M?(XjG?d|OB?Cb06>gww0>FMa`=;!C>=H}+*<>ln$W+}qpR+S=OL+1c3G*w@$B*4Eb5)z#G0)YH?`($dn=(b3S*(9h4$ z&d$!w&CSfr%*)Hm%F4>g$;rsb$j8UW#>U3Q#l^(L#KXhG!otGA!NI`5z`wu0zP`S_ zy}i7=yt})*y1Kf#xw*KwxVN{rwzjslwY9Xgw6n9bva+(Vv9YkQu&=MLuCA`Ft*xxA ztgEZ5s;a7~si~-_sHdl=rlzK)rKO~#q@$ywqN1Xqp`oClpr4PVoSU1Q znwpxKnVFcFn3tEAmX?;4m6eo~l#`Q_l9G~@|DJdu@C?_W;CMG5&B_$*zBqJjuA|fIo zAt4|jARiwe9v&VY9UUAT92*-O8X6iI85tND7#9~878Vv26%`Z|6cZB@5)u*-5fKm& z5DyOz4h{|t4Gjzo3=0bj3JMAd2?+=Y2nPoT1_lNN1qB2I1Oo#D0s;a70RaF20GV%I zw*UYD0d!JMQvg8b*k%9#00Cl4M??UK1szBL000SaNLh0L01FcU01FcV0GgZ_00007 zbV*G`2ipS@0wOqtsfkzs000_EL_t&t*JEI0Kmv@6C>%x<4kIoZWIaf100Vsh5y2mW Qv;Y7A07*qoM6N<$f(oah2LJ#7 literal 0 HcmV?d00001 diff --git a/theme/nimble/style/colors.css b/theme/nimble/style/colors.css index 34029f12426..c0883bebd48 100644 --- a/theme/nimble/style/colors.css +++ b/theme/nimble/style/colors.css @@ -1,40 +1,31 @@ #page-header-wrapper { - background: [[setting:backgroundcolor]]; + background: [[setting:backgroundcolor]]; } a { - color: [[setting:linkcolor]]; + color: [[setting:linkcolor]]; } a:hover { - color: #000; + color: #000; } -.yui3-skin-sam .yui3-menu-label-active, -.yui3-skin-sam .yui3-menu-label-menuvisible { - color: #fff; - background: [[setting:linkhover]] !important; -} - -.yui3-skin-sam .yui3-menu .yui3-menu { - padding-top: 5px; - background: [[setting:linkhover]]; - +#custommenu .yui3-menu-content .yui3-menu-content, +#custommenu .yui3-menu-label.yui3-menu-label-active, +#custommenu .yui3-menuitem.yui3-menuitem-active .yui3-menuitem-content, +#custommenu .yui3-menu .yui3-menu .yui3-menu-label, +#custommenu .yui3-menu .yui3-menu .yui3-menuitem .yui3-menuitem-content { + background-color: [[setting:linkhover]]; + background-image:none; } - -.yui3-skin-sam .yui3-menu .yui3-menu .yui3-menu .yui3-menu-label-active, -.yui3-skin-sam .yui3-menu .yui3-menu .yui3-menu .yui3-menu-label-menuvisible { - color: #fff; - background-color: [[setting:linkhover]] !important; +#custommenu .yui3-menu .yui3-menu .yui3-menu-label-active, +#custommenu .yui3-menu .yui3-menu .yui3-menuitem-active .yui3-menuitem-content { + background-color:#333; + background-image:none; } - -.yui3-skin-sam .yui3-menu .yui3-menu .yui3-menu-content { - background: [[setting:linkhover]]; -} - -.yui3-skin-sam .yui3-menu .yui3-menu .yui3-menu .yui3-menu-content { - background: [[setting:linkhover]]; +#custommenu .yui3-menu-horizontal.javascript-disabled li:hover a { + background-color: [[setting:linkhover]]; } \ No newline at end of file diff --git a/theme/nimble/style/menu.css b/theme/nimble/style/menu.css index 76ea418bf64..4a450c99def 100644 --- a/theme/nimble/style/menu.css +++ b/theme/nimble/style/menu.css @@ -1,208 +1,64 @@ +/** + * These are the styles for the custom menu in the nimble theme. + * Please note there are settings to alter the active menu background colour. + * The CSS for these settings is in colors.css + */ #custommenu { - font-size: 1.2em; - line-height: 1.2; - float: left; - width:60%; + font-size: 1.2em; + line-height:2em; + float: left; + width:60%; + border-bottom:1px solid #454545; } -.yui3-skin-sam .yui3-menu-content, -.yui3-skin-sam .yui3-menu .yui3-menu .yui3-menu-content { - border: none; - padding: 0 !important; +#custommenu .yui3-menu-label { + margin-right:10px; + padding: 0 20px; } -.yui3-skin-sam .yui3-menu .yui3-menu .yui3-menu-content { - - padding: 5px 0; - color: #fff; +#custommenu .yui3-menu-label, +#custommenu .yui3-menuitem-content { + border: 1px solid #555; + border-bottom-width: 0; + color:#FFF; + background-color:#333; + border-radius: 10px 10px 0 0; + -moz-border-radius: 10px 10px 0 0; + -webkit-border-radius: 10px 10px 0 0; } - -/* Horizontal menus */ - -.yui3-skin-sam .yui3-menu-horizontal .yui3-menu-content { - - +#custommenu .yui3-menu .yui3-menu .yui3-menu-label, +#custommenu .yui3-menu .yui3-menu .yui3-menuitem-content { + margin-right:0; + border-width:0; + padding:3px 20px 4px; + border-radius:0; + -moz-border-radius: 0; + -webkit-border-radius: 0; } - -.yui3-skin-sam .yui3-menu ul, -.yui3-skin-sam .yui3-menu ul ul { - +#custommenu .yui3-menu-content { + border-width:0; + padding:0; } -.yui3-skin-sam .yui3-menu ul.first-of-type { +#custommenu .yui3-menu-content .yui3-menu-content { + padding-top:5px; } -.yui3-skin-sam .yui3-menu-horizontal ul { +#custommenu .yui3-menu-content .yui3-menu-content .yui3-menu-content { + padding-top:0; } - -.yui3-skin-sam .yui3-menu li, -.yui3-skin-sam .yui3-menu .yui3-menu li { - +#custommenu .yui3-menuitem-active { + background-color: transparent; } -.yui3-skin-sam .yui3-menu-horizontal li { - +#custommenu .yui3-menu-horizontal.javascript-disabled li a { + padding:3px 20px 4px; } -.yui3-skin-sam .yui3-menubuttonnav li { - -} - -.yui3-skin-sam .yui3-splitbuttonnav li { - -} - -.yui3-skin-sam .yui3-menubuttonnav li li, -.yui3-skin-sam .yui3-splitbuttonnav li li { - -} - - -/* Menuitems and menu labels */ - - -.yui3-skin-sam .yui3-menu .yui3-menu .yui3-menu { - background: #333 !important; -} -.custom_menu_submenu .custom_menu_submenu { - -} - - -.yui3-skin-sam .yui3-menu .yui3-menu .yui3-menu { - padding-top: 0; - background: none; -} - -.yui3-skin-sam .yui3-menuitem-content, -.yui3-skin-sam .yui3-menu-label { - color: #fff !important; -} - -.yui3-skin-sam .yui3-menuitem-content, -.yui3-skin-sam .yui3-menu .yui3-menu .yui3-menuitem-content { - padding-top: 3px; - padding-bottom: 4px; - color: #fff !important; - -} - -.yui3-skin-sam .yui3-menu-horizontal .yui3-menu-label, -.yui3-skin-sam .yui3-menu-horizontal .yui3-menuitem-content { - color: #fff !important; -} - -.yui3-skin-sam .yui3-menu .yui3-menu .yui3-menu .yui3-menuitem-active .yui3-menuitem-content { - color: #fff; - background-color: #333; - -} - -.yui3-skin-sam .yui3-menu-label, -.yui3-skin-sam .yui3-menu .yui3-menu .yui3-menu-label { - padding-top: 3px; - padding-bottom: 4px; - border-radius:0; - -moz-border-radius: 0; - -webkit-border-radius: 0; - color: #fff !important; - -} - -.yui3-skin-sam .yui3-menu-horizontal .yui3-menu-label { - border: solid #555; - border-width: 1px 1px 0 1px; - padding: 0 20px 0 20px; - margin: 0 10px 0 0; - background: #333; - border-radius: 10px 10px 0 0; - -moz-border-radius: 10px 10px 0 0; - -webkit-border-radius: 10px 10px 0 0; - -} - -.yui3-skin-sam .yui3-menubuttonnav .yui3-menu-label, -.yui3-skin-sam .yui3-splitbuttonnav .yui3-menu-label { - - -} - -.yui3-skin-sam .yui3-menubuttonnav .yui3-menu-label { - - -} - -.yui3-skin-sam .yui3-menubuttonnav .yui3-menu-label em { - - -} - - -.yui3-skin-sam .yui3-splitbuttonnav .yui3-menu-label { - - -} - -.yui3-skin-sam .yui3-splitbuttonnav .yui3-menu-label a { - - -} - -.yui3-skin-sam .yui3-splitbuttonnav .yui3-menu-label .yui3-menu-toggle { - - -} - - -/* Selected menuitem */ - - - -.yui3-skin-sam .yui3-menu .yui3-menu .yui3-menu-label-active, -.yui3-skin-sam .yui3-menu .yui3-menu .yui3-menu-label-menuvisible { - color: #fff; - background-color: #333 !important; -} - -.yui3-skin-sam .yui3-menuitem-active .yui3-menuitem-content, -.yui3-skin-sam .yui3-menu .yui3-menu .yui3-menuitem-active .yui3-menuitem-content { - color: #fff; - background-color: #333; - -} - - - - - -.yui3-skin-sam .yui3-menu-horizontal .yui3-menu-label-active, -.yui3-skin-sam .yui3-menu-horizontal .yui3-menuitem-active .yui3-menuitem-content, -.yui3-skin-sam .yui3-menu-horizontal .yui3-menu-label-menuvisible { -} - -.yui3-skin-sam .yui3-menubuttonnav .yui3-menu-label-active, -.yui3-skin-sam .yui3-menubuttonnav .yui3-menuitem-active .yui3-menuitem-content, -.yui3-skin-sam .yui3-menubuttonnav .yui3-menu-label-menuvisible, -.yui3-skin-sam .yui3-splitbuttonnav .yui3-menu-label-active, -.yui3-skin-sam .yui3-splitbuttonnav .yui3-menuitem-active .yui3-menuitem-content, -.yui3-skin-sam .yui3-splitbuttonnav .yui3-menu-label-menuvisible { - - -} - -.yui3-skin-sam .yui3-splitbuttonnav .yui3-menu-label-menuvisible { - - -} - -.yui3-skin-sam .yui3-splitbuttonnav .yui3-menu-label-menuvisible .yui3-menu-toggle { - - -} - -#custommenu .yui3-menu-horizontal.javascript-disabled .yui3-menu-content, -#custommenu .yui3-menu-horizontal.javascript-disabled .yui3-menu-content .ul {border:none !important;} -#custommenu .yui3-menu-horizontal.javascript-disabled li a {padding:0 20px 0 0;} +#custommenu .yui3-menu-horizontal.javascript-disabled .yui3-menu-content, +#custommenu .yui3-menu-horizontal.javascript-disabled .yui3-menu-content .ul { + border-width:0; +} \ No newline at end of file diff --git a/theme/nonzero/style/core.css b/theme/nonzero/style/core.css index e431fee7bd0..df6b2913bfb 100644 --- a/theme/nonzero/style/core.css +++ b/theme/nonzero/style/core.css @@ -121,7 +121,6 @@ a:active { font-size: 0.95em; } -. /* Forums ---------------------------*/ @@ -164,83 +163,47 @@ a:active { } /* Custom Menu */ -/*custom menu styles */ #custommenuwrap { clear: both; padding-top: 4px; } #custommenu { - border: none !important; - border: 0px solid #fff !important; + border-width: 0; } -#custommenu * { - border: none !important; -} - -/*YUI Reset */ -.yui3-skin-sam #page .yui3-menu-horizontal .yui3-menu-content{ - background-position: -10000px -10000px; -} - -.yui3-skin-sam #page .yui3-menu-horizontal .yui3-menu-label{ - background-position: -10000px -10000px; -} - -.yui3-skin-sam #page .yui3-menu-horizontal .yui3-menu-label-active,.yui3-skin-sam #page .yui3-menu-horizontal .yui3-menuitem-active .yui3-menuitem-content,.yui3-skin-sam #page .yui3-menu-horizontal .yui3-menu-label-menuvisible{ - background-position: -10000px -10000px; -} - -.yui3-skin-sam #page .yui3-menu-label, -.yui3-skin-sam #page .yui3-menu .yui3-menu .yui3-menu-label { - background-position: right center; -} - -.yui3-skin-sam #page .yui3-menubuttonnav .yui3-menu-label em { - background-position: right center; -} - -.yui3-skin-sam #page .yui3-splitbuttonnav .yui3-menu-label .yui3-menu-toggle { - background-position: 3px center; -} - -.yui3-skin-sam #page .yui3-splitbuttonnav .yui3-menu-label-menuvisible .yui3-menu-toggle { - background-position: 0% 50%; -} - -.yui3-skin-sam #page .yui3-menu-label, .yui3-skin-sam #page .yui3-menuitem-content { +#page-header #custommenu .yui3-menu-label, +#page-header #custommenu .yui3-menuitem-content { color: #fff; font-weight: 600; text-decoration: none; padding-left: 0px; - padding-right: 20px !important; + padding-right: 20px ; text-shadow: 0 -1px 1px #000; + margin: -2px 0; } -.custom_menu_submenu .yui3-menu-label, .custom_menu_submenu .yui3-menuitem-content { - color: #333 !important; - padding-left: 5px !important; - text-shadow:none !important; +#page-header #custommenu .custom_menu_submenu .yui3-menu-label, +#page-header #custommenu .custom_menu_submenu .yui3-menuitem-content { + color: #333; + padding-left: 5px; + text-shadow: none; } -.yui3-skin-sam #page .yui3-menu-label.yui3-menu-label-active, .yui3-skin-sam #page .yui3-menuitem-active .yui3-menuitem-content { +#custommenu .yui3-menu-label-active, +#custommenu .yui3-menuitem-active .yui3-menuitem-content { color: #ccc; } -.yui3-skin-sam #page .yui3-menu-content, .yui3-skin-sam #page .yui3-menu-content, .yui3-skin-sam #page .yui3-menu .yui3-menu .yui3-menu-content, .yui3-skin-sam #page .yui3-menu-horizontal .yui3-menu-label, .yui3-skin-sam #page .yui3-menu-horizontal .yui3-menuitem-content { - border: none; +#custommenu .yui3-menu-content, +#custommenu .yui3-menu-label, +#custommenu .yui3-menuitem-content { + border-width: 0; } -.yui3-skin-sam .yui3-menu-horizontal .yui3-menu-label, .yui3-skin-sam .yui3-menu-horizontal .yui3-menuitem-content { - border-color:#808080; - border-style:solid; - border-width:0px 0; -} - -#page .custom_menu_submenu { - border: 1px solid #27608d !important; - border-top: none !important; +#custommenu .custom_menu_submenu { + border: 1px solid #27608d; + border-top-width: 0; background: #fff; -webkit-border-radius: 2px; -moz-border-radius: 2px; @@ -250,5 +213,13 @@ a:active { box-shadow: 0px 1px 3px #ccc; } +#custommenu .custom_menu_submenu .custom_menu_submenu .yui3-menu-content { + border-top:1px solid #333; +} + +#custommenu .yui3-menu-horizontal.javascript-disabled .yui3-menu-content { + border-width:0; +} + /** Custom CSS **/ [[setting:customcss]] diff --git a/theme/sky_high/style/menu.css b/theme/sky_high/style/menu.css index 556884a08bd..4d8337c3340 100644 --- a/theme/sky_high/style/menu.css +++ b/theme/sky_high/style/menu.css @@ -1,37 +1,37 @@ -.yui3-skin-sam .yui3-menu-content, -.yui3-skin-sam .yui3-menu .yui3-menu .yui3-menu-content, -.yui3-skin-sam .yui3-menu-horizontal .yui3-menu-label,.yui3-skin-sam .yui3-menu-horizontal .yui3-menuitem-content{ - border: 0px none; +#custommenu .yui3-menu-content, +#custommenu .yui3-menu-label, +#custommenu .yui3-menuitem-content { + border-width: 0; } -.yui3-menu ul{ +#custommenu .yui3-menu ul{ background:url([[pix:theme|sprite]]) repeat-x 0 0; } -.yui3-menu ul li ul{ +#custommenu .yui3-menu ul li ul{ background:#fff; } -.yui3-menu ul li{ +#custommenu .yui3-menu ul li{ border-right: 1px solid #ccc; } -.yui3-menu ul li ul li{ +#custommenu .yui3-menu ul li ul li{ border-right: none; border-bottom: 1px dashed #ccc; padding: 3px; } -div.yui3-menu-content { +#custommenu .yui3-menu-content { border: none !important; } -ul.first-of-type li a { - border-top: none !important; - border-bottom: none !important; +#custommenu ul.first-of-type li a { + border-top-width: 0; + border-bottom-width: 0; } -ul.first-of-type li a:hover { +#custommenu ul.first-of-type li a:hover { color: #003466; } \ No newline at end of file diff --git a/theme/splash/style/sl.css b/theme/splash/style/sl.css index 69b95f414cf..90836de20ab 100644 --- a/theme/splash/style/sl.css +++ b/theme/splash/style/sl.css @@ -277,37 +277,37 @@ a:active { padding-left: 6px; height: 33px; font-size: 1.2em; - margin-top: 0px !important; - padding-top: 0px !important; - + margin-top: 0; + padding-top: 0; } -#custommenu * { - border:none; -} - -#custommenu a:link, #custommenu a:visited { +#custommenu .yui3-menu-label, +#custommenu .yui3-menuitem-content { text-decoration:none; - color: #666; } -#custommenu a:active, #custommenu a:hover { +#custommenu .yui3-menu-label-active, +#custommenu .yui3-menu-label-menuvisible, +#custommenu .yui3-menuitem-active .yui3-menuitem-content { text-decoration:underline; - color: #666; - background: none; + background-color: transparent; } +#custommenu .yui3-menu-content, +#custommenu .yui3-menu-horizontal .yui3-menu-label, +#custommenu .yui3-menu-horizontal .yui3-menuitem-content {border-width: 0;} + #custommenu .yui3-menu-content ul.first-of-type li { border-right: 1px solid #e6d0d4; } -#custommenu div.yui3-menu.custom_menu_submenu .yui3-menu-content { +#custommenu .yui3-menu.custom_menu_submenu .yui3-menu-content { background:#6d1523; border:1px solid #fff; color: #fff; } -#custommenu div.yui3-menu.custom_menu_submenu .yui3-menu-content a { +#custommenu .yui3-menu.custom_menu_submenu .yui3-menu-content a { color: #fff; } @@ -316,11 +316,11 @@ a:active { border-width:0; } -.yui3-skin-sam .yui3-menu-label-active, -.yui3-skin-sam .yui3-menu-label-menuvisible, -.yui3-skin-sam .yui3-menu .yui3-menu .yui3-menu-label-active, -.yui3-skin-sam .yui3-menu .yui3-menu .yui3-menu-label-menuvisible { +#custommenu .yui3-menu-label-active, +#custommenu .yui3-menu-label-menuvisible, +#custommenu .yui3-menuitem-active .yui3-menuitem-content { background-color: #605f5f; + color: #FFF; } /* Breadcrumb Navbar