Item13268: fixed application of clear class in nav

foswiki · Feb 20, 2015 · ae09e08 · ae09e08
1 parent 66983b6
commit ae09e08
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/PatternSkin/data/System/PatternSkinNavigation.txt b/PatternSkin/data/System/PatternSkinNavigation.txt
@@ -10,7 +10,7 @@ Include main navigation with:
 ---++ Include sections
 <verbatim class="tml">
 %STARTSECTION{"main"}%<noautolink>
-<div id="patternTopBarButtons"><ul class="sf-menu clear">
+<div id="patternTopBarButtons" class="clear"><ul class="sf-menu">
   %INCLUDE{"%TOPIC%" section="topbarbutton" DESTWEB="%USERSWEB%" DESTTOPIC="%HOMETOPIC%" LABEL="%JQICON{"fa-home" style="font-size:1.1em"}% %USERSWEB%"}%
   <li>[[%WIKIUSERNAME%][%JQICON{"fa-user"}% %MAKETEXT{"My Profile"}%]]</li>
   %IF{"istopic '%USERSWEB%.%WIKINAME%LeftBar'"

diff --git a/PatternSkin/data/System/PatternSkinThemeFatWillyNavigation.txt b/PatternSkin/data/System/PatternSkinThemeFatWillyNavigation.txt
@@ -15,7 +15,7 @@ Include meta navigation with:
 
 ---++ Include sections
 <verbatim class="tml">
-%STARTSECTION{"main"}%<div id="patternTopBarButtons"><ul class="clear">
+%STARTSECTION{"main"}%<div id="patternTopBarButtons" class="clear"><ul>
 %INCLUDE{
     "PatternSkinNavigation" section="topbarbutton"
     ID="" DESTWEB="About" DESTTOPIC="%HOMETOPIC%" LABEL="About"

diff --git a/PatternSkin/pub/System/PatternSkinTheme/colors_src.css b/PatternSkin/pub/System/PatternSkinTheme/colors_src.css
@@ -19,19 +19,19 @@
   background-color:#777;
   color:#fff;
 }
-#patternTopBarButtons ul li a {
+#patternTopBarButtons a {
   color:#fff;
 	text-decoration:none;
   border:0;
 }
-#patternTopBarButtons > ul > li > a {
+#patternTopBarButtons a {
   font-weight:bold;
 }
 #patternTopBarButtons > ul > li > a.active {
   background-color:#4C94DB;
   color:#fff;
 }
-#patternTopBarButtons ul li a:hover {
+#patternTopBarButtons a:hover {
   background-color:#555;
   color:#fff;
 }
@@ -47,6 +47,7 @@
 }
 #patternTopBarButtons ul ul li a {
   color:#333;
+  font-weight:normal;
 }
 #patternMain { /* don't set a background here; use patternOuter */ }
 #patternOuter {

diff --git a/PatternSkin/pub/System/PatternSkinTheme/style_src.css b/PatternSkin/pub/System/PatternSkinTheme/style_src.css
@@ -847,7 +847,7 @@ a:hover .foswikiAccessKey {
 }
 
 #patternTopBarButtons li,
-#patternTopBarButtons ul li a {
+#patternTopBarButtons a {
 	line-height:31px;
 	height:31px;
 }
@@ -861,7 +861,7 @@ a:hover .foswikiAccessKey {
 #patternTopBarButtons ul ul li {
   float:none;
 }
-#patternTopBarButtons ul li a {
+#patternTopBarButtons a {
 	display:block;
 	padding:0 1em;
 }