From ebc583e4a35cbeacd604f82fd4c69b70107e7e29 Mon Sep 17 00:00:00 2001
From: Frederic Massart <fred@moodle.com>
Date: Mon, 19 Nov 2012 20:23:42 +0800
Subject: [PATCH] MDL-36659 usability: Adjust main menu block CSS

---
 blocks/site_main_menu/styles.css | 7 +++++++
 lib/outputrenderers.php          | 4 ++--
 theme/base/style/core.css        | 1 +
 theme/standard/style/blocks.css  | 3 ++-
 4 files changed, 12 insertions(+), 3 deletions(-)
 create mode 100644 blocks/site_main_menu/styles.css

diff --git a/blocks/site_main_menu/styles.css b/blocks/site_main_menu/styles.css
new file mode 100644
index 00000000000..271eca54e54
--- /dev/null
+++ b/blocks/site_main_menu/styles.css
@@ -0,0 +1,7 @@
+.block_site_main_menu li { clear: both; }
+.block_site_main_menu li .column { width: 100%; }
+.block_site_main_menu li .buttons { float: right; margin-top: 3px;}
+.dir-rtl .block_site_main_menu li .buttons { float: left; }
+.block_site_main_menu li .buttons a img{ vertical-align: text-bottom; margin: 0 3px;}
+.block_site_main_menu .footer { margin-top: 1em; }
+.block_site_main_menu .section_add_menus noscript div { display: inline;}
diff --git a/lib/outputrenderers.php b/lib/outputrenderers.php
index 45d9618c84b..55d38f161e2 100644
--- a/lib/outputrenderers.php
+++ b/lib/outputrenderers.php
@@ -1488,7 +1488,7 @@ class core_renderer extends renderer_base {
         $output .= html_writer::select($select->options, $select->name, $select->selected, $select->nothing, $select->attributes);
 
         $go = html_writer::empty_tag('input', array('type'=>'submit', 'value'=>get_string('go')));
-        $output .= html_writer::tag('noscript', html_writer::tag('div', $go), array('style'=>'inline'));
+        $output .= html_writer::tag('noscript', html_writer::tag('div', $go), array('class' => 'inline'));
 
         $nothing = empty($select->nothing) ? false : key($select->nothing);
         $this->page->requires->js_init_call('M.util.init_select_autosubmit', array($select->formid, $select->attributes['id'], $nothing));
@@ -1612,7 +1612,7 @@ class core_renderer extends renderer_base {
 
         if (!$select->showbutton) {
             $go = html_writer::empty_tag('input', array('type'=>'submit', 'value'=>get_string('go')));
-            $output .= html_writer::tag('noscript', html_writer::tag('div', $go), array('style'=>'inline'));
+            $output .= html_writer::tag('noscript', html_writer::tag('div', $go), array('class' => 'inline'));
             $nothing = empty($select->nothing) ? false : key($select->nothing);
             $output .= $this->page->requires->js_init_call('M.util.init_select_autosubmit', array($select->formid, $select->attributes['id'], $nothing));
         } else {
diff --git a/theme/base/style/core.css b/theme/base/style/core.css
index a7b16b40693..d106c93b4bc 100644
--- a/theme/base/style/core.css
+++ b/theme/base/style/core.css
@@ -59,6 +59,7 @@ a.dimmed_text:visited,
 
 .course-content .current {background:#E3E3E3;}
 
+.inline,
 .inline-list li {display: inline;}
 .notifytiny {font-size:0.7em;}
 .notifytiny li,
diff --git a/theme/standard/style/blocks.css b/theme/standard/style/blocks.css
index 45fbd70251b..cde9e7360eb 100644
--- a/theme/standard/style/blocks.css
+++ b/theme/standard/style/blocks.css
@@ -81,4 +81,5 @@
 .block_rss_client .list li .description {color:#555555;font-size:0.8em;padding-left:1em;}
 
 /** Site main menu **/
-.block_site_main_menu .footer select {font-size: 0.8em;}
\ No newline at end of file
+.block_site_main_menu .footer select,
+.block_site_main_menu .footer input {font-size: 0.8em;}