moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-08 02:16:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-64091-master' of git://github.com/mickhawkins/moodle

Browse source
This commit is contained in:
Jun Pataleta 2018-11-21 12:21:15 +08:00
commit f4aa71be50
4 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
theme/bootstrapbase/less/bootstrap/sprites.less
View file

@ -14,8 +14,8 @@
// For the white version of the icons, just add the .icon-white class: // For the white version of the icons, just add the .icon-white class:
// <i class="icon-inbox icon-white"></i> // <i class="icon-inbox icon-white"></i>
[class^="icon-"], [class^="icon-"]:not([class^="icon-size-"]),
[class*=" icon-"] { [class*=" icon-"]:not([class*=" icon-size-"]) {
display: inline-block; display: inline-block;
width: 14px; width: 14px;
height: 14px; height: 14px;

1
theme/bootstrapbase/readme_moodle.txt
View file

@ -12,6 +12,7 @@ To update to the latest release of twitter bootstrap:
* download the new less files and store them in less/bootstrap * download the new less files and store them in less/bootstrap
* Apply change in MDL-42195 (We don't want responsive images by default). * Apply change in MDL-42195 (We don't want responsive images by default).
* Apply change in MDL-48328 (We need to reset the width of the container directly, in ./less/bootstrap/navbar.less, using the calculated value found in ./less/bootstrap/mixin.less). * Apply change in MDL-48328 (We need to reset the width of the container directly, in ./less/bootstrap/navbar.less, using the calculated value found in ./less/bootstrap/mixin.less).
* Apply change in MDL-64091 (We don't want icon-size-n classes to have the icon background image applied).
* regenerate css files using grunt * regenerate css files using grunt
* update ./thirdpartylibs.xml * update ./thirdpartylibs.xml

4
theme/bootstrapbase/style/editor.css
View file

@ -774,8 +774,8 @@ table th[class*="span"],
.table-hover tbody tr.info:hover > td { .table-hover tbody tr.info:hover > td {
background-color: #c4e3f3; background-color: #c4e3f3;
} }
[class^="icon-"], [class^="icon-"]:not([class^="icon-size-"]),
[class*=" icon-"] { [class*=" icon-"]:not([class*=" icon-size-"]) {
display: inline-block; display: inline-block;
width: 14px; width: 14px;
height: 14px; height: 14px;

4
theme/bootstrapbase/style/moodle.css
View file

@ -12552,8 +12552,8 @@ table th[class*="span"],
.table-hover tbody tr.info:hover > td { .table-hover tbody tr.info:hover > td {
background-color: #c4e3f3; background-color: #c4e3f3;
} }
[class^="icon-"], [class^="icon-"]:not([class^="icon-size-"]),
[class*=" icon-"] { [class*=" icon-"]:not([class*=" icon-size-"]) {
display: inline-block; display: inline-block;
width: 14px; width: 14px;
height: 14px; height: 14px;