From: moodler <moodler>
Date: Mon, 12 Mar 2007 13:26:29 +0000 (+0000)
Subject: Merged navigation menu fixed from stable
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=f7641e60abb5ad89c934f766c69a53ebad554405;p=moodle.git

Merged navigation menu fixed from stable
---

diff --git a/theme/standard/styles_fonts.css b/theme/standard/styles_fonts.css
index c220c1750b..f23baf6757 100644
--- 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 de2074916f..4935f8eda3 100644
--- 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;