mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-22 00:20:37 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-40864-M29' of git://github.com/lazydaisy/moodle

Browse Source
This commit is contained in:
Dan Poltawski 2014-12-22 17:29:43 +00:00
commit a62de06e57
6 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
theme/clean/lang/en/theme_clean.php
View File

@ -59,7 +59,7 @@ $string['invertdesc'] = 'Swaps text and background for the navbar at the top of
$string['logo'] = 'Logo';
$string['logodesc'] = 'Please upload your custom logo here if you want to add it to the header.<br>
If the height of your logo is more than 75px add the following CSS rule to the Custom CSS box below.<br>
a.logo {height: 100px;} or whatever height in pixels the logo is.';
div.logo {height: 100px;} or whatever height in pixels the logo is.';
$string['pluginname'] = 'Clean';

2
theme/clean/lib.php
View File

@ -140,7 +140,7 @@ function theme_clean_get_html_for_settings(renderer_base $output, moodle_page $p
}
if (!empty($page->theme->settings->logo)) {
$return->heading = html_writer::link($CFG->wwwroot, '', array('title' => get_string('home'), 'class' => 'logo'));
$return->heading = html_writer::tag('div', '', array('class' => 'logo'));
} else {
$return->heading = $output->page_heading();
}

4
theme/clean/style/custom.css
View File

@ -1,6 +1,6 @@
/* Custom CSS
-------------------------*/
a.logo {
div.logo {
background: url([[setting:logo]]) no-repeat 0 0;
display: block;
float: left;
@ -10,7 +10,7 @@ a.logo {
width: 100%;
}
.dir-rtl a.logo {
.dir-rtl div.logo {
background: url([[setting:logo]]) no-repeat 100% 0;
display: block;
float: right;

2
theme/more/lang/en/theme_more.php
View File

@ -66,7 +66,7 @@ $string['linkcolor_desc'] = 'The colour of the links.';
$string['logo'] = 'Logo';
$string['logodesc'] = 'Please upload your custom logo here if you want to add it to the header.<br>
If the height of your logo is more than 75px add the following CSS rule to the Custom CSS box below.<br>
a.logo {height: 100px;} or whatever height in pixels the logo is.';
div.logo {height: 100px;} or whatever height in pixels the logo is.';
$string['pluginname'] = 'More';

4
theme/more/style/custom.css
View File

@ -1,6 +1,6 @@
/* Custom CSS
-------------------------*/
a.logo {
div.logo {
background: url([[setting:logo]]) no-repeat 0 0;
display: block;
float: left;
@ -10,7 +10,7 @@ a.logo {
width: 100%;
}
.dir-rtl a.logo {
.dir-rtl div.logo {
background: url([[setting:logo]]) no-repeat 100% 0;
display: block;
float: right;

5
theme/upgrade.txt
View File

@ -1,7 +1,12 @@
This files describes API changes in /theme/* themes,
information provided here is intended especially for theme designer.
=== 2.9 ===
* Themes Clean amd More page header background logo, if loaded, no longer links to the home page.
=== 2.8 ===
* Themes Base and Canvas layout/embedded.php has changed.
The div id="content" has been changed to id="page-content" - see MDL-47915.
* All mod_assign CSS selectors have been qualified with ".path-mod-assign". This means any custom CSS