Skip to content

Commit 30c3663

Browse files
Frederic MassartDamyon Wiese
authored andcommitted
MDL-55416 theme_noname: Fixes for Bootstrap 4 alpha 3
1 parent fc7ea0f commit 30c3663

File tree

11 files changed

+29
-26
lines changed

11 files changed

+29
-26
lines changed

theme/noname/scss/moodle/admin.scss

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -56,14 +56,14 @@
5656
display: none;
5757
}
5858
.statusok {
59-
@extend .label-success;
59+
@extend .tag-success;
6060
}
6161
.statuswarning {
62-
@extend .label-warning;
62+
@extend .tag-warning;
6363
}
6464
.statusserious,
6565
.statuscritical {
66-
@extend .label-danger;
66+
@extend .tag-danger;
6767
}
6868

6969
#page-admin-report-capability-index #capabilitysearch {
@@ -72,17 +72,17 @@
7272

7373
#page-admin-report-backups-index .backup-error,
7474
#page-admin-report-backups-index .backup-unfinished {
75-
@extend .label-danger;
75+
@extend .tag-danger;
7676
}
7777

7878
#page-admin-report-backups-index .backup-skipped,
7979
#page-admin-report-backups-index .backup-ok,
8080
#page-admin-report-backups-index .backup-notyetrun {
81-
@extend .label-success;
81+
@extend .tag-success;
8282
}
8383

8484
#page-admin-report-backups-index .backup-warning {
85-
@extend .label-warning;
85+
@extend .tag-warning;
8686
}
8787

8888
#page-admin-qtypes .disabled,
@@ -205,7 +205,7 @@
205205
}
206206

207207
#page-admin-index .updateplugin .updatepluginconfirmexternal {
208-
@extend .label-warning;
208+
@extend .tag-warning;
209209
}
210210

211211
#page-admin-user-user_bulk #users .fgroup {
@@ -463,16 +463,16 @@
463463
}
464464

465465
#page-admin-index .adminwarning.availableupdatesinfo .moodleupdateinfo.maturity200 .info.release {
466-
@extend .label-info;
466+
@extend .tag-info;
467467
}
468468

469469
#page-admin-index .adminwarning.availableupdatesinfo .moodleupdateinfo.maturity100 .info.release,
470470
#page-admin-index .adminwarning.availableupdatesinfo .moodleupdateinfo.maturity150 .info.release {
471-
@extend .label-warning;
471+
@extend .tag-warning;
472472
}
473473

474474
#page-admin-index .adminwarning.availableupdatesinfo .moodleupdateinfo.maturity50 .info.release {
475-
@extend .label-danger;
475+
@extend .tag-danger;
476476
}
477477

478478
// Plugins overview page at admin/plugins.php

theme/noname/scss/moodle/backup-restore.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@
5656
display: block;
5757
width: 100%;
5858
padding: 0;
59-
margin-bottom: $line-height;
59+
margin-bottom: $line-height-base;
6060
font-size: $font-size-base * 1.5;
61-
line-height: $line-height * 2;
61+
line-height: $line-height-base * 2;
6262
color: $gray-dark;
6363
border: 0;
6464
border-bottom: 1px solid #e5e5e5;

theme/noname/scss/moodle/buttons.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ p.arrow_button {
3434
#addcontrols {
3535
// The margin top is equal the combination of the line-height and margin of a <p>,
3636
// because the visual parent is a <p>.
37-
margin-top: $line-height + ($line-height / 2);
37+
margin-top: $line-height-base + ($line-height-base / 2);
3838
text-align: center;
3939
margin-bottom: 3em;
4040
label {

theme/noname/scss/moodle/core.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1008,12 +1008,12 @@ tr.flagged-tag a {
10081008
display: inline-block;
10091009
.fitem {
10101010
display: inline-block;
1011-
line-height: $line-height * 2;
1011+
line-height: $line-height-base * 2;
10121012
margin-right: .3em;
10131013
white-space: nowrap;
10141014
label {
10151015
display: inline;
1016-
line-height: $line-height;
1016+
line-height: $line-height-base;
10171017
padding-right: .3em;
10181018
}
10191019
:before,

theme/noname/scss/moodle/course.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@
185185
background-color: $gray-lighter;
186186
}
187187
.course-content .current {
188-
@extend .label-info;
188+
@extend .tag-info;
189189
}
190190
.course-content .section-summary {
191191
border: 1px solid $table-border-color;

theme/noname/scss/moodle/expendable.scss

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@ table#permissions {
4646
// copied in because the styles are set on the HTML
4747
div[id^="bar_pbar_"] {
4848
overflow: hidden !important;
49-
height: $line-height !important;
50-
margin-bottom: $line-height !important;
51-
@include gradient-vertical(#f5f5f5, #f9f9f9);
49+
height: $line-height-base !important;
50+
margin-bottom: $line-height-base !important;
51+
@include gradient-y(#f5f5f5, #f9f9f9);
5252
@include box-shadow(inset 0 1px 2px rgba(0,0,0,.1));
5353
@include border-radius($border-radius);
5454
border: none !important;
@@ -60,7 +60,7 @@ div[id^="progress_pbar_"] {
6060
font-size: 12px !important;
6161
text-align: center !important;
6262
text-shadow: 0 -1px 0 rgba(0,0,0,.25) !important;
63-
@include gradient-vertical(#149bdf, #0480be);
63+
@include gradient-y(#149bdf, #0480be);
6464
@include box-shadow(inset 0 -1px 0 rgba(0,0,0,.15));
6565
@include transition(width .6s ease);
6666
padding-top: 0 !important;

theme/noname/scss/moodle/forms.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -195,9 +195,9 @@ div.backup-section + form,
195195
display: block;
196196
width: 100%;
197197
padding: 0;
198-
margin-bottom: $line-height;
198+
margin-bottom: $line-height-base;
199199
font-size: $font-size-lg;
200-
line-height: $line-height * 2;
200+
line-height: $line-height-base * 2;
201201
border: 0;
202202
border-bottom: 1px solid #e5e5e5;
203203
}

theme/noname/scss/moodle/modules.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -439,7 +439,7 @@ div#dock {
439439
}
440440
&:hover {
441441
text-decoration: none;
442-
@include gradient-vertical($dropdown-link-hover-bg, darken($dropdown-link-hover-bg, 5%));
442+
@include gradient-y($dropdown-link-hover-bg, darken($dropdown-link-hover-bg, 5%));
443443
}
444444
}
445445
&.align-tr-br {

theme/noname/scss/moodle/question.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
@include border-top-radius(10px);
5252
border: 1px solid #ccc;
5353
border-bottom: 1px solid #bbb;
54-
@include gradient-vertical(#fff, #ccc);
54+
@include gradient-y(#fff, #ccc);
5555
}
5656
#qtypechoicecontainer {
5757
font-size: 12px;

theme/noname/scss/moodle/undo.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,5 +194,5 @@ body:not(.jsenabled) .langmenu:hover > .dropdown-menu,
194194
// to enable ol lists to use a larger number set.
195195

196196
ol {
197-
margin: 0 0 $line-height / 2 2.5em;
197+
margin: 0 0 $line-height-base / 2 2.5em;
198198
}

0 commit comments

Comments
 (0)