Merged navigation menu fixed from stable

diff --git a/theme/standard/styles_fonts.css b/theme/standard/styles_fonts.css
index c220c1750be9c7ca68af1f66c7a6bfa19d5466bf..f23baf6757f560367b1add504d318a8e6fc107f4 100644 (file)
--- a/theme/standard/styles_fonts.css
+++ b/theme/standard/styles_fonts.css
@@ -190,6 +190,10 @@ a.useredit, a:hover.useredit, .blink {
     'Lucida Sans Unicode','Lucida Grande','GNU Unifont',unifont,sans-serif;
 }
 
+.navigation button {
+  font-size: 80%;
+}
+
 /***
  *** Footer
  ***/

diff --git a/theme/standard/styles_layout.css b/theme/standard/styles_layout.css
index de2074916fbd084a27bdb4481584464e46f69a43..4935f8eda3f2ec0764d4d96d1198ba2f61bfd67f 100644 (file)
--- a/theme/standard/styles_layout.css
+++ b/theme/standard/styles_layout.css
@@ -570,6 +570,13 @@ div.phpinfo .center th {
   text-align:right;
 }
 
+.navigation li,
+.navigation div,
+.navigation button,
+.navigation form {
+  display: inline;
+}
+
 .navbar {
   width:auto;
   padding:3px 0.5em;