mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-27 11:23:06 +02:00
Code Issues Projects Releases Wiki Activity

MDL-61319 themes: prevent using @extend rules for complex classes

Browse Source 
* the settings and navigation blocks scss extended .fa which caused
issues with native fontawesome classes like fa-pull-left.
This commit is contained in:
Bas Brands 2019-05-21 17:07:31 +02:00
parent 5dae8c0515
commit da26d7b6ea
3 changed files with 39 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
theme/boost/scss/moodle/blocks.scss
View File

@ -300,17 +300,17 @@ body.drawer-open-left #region-main.has-blocks {
.block_navigation .block_tree [aria-expanded="true"]:before {
content: $fa-var-angle-down;
margin-right: 0;
@include fa-icon();
font-size: 16px;
@extend .fa;
width: 16px;
}
.block_settings .block_tree [aria-expanded="false"]:before,
.block_navigation .block_tree [aria-expanded="false"]:before {
content: $fa-var-angle-right;
font-size: 16px;
margin-right: 0;
@extend .fa;
@include fa-icon();
font-size: 16px;
width: 16px;
}
.dir-rtl {

34
theme/boost/style/moodle.css
View File

@ -10,9 +10,7 @@
* Font Awesome 4.7.0 by @davegandy - http://fontawesome.io - @fontawesome
* License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License)
*/
.fa, .block_settings .block_tree [aria-expanded="true"]:before,
.block_navigation .block_tree [aria-expanded="true"]:before, .block_settings .block_tree [aria-expanded="false"]:before,
.block_navigation .block_tree [aria-expanded="false"]:before {
.fa {
display: inline-block;
font: normal normal normal 14px/1 FontAwesome;
font-size: inherit;
@ -69,14 +67,10 @@
.fa-pull-right {
float: right; }
.fa.fa-pull-left, .block_settings .block_tree .fa-pull-left[aria-expanded="true"]:before,
.block_navigation .block_tree .fa-pull-left[aria-expanded="true"]:before, .block_settings .block_tree .fa-pull-left[aria-expanded="false"]:before,
.block_navigation .block_tree .fa-pull-left[aria-expanded="false"]:before {
.fa.fa-pull-left {
margin-right: .3em; }
.fa.fa-pull-right, .block_settings .block_tree .fa-pull-right[aria-expanded="true"]:before,
.block_navigation .block_tree .fa-pull-right[aria-expanded="true"]:before, .block_settings .block_tree .fa-pull-right[aria-expanded="false"]:before,
.block_navigation .block_tree .fa-pull-right[aria-expanded="false"]:before {
.fa.fa-pull-right {
margin-left: .3em; }
/* Deprecated as of 4.4.0 */
@ -86,14 +80,10 @@
.pull-left {
float: left; }
.fa.pull-left, .block_settings .block_tree .pull-left[aria-expanded="true"]:before,
.block_navigation .block_tree .pull-left[aria-expanded="true"]:before, .block_settings .block_tree .pull-left[aria-expanded="false"]:before,
.block_navigation .block_tree .pull-left[aria-expanded="false"]:before {
.fa.pull-left {
margin-right: .3em; }
.fa.pull-right, .block_settings .block_tree .pull-right[aria-expanded="true"]:before,
.block_navigation .block_tree .pull-right[aria-expanded="true"]:before, .block_settings .block_tree .pull-right[aria-expanded="false"]:before,
.block_navigation .block_tree .pull-right[aria-expanded="false"]:before {
.fa.pull-right {
margin-left: .3em; }
.fa-spin {
@ -11398,14 +11388,26 @@ div.editor_atto_toolbar button .icon {
.block_navigation .block_tree [aria-expanded="true"]:before {
content: "";
margin-right: 0;
display: inline-block;
font: normal normal normal 14px/1 FontAwesome;
font-size: inherit;
text-rendering: auto;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
font-size: 16px;
width: 16px; }
.block_settings .block_tree [aria-expanded="false"]:before,
.block_navigation .block_tree [aria-expanded="false"]:before {
content: "";
font-size: 16px;
margin-right: 0;
display: inline-block;
font: normal normal normal 14px/1 FontAwesome;
font-size: inherit;
text-rendering: auto;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
font-size: 16px;
width: 16px; }
.dir-rtl .block_settings .block_tree [aria-expanded="false"]:before,

34
theme/classic/style/moodle.css
View File

@ -10,9 +10,7 @@
* Font Awesome 4.7.0 by @davegandy - http://fontawesome.io - @fontawesome
* License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License)
*/
.fa, .block_settings .block_tree [aria-expanded="true"]:before,
.block_navigation .block_tree [aria-expanded="true"]:before, .block_settings .block_tree [aria-expanded="false"]:before,
.block_navigation .block_tree [aria-expanded="false"]:before {
.fa {
display: inline-block;
font: normal normal normal 14px/1 FontAwesome;
font-size: inherit;
@ -69,14 +67,10 @@
.fa-pull-right {
float: right; }
.fa.fa-pull-left, .block_settings .block_tree .fa-pull-left[aria-expanded="true"]:before,
.block_navigation .block_tree .fa-pull-left[aria-expanded="true"]:before, .block_settings .block_tree .fa-pull-left[aria-expanded="false"]:before,
.block_navigation .block_tree .fa-pull-left[aria-expanded="false"]:before {
.fa.fa-pull-left {
margin-right: .3em; }
.fa.fa-pull-right, .block_settings .block_tree .fa-pull-right[aria-expanded="true"]:before,
.block_navigation .block_tree .fa-pull-right[aria-expanded="true"]:before, .block_settings .block_tree .fa-pull-right[aria-expanded="false"]:before,
.block_navigation .block_tree .fa-pull-right[aria-expanded="false"]:before {
.fa.fa-pull-right {
margin-left: .3em; }
/* Deprecated as of 4.4.0 */
@ -86,14 +80,10 @@
.pull-left {
float: left; }
.fa.pull-left, .block_settings .block_tree .pull-left[aria-expanded="true"]:before,
.block_navigation .block_tree .pull-left[aria-expanded="true"]:before, .block_settings .block_tree .pull-left[aria-expanded="false"]:before,
.block_navigation .block_tree .pull-left[aria-expanded="false"]:before {
.fa.pull-left {
margin-right: .3em; }
.fa.pull-right, .block_settings .block_tree .pull-right[aria-expanded="true"]:before,
.block_navigation .block_tree .pull-right[aria-expanded="true"]:before, .block_settings .block_tree .pull-right[aria-expanded="false"]:before,
.block_navigation .block_tree .pull-right[aria-expanded="false"]:before {
.fa.pull-right {
margin-left: .3em; }
.fa-spin {
@ -11640,14 +11630,26 @@ div.editor_atto_toolbar button .icon {
.block_navigation .block_tree [aria-expanded="true"]:before {
content: "";
margin-right: 0;
display: inline-block;
font: normal normal normal 14px/1 FontAwesome;
font-size: inherit;
text-rendering: auto;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
font-size: 16px;
width: 16px; }
.block_settings .block_tree [aria-expanded="false"]:before,
.block_navigation .block_tree [aria-expanded="false"]:before {
content: "";
font-size: 16px;
margin-right: 0;
display: inline-block;
font: normal normal normal 14px/1 FontAwesome;
font-size: inherit;
text-rendering: auto;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
font-size: 16px;
width: 16px; }
.dir-rtl .block_settings .block_tree [aria-expanded="false"]:before,