MDL-55416 theme_noname: Fixes for Bootstrap 4 alpha 3

Part of MDL-55071

diff --git a/theme/noname/scss/moodle/admin.scss b/theme/noname/scss/moodle/admin.scss
index 508d2bf..8c44b13 100644 (file)
--- a/theme/noname/scss/moodle/admin.scss
+++ b/theme/noname/scss/moodle/admin.scss
@@ -56,14 +56,14 @@
     display: none;
 }
 .statusok {
-    @extend .label-success;
+    @extend .tag-success;
 }
 .statuswarning {
-    @extend .label-warning;
+    @extend .tag-warning;
 }
 .statusserious,
 .statuscritical {
-    @extend .label-danger;
+    @extend .tag-danger;
 }
 
 #page-admin-report-capability-index #capabilitysearch {
@@ -72,17 +72,17 @@
 
 #page-admin-report-backups-index .backup-error,
 #page-admin-report-backups-index .backup-unfinished {
-    @extend .label-danger;
+    @extend .tag-danger;
 }
 
 #page-admin-report-backups-index .backup-skipped,
 #page-admin-report-backups-index .backup-ok,
 #page-admin-report-backups-index .backup-notyetrun {
-    @extend .label-success;
+    @extend .tag-success;
 }
 
 #page-admin-report-backups-index .backup-warning {
-    @extend .label-warning;
+    @extend .tag-warning;
 }
 
 #page-admin-qtypes .disabled,
@@ -205,7 +205,7 @@
 }
 
 #page-admin-index .updateplugin .updatepluginconfirmexternal {
-    @extend .label-warning;
+    @extend .tag-warning;
 }
 
 #page-admin-user-user_bulk #users .fgroup {
@@ -463,16 +463,16 @@
 }
 
 #page-admin-index .adminwarning.availableupdatesinfo .moodleupdateinfo.maturity200 .info.release {
-    @extend .label-info;
+    @extend .tag-info;
 }
 
 #page-admin-index .adminwarning.availableupdatesinfo .moodleupdateinfo.maturity100 .info.release,
 #page-admin-index .adminwarning.availableupdatesinfo .moodleupdateinfo.maturity150 .info.release {
-    @extend .label-warning;
+    @extend .tag-warning;
 }
 
 #page-admin-index .adminwarning.availableupdatesinfo .moodleupdateinfo.maturity50 .info.release {
-    @extend .label-danger;
+    @extend .tag-danger;
 }
 
 // Plugins overview page at admin/plugins.php

diff --git a/theme/noname/scss/moodle/backup-restore.scss b/theme/noname/scss/moodle/backup-restore.scss
index 4885b90..ab66b13 100644 (file)
--- a/theme/noname/scss/moodle/backup-restore.scss
+++ b/theme/noname/scss/moodle/backup-restore.scss
@@ -56,9 +56,9 @@
     display: block;
     width: 100%;
     padding: 0;
-    margin-bottom: $line-height;
+    margin-bottom: $line-height-base;
     font-size: $font-size-base * 1.5;
-    line-height: $line-height * 2;
+    line-height: $line-height-base * 2;
     color: $gray-dark;
     border: 0;
     border-bottom: 1px solid #e5e5e5;

diff --git a/theme/noname/scss/moodle/buttons.scss b/theme/noname/scss/moodle/buttons.scss
index 6b4dec3..b085535 100644 (file)
--- a/theme/noname/scss/moodle/buttons.scss
+++ b/theme/noname/scss/moodle/buttons.scss
@@ -34,7 +34,7 @@ p.arrow_button {
 #addcontrols {
     // The margin top is equal the combination of the line-height and margin of a <p>,
     // because the visual parent is a <p>.
-    margin-top: $line-height + ($line-height / 2);
+    margin-top: $line-height-base + ($line-height-base / 2);
     text-align: center;
     margin-bottom: 3em;
     label {

diff --git a/theme/noname/scss/moodle/core.scss b/theme/noname/scss/moodle/core.scss
index 7ad1509..821e527 100644 (file)
--- a/theme/noname/scss/moodle/core.scss
+++ b/theme/noname/scss/moodle/core.scss
@@ -1008,12 +1008,12 @@ tr.flagged-tag a {
         display: inline-block;
         .fitem {
             display: inline-block;
-            line-height: $line-height * 2;
+            line-height: $line-height-base * 2;
             margin-right: .3em;
             white-space: nowrap;
             label {
                 display: inline;
-                line-height: $line-height;
+                line-height: $line-height-base;
                 padding-right: .3em;
             }
             :before,

diff --git a/theme/noname/scss/moodle/course.scss b/theme/noname/scss/moodle/course.scss
index 2b3686c..8d3b8be 100644 (file)
--- a/theme/noname/scss/moodle/course.scss
+++ b/theme/noname/scss/moodle/course.scss
@@ -185,7 +185,7 @@
     background-color: $gray-lighter;
 }
 .course-content .current {
-    @extend .label-info;
+    @extend .tag-info;
 }
 .course-content .section-summary {
     border: 1px solid $table-border-color;

diff --git a/theme/noname/scss/moodle/expendable.scss b/theme/noname/scss/moodle/expendable.scss
index bb68bc6..d93cad9 100644 (file)
--- a/theme/noname/scss/moodle/expendable.scss
+++ b/theme/noname/scss/moodle/expendable.scss
@@ -46,9 +46,9 @@ table#permissions {
 // copied in because the styles are set on the HTML
 div[id^="bar_pbar_"] {
   overflow: hidden !important;
-  height: $line-height !important;
-  margin-bottom: $line-height !important;
-  @include gradient-vertical(#f5f5f5, #f9f9f9);
+  height: $line-height-base !important;
+  margin-bottom: $line-height-base !important;
+  @include gradient-y(#f5f5f5, #f9f9f9);
   @include box-shadow(inset 0 1px 2px rgba(0,0,0,.1));
   @include border-radius($border-radius);
   border: none !important;
@@ -60,7 +60,7 @@ div[id^="progress_pbar_"] {
   font-size: 12px !important;
   text-align: center !important;
   text-shadow: 0 -1px 0 rgba(0,0,0,.25) !important;
-  @include gradient-vertical(#149bdf, #0480be);
+  @include gradient-y(#149bdf, #0480be);
   @include box-shadow(inset 0 -1px 0 rgba(0,0,0,.15));
   @include transition(width .6s ease);
   padding-top: 0 !important;

diff --git a/theme/noname/scss/moodle/forms.scss b/theme/noname/scss/moodle/forms.scss
index 5bb79ae..a3d7d17 100644 (file)
--- a/theme/noname/scss/moodle/forms.scss
+++ b/theme/noname/scss/moodle/forms.scss
@@ -195,9 +195,9 @@ div.backup-section + form,
     display: block;
     width: 100%;
     padding: 0;
-    margin-bottom: $line-height;
+    margin-bottom: $line-height-base;
     font-size: $font-size-lg;
-    line-height: $line-height * 2;
+    line-height: $line-height-base * 2;
     border: 0;
     border-bottom: 1px solid #e5e5e5;
 }

diff --git a/theme/noname/scss/moodle/modules.scss b/theme/noname/scss/moodle/modules.scss
index 5bb9909..371e8bd 100644 (file)
--- a/theme/noname/scss/moodle/modules.scss
+++ b/theme/noname/scss/moodle/modules.scss
@@ -439,7 +439,7 @@ div#dock {
                         }
                         &:hover {
                             text-decoration: none;
-                            @include gradient-vertical($dropdown-link-hover-bg, darken($dropdown-link-hover-bg, 5%));
+                            @include gradient-y($dropdown-link-hover-bg, darken($dropdown-link-hover-bg, 5%));
                         }
                     }
                     &.align-tr-br {

diff --git a/theme/noname/scss/moodle/question.scss b/theme/noname/scss/moodle/question.scss
index f554a7e..ed8eda9 100644 (file)
--- a/theme/noname/scss/moodle/question.scss
+++ b/theme/noname/scss/moodle/question.scss
@@ -51,7 +51,7 @@
     @include border-top-radius(10px);
     border: 1px solid #ccc;
     border-bottom: 1px solid #bbb;
-    @include gradient-vertical(#fff, #ccc);
+    @include gradient-y(#fff, #ccc);
 }
 #qtypechoicecontainer {
     font-size: 12px;

diff --git a/theme/noname/scss/moodle/undo.scss b/theme/noname/scss/moodle/undo.scss
index a2b73c1..945149c 100644 (file)
--- a/theme/noname/scss/moodle/undo.scss
+++ b/theme/noname/scss/moodle/undo.scss
@@ -194,5 +194,5 @@ body:not(.jsenabled) .langmenu:hover > .dropdown-menu,
 // to enable ol lists to use a larger number set.
 
 ol {
-    margin: 0 0 $line-height / 2 2.5em;
+    margin: 0 0 $line-height-base / 2 2.5em;
 }
\ No newline at end of file

diff --git a/theme/noname/scss/moodle/user.scss b/theme/noname/scss/moodle/user.scss
index f94a79d..a46dde3 100644 (file)
--- a/theme/noname/scss/moodle/user.scss
+++ b/theme/noname/scss/moodle/user.scss
@@ -27,7 +27,10 @@
     @extend .lead;
 }
 .userprofile dl.list {
-    @extend .dl-horizontal;
+    // Copied from dl.row.
+    > dd + dt {
+      clear: left;
+    }
 }
 .user-box {
     margin: 8px;