diff --git a/app/code/core/Mage/Adminhtml/Block/Page/Menu.php b/app/code/core/Mage/Adminhtml/Block/Page/Menu.php
index da6e1768d1b..c946328b46a 100644
--- a/app/code/core/Mage/Adminhtml/Block/Page/Menu.php
+++ b/app/code/core/Mage/Adminhtml/Block/Page/Menu.php
@@ -269,8 +269,7 @@ public function getMenuLevel($menu, $level = 0)
if ((empty($item['url']) || ($item['url'] == '#')) && empty($item['children'])) {
continue; // for example hide System/Tools when empty
}
- $html .= '
a {
+#nav li.level0:hover > a {
background: #293470;
color: #fff;
}
@@ -158,7 +158,7 @@
width: 189px;
top: 38px;
left: -10000px;
- box-shadow: rgba(0, 0, 0, 0.18039) 1px 3px 4px;
+ box-shadow: rgba(0, 0, 0, 0.180392) 1px 3px 4px;
}
#nav ul li {
padding: 0;
@@ -173,6 +173,9 @@
color: #202856;
font-size: 12px;
}
+#nav ul li a.active {
+ text-decoration: underline;
+}
#nav ul li a:hover {
background: #202856;
color: #fff;
@@ -191,10 +194,10 @@
#nav ul li.parent li a {
background-image: none;
}
-#nav ul li.over a {
+#nav ul li:hover a {
font-weight: normal;
}
-#nav ul li.over a:hover {
+#nav ul li:hover a:hover {
font-weight: normal;
}
#nav ul a {
@@ -238,7 +241,7 @@
top: 40px;
right: -10000px;
display: none;
- box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.20784), 0 0 5px rgba(0, 0, 0, 0.20784);
+ box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.207843), 0 0 5px rgba(0, 0, 0, 0.207843);
background: #fff;
}
#usermenu ul li a:hover {
@@ -252,19 +255,19 @@
display: block;
}
#usermenu li ul span {
- border-bottom: 1px dotted #a6c4d9;
+ border-bottom: 1px dotted hsl(205, 40%, 75%);
display: block;
line-height: 31px;
padding: 0 10px;
}
-#usermenu li.over ul {
+#usermenu li:hover ul {
right: 27px;
display: block;
}
-#usermenu li.over ul a {
+#usermenu li:hover ul a {
color: #000537;
text-decoration: none;
- background: #ecf3f9;
+ background: hsl(205, 52%, 95%);
display: block;
}
#usermenu > li > a {
diff --git a/skin/adminhtml/default/openmage/menu.css.map b/skin/adminhtml/default/openmage/menu.css.map
index 93e3112ef89..7de39bad9ba 100644
--- a/skin/adminhtml/default/openmage/menu.css.map
+++ b/skin/adminhtml/default/openmage/menu.css.map
@@ -1,7 +1 @@
-{
-"version": 3,
-"mappings": "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",
-"sources": ["scss/menu.scss","scss/_variables.scss","scss/_base.scss"],
-"names": [],
-"file": "menu.css"
-}
+{"version":3,"sourceRoot":"","sources":["scss/menu.scss","scss/_variables.scss","scss/_base.scss"],"names":[],"mappings":"AAAA;AAAA;AAAA;AAAA;AC+FA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;ACwEA;EACE;EACA;EACA;EACA;;;AAwIF;EACE,OD5PgB;EC6PhB;EACA;EACA;;;AFhTF;EACE,YCPmB;EDQnB;;AAEA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;;AAIJ;EACE;;AACA;EACE;EACA;EACA;;AAEA;EACE;;AAEA;EACE,OCGc;;ADAhB;EACE;;AAEA;EACE;;AAGF;EACE,OCTY;EDUZ;;AAGF;EACE;;AAEA;EACE;;AAGF;EACE;;AAMR;EACE;EACA;EACA,OCeE;EDdF;;AAEA;EACE;EACA;EACA;EACA;EACA;EACA;;AAGF;EACE;;AAKF;EACE;EACA;EACA,OCNA;EDOA;EACA;;AAEA;EACE;EACA,OCZF;;ADgBF;EACE;EACA;EACA,OCvCS;EDwCT,QCzCS;ED0CT;EACA;EACA;EACA;EACA;;AAGF;EACE;EACA,OC9BA;;ADmCF;EACE;;AAKE;EACE;;AAKE;EACE;;AAGF;EACE;;AAIJ;EACE;;AAKN;EACE;;AAMJ;EACE;EACA;EACA;;AAGF;EACE;;AAKN;EACE;EACA;EACA;EACA;EACA,OCtFI;EDuFJ;;AAEA;EACE;EACA;;AAIJ;EACE;EACA;EACA;EACA;EAEA;;AAEA;EAEE;;AAKE;EACE,OC5JY;ED6JZ;;AAIJ;EACE,YCrHA;EDsHA;EACA,OCpKc;EDqKd;;AAEA;EACE;;AAEF;EACE,YC3KY;ED4KZ,OC/HF;;ADoIA;EACE;EACA;;AAKE;EACE;EACA;;AAGF;EACE;;AAIJ;EACE;;AAKN;EACE;;AAEA;EACE;;AAKN;EACE;EACA;EACA;;AAEA;EACE;EACA;;AAIJ;EACE;EACA;EACA;EACA;;AAEA;EACE;;AAMJ;EACE;EACA;EACA;EACA;EACA;;AAGF;EACE;EACA;;;AAKN;EACE;EACA;EACA;;AACA;EACE;EACA;EACA;EACA;EACA;EAEA;EACA,YCvNI;;ADyNF;EAEE,YCxQc;;AD0QhB;EACE;;AAMF;EACE;EACA;;AAEF;EACE;EACA;EACA;EACA;;AAGJ;EACE;EACA;;AACA;EACE,OCrTY;EDsTZ;EACA,YC5NQ;ED6NR;;AAIN;EACE;EACA;;AACA;EACE;EACA","file":"menu.css"}
\ No newline at end of file
diff --git a/skin/adminhtml/default/openmage/scss/menu.scss b/skin/adminhtml/default/openmage/scss/menu.scss
index a27736d6898..8a95bc13740 100644
--- a/skin/adminhtml/default/openmage/scss/menu.scss
+++ b/skin/adminhtml/default/openmage/scss/menu.scss
@@ -27,7 +27,7 @@
text-align: left;
float: left;
- &.over {
+ &:hover {
z-index: 999;
a {
@@ -46,14 +46,14 @@
font-size: 12px;
}
- li.over ul {
+ li:hover ul {
left: 100px;
ul {
left: -10000px;
}
- li.over ul {
+ li:hover ul {
left: 100px;
}
}
@@ -106,7 +106,7 @@
border-color: transparent transparent transparent $color_silver_approx;
}
- &.over > a {
+ &:hover > a {
background: darken($openmage_base_blue,12);
color: $white;
}
@@ -200,6 +200,9 @@
color: $color_dorado_approx;
font-size: 12px;
+ &.active {
+ text-decoration: underline;
+ }
&:hover {
background: $color_dorado_approx;
color: $white;
@@ -230,7 +233,7 @@
}
}
- &.over a {
+ &:hover a {
font-weight: normal;
&:hover {
@@ -314,7 +317,7 @@
padding: 0 10px;
}
}
- &.over ul {
+ &:hover ul {
right: 27px;
display: block;
a {
@@ -333,4 +336,4 @@
width: auto;
}
}
-}
\ No newline at end of file
+}