Merge branch 'MDL-25914'

This commit is contained in:
Sam Hemelryk
2011-01-31 14:41:04 +08:00
+31 -16
View File
@@ -12,7 +12,6 @@ body,h1,h2,h3,h4,h5,h6,p,ul,ol,dl,input,textarea {
font-family:"Trebuchet MS", Helvetica, Arial, sans-serif;
}
#wrapper {
margin: 25px 75px;
background: #fff;
@@ -169,8 +168,8 @@ fieldset#general {
}
#footer {
color: #fff;
text-align: center;
color: #fff;
text-align: center;
}
/* Dock
-----------------------------*/
@@ -261,7 +260,7 @@ body.has_dock {
}
.myclear {
clear: both;
clear: both;
}
.has-custom-menu #page-header .headermain {
@@ -277,6 +276,25 @@ clear: both;
border-width:0;
}
/*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: none !important;
border-color:inherit;
}
.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;
@@ -284,8 +302,8 @@ clear: both;
border-top-width:0;
}
#custommenu .yui3-menu-horizontal .yui3-menu-content .yui3-menu-label {
color:#FFF;
#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,
@@ -293,28 +311,25 @@ clear: both;
padding:0;
}
#custommenu .custom_menu_submenu .yui3-menu-content .yui3-menu-label {
color: #000;
#custommenu .custom_menu_submenu .yui3-menu-content .yui3-menu-label, .custom_menu_submenu .yui3-menuitem .yui3-menuitem-content {
color: #000 !important;
}
#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 {
background-color:#F14E16;
color:#FFF;
.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 {
background-color:#F14E16;
.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;
}