diff --git a/install/css.php b/install/css.php index 2bceff6c9e9..33f8c18f86f 100644 --- a/install/css.php +++ b/install/css.php @@ -29,12 +29,11 @@ if (file_exists(dirname(dirname(__FILE__)).'/config.php')) { } // include only the necessary stuff from themes, keep this small otherwise IE will complain... -$files = array( - 'base/style/pagelayout.css', - 'base/style/core.css', - 'standard/style/core.css', - 'standard/style/css3.css'); +// MDL-43839 IE9 cannot handle all of our css. +// Once IE9 is no longer supported we can include 'bootstrapbase/style/moodle.css' +// and remove some of the CSS in $content. +$files = array(''); $content = ''; @@ -44,10 +43,22 @@ foreach($files as $file) { $content .= " +body { + padding: 4px; +} + +.headermain { + margin: 15px; +} + h2 { text-align:center; } +input, textarea, .uneditable-input { + width: 50%; +} + #installdiv { width: 800px; margin-left:auto; @@ -130,6 +141,23 @@ fieldset { color: red; } +/* +MDL-43839 IE9 cannot handle all of our CSS. +Once IE9 is no longer supported we can include 'bootstrapbase/style/moodle.css' above +and remove the following. +*/ +body { + font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; + font-size: 14px; +} +.breadcrumb { + background-color: rgb(245, 245, 245); + padding: 8px 15px; +} +/* +End of MDL-43839 IE9 specific CSS. +*/ + "; // fix used urls diff --git a/lib/installlib.php b/lib/installlib.php index bcfc7181e51..190eb0832ef 100644 --- a/lib/installlib.php +++ b/lib/installlib.php @@ -274,7 +274,7 @@ function install_print_help_page($help) { echo ''; echo ' - + '.get_string('installation','install').' @@ -321,7 +321,7 @@ function install_print_header($config, $stagename, $heading, $stagetext) { echo ''; echo ' - '; + '; echo ' '.get_string('installation','install').' - Moodle '.$CFG->target_release.' diff --git a/lib/outputlib.php b/lib/outputlib.php index c803d497bfd..b582be8569b 100644 --- a/lib/outputlib.php +++ b/lib/outputlib.php @@ -123,7 +123,7 @@ class theme_config { /** * @var string Default theme, used when requested theme not found. */ - const DEFAULT_THEME = 'standard'; + const DEFAULT_THEME = 'clean'; /** * @var array You can base your theme on other themes by linking to the other theme as diff --git a/lib/setup.php b/lib/setup.php index bb20b88ee51..c24932224bb 100644 --- a/lib/setup.php +++ b/lib/setup.php @@ -804,7 +804,7 @@ unset($urlthemename); // Ensure a valid theme is set. if (!isset($CFG->theme)) { - $CFG->theme = 'standard'; + $CFG->theme = 'clean'; } // Set language/locale of printed times. If user has chosen a language that