Item12481: simplified horiz menu styles

- fixed duplicate searchbox - added angular-js support
foswiki · Feb 23, 2015 · b8f2a65 · b8f2a65
1 parent e074408
commit b8f2a65
Show file tree

Hide file tree

Showing 14 changed files with 115 additions and 188 deletions.
diff --git a/data/System/SiteMenu.txt b/data/System/SiteMenu.txt
@@ -58,7 +58,7 @@ Definition of site wide horizontal menu
 ---++ Admin menu
 <verbatim class="tml">
 %STARTSECTION{"adminmenu"}%<noautolink>
-<li>%MAKETEXT{"Admin"}%
+<li><a>%MAKETEXT{"Admin"}%</a>
   <ul>
     %IF{"isweb 'Applications'"
        then="<li>

diff --git a/lib/Foswiki/Contrib/NatSkin/DEPENDENCIES b/lib/Foswiki/Contrib/NatSkin/DEPENDENCIES
@@ -6,7 +6,7 @@ Foswiki::Plugins::CaptchaPlugin,>=2.0.0,perl,Optional
 Foswiki::Plugins::DBCachePlugin,>=1,perl,Required
 Foswiki::Plugins::FilterPlugin,>=3491,perl,Required
 Foswiki::Plugins::FlexWebListPlugin,>=3493,perl,Required
-Foswiki::Plugins::GridLayoutPlugin,>=0,perl,Required
+Foswiki::Plugins::GridLayoutPlugin,>=1.00,perl,Required
 Foswiki::Plugins::ImagePlugin,>=2.40,perl,Required
 Foswiki::Plugins::JQueryPlugin,>=5.00,perl,Required
 Foswiki::Plugins::MetaCommentPlugin,>=2.80,perl,Optional

diff --git a/lib/Foswiki/Contrib/NatSkin/MANIFEST b/lib/Foswiki/Contrib/NatSkin/MANIFEST
@@ -244,6 +244,7 @@ templates/attachtables.nat.tmpl 0644
 templates/backlinksallwebs.nat.tmpl 0644
 templates/backlinks.nat.tmpl 0644
 templates/backlinksweb.nat.tmpl 0644
+templates/body.customato.nat.tmpl 0644
 templates/body.jazzynote.nat.tmpl 0644
 templates/body.nat.tmpl 0644
 templates/body.plain.nat.tmpl 0644
@@ -318,6 +319,7 @@ templates/translatetopic.nat.tmpl 0644
 templates/twistyplugin.nat.tmpl 0644
 templates/updatesplugin.nat.tmpl 0644
 templates/validate.nat.tmpl 0644
+templates/view.angular.nat.tmpl 0644
 templates/view.nat.tmpl 0644
 templates/viewplain.nat.tmpl 0644
 templates/view.print.nat.tmpl 0644

diff --git a/pub/System/CustomatoTheme/customato-base.uncompressed.css b/pub/System/CustomatoTheme/customato-base.uncompressed.css
@@ -319,33 +319,30 @@ a.jqButton:link {
 }
 .natSearchBox .foswikiInputField {
   width:100%;
-  border-radius:0;
+  border-color:#ccc;
   display:inline-block;
-  height:30px;
+  height:32px;
+  border-bottom-style:none;
 }
 
 .natBodyLeft .natWebMenuContents {
   margin-left:0;
 }
+.natWebMenu li {
+  margin-right:1px;
+}
+.natWebMenu ul ul li {
+  margin-right:0;
+}
 .natWebMenu .natSearchBox {
   width:280px;
-  float:right;
 }
 .natWebMenu .natSearchBox  form {
-  height:30px;
+  height:32px;
 }
 .natSearchBox .foswikiInputField:focus {
   color:#333;
 }
-.natWebMenu .natSearchBox .foswikiInputField {
-  border-bottom-width:0;
-  margin-top:1px;
-  position:absolute;
-  top:1px;
-}
-.natWebMenu .natSearchBox .foswikiSubmit {
-  top:55%;
-}
 
 
 /* topbar */
@@ -424,12 +421,6 @@ a.jqButton:link {
   border-bottom:1px solid #D5D6DD;
   margin-bottom:1em;
 }
-.natWebMenu li {
-  margin: 0 1px 0 0;
-}
-.natWebMenu li li {
-  margin: 0;
-}
 
 .natTopicActions .sfHover .natMoreActionsTopicAction,
 .natTopicActions .natTopicAction:hover,
@@ -439,27 +430,27 @@ a.jqButton:link {
 .natWebMenu li .foswikiCurrentTopicLink {
   color:#fff;
   border-radius:0;
-  border-color:transparent;
+/*  border-color:transparent;*/
 }
 
 .natWebMenu li.sfHover > a,
 .natWebMenu li .foswikiCurrentWebHomeLink:hover,
 .natWebMenu li a:hover {
   border-radius:0;
-  border-color:transparent;
+/*  border-color:transparent;*/
 }
 
 .natWebMenu ul ul {
   box-shadow:2px 2px 10px -2px rgba(0,0,0,0.2);
 }
 
-.natWebMenu li li .foswikiCurrentTopicLink,
-.natWebMenu li li .foswikiCurrentWebHomeLink,
-.natWebMenu li li a {
+.natWebMenu ul ul .foswikiCurrentTopicLink,
+.natWebMenu ul ul .foswikiCurrentWebHomeLink,
+.natWebMenu ul ul a {
   background:inherit;
   color:inherit;
 }
-.natWebMenu li li a:hover {
+.natWebMenu ul ul a:hover {
   border-bottom-color:inherit;
 }
 .natMoreActionsMenu ul {

diff --git a/pub/System/CustomatoTheme/customato.uncompressed.css b/pub/System/CustomatoTheme/customato.uncompressed.css
@@ -320,33 +320,30 @@ a.jqButton:link {
 }
 .natSearchBox .foswikiInputField {
   width:100%;
-  border-radius:0;
+  border-color:#ccc;
   display:inline-block;
-  height:30px;
+  height:32px;
+  border-bottom-style:none;
 }
 
 .natBodyLeft .natWebMenuContents {
   margin-left:0;
 }
+.natWebMenu li {
+  margin-right:1px;
+}
+.natWebMenu ul ul li {
+  margin-right:0;
+}
 .natWebMenu .natSearchBox {
   width:280px;
-  float:right;
 }
 .natWebMenu .natSearchBox  form {
-  height:30px;
+  height:32px;
 }
 .natSearchBox .foswikiInputField:focus {
   color:#333;
 }
-.natWebMenu .natSearchBox .foswikiInputField {
-  border-bottom-width:0;
-  margin-top:1px;
-  position:absolute;
-  top:1px;
-}
-.natWebMenu .natSearchBox .foswikiSubmit {
-  top:55%;
-}
 
 
 /* topbar */
@@ -425,12 +422,6 @@ a.jqButton:link {
   border-bottom:1px solid #D5D6DD;
   margin-bottom:1em;
 }
-.natWebMenu li {
-  margin: 0 1px 0 0;
-}
-.natWebMenu li li {
-  margin: 0;
-}
 
 .natTopicActions .sfHover .natMoreActionsTopicAction,
 .natTopicActions .natTopicAction:hover,
@@ -440,27 +431,27 @@ a.jqButton:link {
 .natWebMenu li .foswikiCurrentTopicLink {
   color:#fff;
   border-radius:0;
-  border-color:transparent;
+/*  border-color:transparent;*/
 }
 
 .natWebMenu li.sfHover > a,
 .natWebMenu li .foswikiCurrentWebHomeLink:hover,
 .natWebMenu li a:hover {
   border-radius:0;
-  border-color:transparent;
+/*  border-color:transparent;*/
 }
 
 .natWebMenu ul ul {
   box-shadow:2px 2px 10px -2px rgba(0,0,0,0.2);
 }
 
-.natWebMenu li li .foswikiCurrentTopicLink,
-.natWebMenu li li .foswikiCurrentWebHomeLink,
-.natWebMenu li li a {
+.natWebMenu ul ul .foswikiCurrentTopicLink,
+.natWebMenu ul ul .foswikiCurrentWebHomeLink,
+.natWebMenu ul ul a {
   background:inherit;
   color:inherit;
 }
-.natWebMenu li li a:hover {
+.natWebMenu ul ul a:hover {
   border-bottom-color:inherit;
 }
 .natMoreActionsMenu ul {

diff --git a/pub/System/JazzyNoteTheme/JazzyNoteStyle.uncompressed.css b/pub/System/JazzyNoteTheme/JazzyNoteStyle.uncompressed.css
@@ -107,7 +107,7 @@ h1,
 }
 .natWebMenu ul ul {
   box-shadow:2px 2px 2px rgba(128,128,128,0.2);
-  margin-top:-2px;
+  margin-top:-1px;
 }
 .natWebMenu ul ul ul {
   margin-top:0;