2 files changed, 57 insertions, 99 deletions

diff --git a/themes/clouds/css-1.7.0/style.css b/themes/clouds/css-1.7.0/style.css
index 5c156651e6..f6209a53aa 100644
--- a/themes/clouds/css-1.7.0/style.css
+++ b/themes/clouds/css-1.7.0/style.css
@@ -4286,59 +4286,41 @@ header {
 	position: absolute;
 	bottom: 0;
 	right: 10px;
+	list-style: none;
+	margin-left: 0;
+	padding: 1px;
 }
 
 .secondary-menu li {
 	display: inline;
 	position: relative;
-	white-space: nowrap;
 }
 
 .secondary-menu li:before {
 	content: " | ";
 }
 
+.secondary-menu li ul li:before,
+.secondary-menu li:first-child:before {
+	content: "";
+}
+
 .secondary-menu ul {
+	position: absolute;
 	background-color: #eee;
 	border: thin solid #aaa;
 	display: none;
+	top: 5px;
 	left: 0;
-	position: absolute;
-}
-
-.secondary-menu li ul li {
-	display: block;
-	text-align: left;
-}
-
-.secondary-menu li ul li a {
-	color: #333;
-}
-
-.secondary-menu {
-	list-style: none;
-	margin-left: 0;
-	padding: 1px;
-}
-
-.secondary-menu ul {
 	list-style: none;
 	margin-left: 0;
 	padding: 1px;
-	top: 5px;
 }
 
-/*set position of dropdown */
-.secondary-menu li:hover > ul {
+.secondary-menu ul li {
 	display: block;
-}
-
-.secondary-menu li a {
-	color: #039;
-}
-
-.secondary-menu li a:hover {
-	color: #f5003d;
+	text-align: left;
+	white-space: nowrap;
 }
 
 .secondary-menu ul li a {
@@ -4347,39 +4329,21 @@ header {
 	padding: 2px 5px 2px 2px;
 }
 
+.secondary-menu li:hover ul {
+	display: block;
+}
+
 .secondary-menu ul li a:hover {
 	background: #c8e7ff;
 	color: #000;
 }
 
-li a.link {
-	font-size: 13px;
-	margin-left: 5px;
-	margin-right: 5px;
-}
-
-.secondary-menu li ul li:before,
-.secondary-menu li:first-child:before {
-	content: "";
-}
-
+/* set active theme to bold */
 .secondary-menu .active {
 	color: #006;
 	font-weight: 900;
 }
 
-.hsearch {
-    display: block;
-    float: right;
-    padding-right: 10px;
-    padding-top: 5px;
-}
-
-.search-icon {
-	height: 17px;
-	vertical-align: top;
-}
-
 [dir=rtl] .secondary-menu {
     left: 10px;
     right: auto;
@@ -4394,6 +4358,18 @@ li a.link {
 	text-align: right;
 }
 
+.hsearch {
+    display: block;
+    float: right;
+    padding-right: 10px;
+    padding-top: 5px;
+}
+
+.search-icon {
+	height: 17px;
+	vertical-align: top;
+}
+
 /* ====== Primary menu ========= */
 header h1 {
     color: #039;
diff --git a/themes/colors/css-1.7.0/style.css b/themes/colors/css-1.7.0/style.css
index 75c24c304d..7e9ca20a53 100644
--- a/themes/colors/css-1.7.0/style.css
+++ b/themes/colors/css-1.7.0/style.css
@@ -4235,105 +4235,87 @@ header {
 	height: 98px;
 }
 
-.header-search {
-	display: inline;
-}
-
 /* ====== Secondary menu ======= */
 .secondary-menu {
 	float: right;
 	margin: 21px 10px 4px 0;
 	white-space: nowrap;
+	list-style: none;
+	padding: 1px;
 }
 
 .secondary-menu li {
 	display: inline;
 	position: relative;
-	white-space: nowrap;
 }
 
 .secondary-menu li:before {
 	content: " | ";
 }
 
-.secondary-menu li a.link {
-	font-size: 13px;
-	margin-left: 5px;
-	margin-right: 5px;
+.secondary-menu  ul li:before,
+.secondary-menu li:first-child:before {
+	content: "";
 }
 
-.secondary-menu li ul {
+.secondary-menu ul {
+	position: absolute;
 	background-color: #eee;
 	border: thin solid #aaa;
 	display: none;
+	top: 6px;
 	left: 0;
-	position: absolute;
-}
-
-.secondary-menu li ul li {
-	display: block;
-	text-align: left;
-}
-
-.secondary-menu li ul li a {
-	color: #333;
-}
-
-.secondary-menu,
-.secondary-menu li ul {
-	color: #fff;
 	list-style: none;
 	padding: 1px;
-	top: 6px;
 }
 
-/*set position of dropdown */
-.secondary-menu li:hover > ul {
+.secondary-menu ul li {
 	display: block;
-}
-
-.secondary-menu li a:hover {
-	color: #f5003d;
+	text-align: left;
 }
 
 .secondary-menu ul li a {
 	background-color: #fff;
+	color: #333;
 	display: block;
 	padding: 2px 5px 2px 2px;
 }
 
-.secondary-menu ul li a:hover {
-	color: #000;
+.secondary-menu li:hover ul {
+	display: block;
 }
 
-.secondary-menu li ul li:before,
-.secondary-menu li:first-child:before {
-	content: "";
+.secondary-menu ul li a:hover {
+	color: #000;
 }
 
+/* set active theme to bold */
 .secondary-menu .active {
 	font-weight: 900;
 }
 
-.search-icon {
-	vertical-align: top;
-}
-
 [dir=rtl] .secondary-menu {
-	display: block;
 	float: left;
-	margin: 21px 0 0 10px;
+	margin: 21px 0 4px 10px;
 }
 
-[dir=rtl] .secondary-menu li ul {
+[dir=rtl] .secondary-menu ul {
 	left: auto;
 	right: 0;
 }
 
-[dir=rtl] .secondary-menu li ul li {
+[dir=rtl] .secondary-menu ul li {
 	text-align: right;
 }
 
+.header-search {
+	display: inline;
+}
+
+.search-icon {
+	vertical-align: top;
+}
+
 /* ====== Primary menu ========= */
 
 header nav {