mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-21 00:12:56 +02:00
Code Issues Projects Releases Wiki Activity

MDL-43839 core: changed the default theme from standard to clean

Browse Source
This commit is contained in:
Andrew Davis 2014-01-30 11:42:36 +08:00
parent c0e88129d1
commit 7d1f086f31
4 changed files with 37 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
install/css.php
View File

@ -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

4
lib/installlib.php
View File

@ -274,7 +274,7 @@ function install_print_help_page($help) {
echo '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">';
echo '<html dir="'.(right_to_left() ? 'rtl' : 'ltr').'">
<head>
<link rel="shortcut icon" href="theme/standard/pix/favicon.ico" />
<link rel="shortcut icon" href="theme/clean/pix/favicon.ico" />
<link rel="stylesheet" type="text/css" href="'.$CFG->wwwroot.'/install/css.php" />
<title>'.get_string('installation','install').'</title>
<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
@ -321,7 +321,7 @@ function install_print_header($config, $stagename, $heading, $stagetext) {
echo '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">';
echo '<html dir="'.(right_to_left() ? 'rtl' : 'ltr').'">
<head>
<link rel="shortcut icon" href="theme/standard/pix/favicon.ico" />';
<link rel="shortcut icon" href="theme/clean/pix/favicon.ico" />';
echo '<link rel="stylesheet" type="text/css" href="'.$CFG->wwwroot.'/install/css.php" />
<title>'.get_string('installation','install').' - Moodle '.$CFG->target_release.'</title>

2
lib/outputlib.php
View File

@ -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

2
lib/setup.php
View File

@ -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