MDL-66999 theme_boost: @extend replace .col-xs-*
authorBas Brands <bas@moodle.com>
Mon, 4 Nov 2019 15:05:55 +0000 (16:05 +0100)
committerBas Brands <bas@moodle.com>
Mon, 9 Dec 2019 09:49:39 +0000 (10:49 +0100)
Remove legacy col-xs-* classes. They are changed in upstream
Bootstrap 4 stable with just col-*.

16 files changed:
admin/tool/dataprivacy/templates/component_status.mustache
calendar/templates/event_details.mustache
course/templates/activityinstance.mustache
course/templates/bulkactivitycompletion.mustache
course/templates/defaultactivitycompletion.mustache
lib/editor/atto/plugins/recordrtc/yui/build/moodle-atto_recordrtc-button/moodle-atto_recordrtc-button-debug.js
lib/editor/atto/plugins/recordrtc/yui/build/moodle-atto_recordrtc-button/moodle-atto_recordrtc-button-min.js
lib/editor/atto/plugins/recordrtc/yui/build/moodle-atto_recordrtc-button/moodle-atto_recordrtc-button.js
lib/editor/atto/plugins/recordrtc/yui/src/button/js/button.js
message/templates/notification_preferences_component.mustache
message/templates/notification_preferences_component_notification.mustache
report/insights/templates/insight.mustache
report/insights/templates/insight_details.mustache
theme/boost/scss/moodle/bs4alphacompat.scss
theme/boost/style/moodle.css
theme/classic/style/moodle.css

index 9a1c6ad..8d2bf1b 100644 (file)
@@ -75,7 +75,7 @@
                 <hr />
                 <div class="p-l-3">
                     <dl class="row">
-                        <dt class="col-xs-3">
+                        <dt class="col-3">
                             {{#link}}
                                 <a href="#{{name}}"><strong style="word-wrap:break-word">{{name}}</strong></a>
                             {{/link}}
                             {{/link}}
                             <div class="small text-muted" style="word-wrap:break-word">{{type}}</div>
                         </dt>
-                        <dd class="col-xs-9">{{summary}}</dd>
+                        <dd class="col-9">{{summary}}</dd>
                     </dl>
                     <dl>
                         {{#fields}}
                         <div class="row">
-                            <dt class="col-xs-3 font-weight-normal" style="word-wrap:break-word">{{field_name}}</dt>
-                            <dd class="col-xs-9">{{field_summary}}</dd>
+                            <dt class="col-3 font-weight-normal" style="word-wrap:break-word">{{field_name}}</dt>
+                            <dd class="col-9">{{field_summary}}</dd>
                         </div>
                         {{/fields}}
                     </dl>
                 <hr />
                 <div class="p-l-3">
                     <div class="row">
-                        <div class="col-xs-12">
+                        <div class="col-12">
                             {{nullprovider}}
                         </div>
                     </div>
index 1a1516f..9f92043 100644 (file)
     }
 }}
 <div class="row">
-    <div class="col-xs-1">{{#pix}} i/calendareventtime, core, {{#str}} when, core_calendar {{/str}} {{/pix}}</div>
-    <div class="col-xs-11">{{{formattedtime}}}</div>
+    <div class="col-1">{{#pix}} i/calendareventtime, core, {{#str}} when, core_calendar {{/str}} {{/pix}}</div>
+    <div class="col-11">{{{formattedtime}}}</div>
 </div>
 {{#normalisedeventtypetext}}
     <div class="row mt-1">
-        <div class="col-xs-1">{{#pix}} i/calendar, core, {{#str}} eventtype, core_calendar {{/str}} {{/pix}}</div>
-        <div class="col-xs-11">{{normalisedeventtypetext}}</div>
+        <div class="col-1">{{#pix}} i/calendar, core, {{#str}} eventtype, core_calendar {{/str}} {{/pix}}</div>
+        <div class="col-11">{{normalisedeventtypetext}}</div>
     </div>
 {{/normalisedeventtypetext}}
 {{#description}}
     <div class="row mt-1">
-        <div class="col-xs-1">{{#pix}} i/calendareventdescription, core, {{#str}} description {{/str}} {{/pix}}</div>
-        <div class="description-content col-xs-11">{{{.}}}</div>
+        <div class="col-1">{{#pix}} i/calendareventdescription, core, {{#str}} description {{/str}} {{/pix}}</div>
+        <div class="description-content col-11">{{{.}}}</div>
     </div>
 {{/description}}
 {{#location}}
     <div class="row mt-1">
-        <div class="col-xs-1">{{#pix}} i/location, core, {{#str}} location {{/str}} {{/pix}}</div>
-        <div class="location-content col-xs-11">{{{.}}}</div>
+        <div class="col-1">{{#pix}} i/location, core, {{#str}} location {{/str}} {{/pix}}</div>
+        <div class="location-content col-11">{{{.}}}</div>
     </div>
 {{/location}}
 {{#isactionevent}}
     <div class="row mt-1">
-        <div class="col-xs-1">{{#pix}} i/courseevent, core, {{#str}} course {{/str}} {{/pix}}</div>
-        <div class="col-xs-11"><a href="{{course.viewurl}}">{{{course.fullname}}}</a></div>
+        <div class="col-1">{{#pix}} i/courseevent, core, {{#str}} course {{/str}} {{/pix}}</div>
+        <div class="col-11"><a href="{{course.viewurl}}">{{{course.fullname}}}</a></div>
     </div>
 {{/isactionevent}}
 {{#iscategoryevent}}
     <div class="row mt-1">
-        <div class="col-xs-1">{{#pix}} i/categoryevent, core, {{#str}} category {{/str}} {{/pix}}</div>
-        <div class="col-xs-11">{{{category.nestedname}}}</div>
+        <div class="col-1">{{#pix}} i/categoryevent, core, {{#str}} category {{/str}} {{/pix}}</div>
+        <div class="col-11">{{{category.nestedname}}}</div>
     </div>
 {{/iscategoryevent}}
 {{#iscourseevent}}
     <div class="row mt-1">
-        <div class="col-xs-1">{{#pix}} i/courseevent, core, {{#str}} course {{/str}} {{/pix}}</div>
-        <div class="col-xs-11"><a href="{{url}}">{{{course.fullname}}}</a></div>
+        <div class="col-1">{{#pix}} i/courseevent, core, {{#str}} course {{/str}} {{/pix}}</div>
+        <div class="col-11"><a href="{{url}}">{{{course.fullname}}}</a></div>
     </div>
 {{/iscourseevent}}
 {{#groupname}}
     <div class="row mt-1">
-        <div class="col-xs-1">{{#pix}} i/courseevent, core, {{#str}} course {{/str}} {{/pix}}</div>
-        <div class="col-xs-11"><a href="{{url}}">{{{course.fullname}}}</a></div>
+        <div class="col-1">{{#pix}} i/courseevent, core, {{#str}} course {{/str}} {{/pix}}</div>
+        <div class="col-11"><a href="{{url}}">{{{course.fullname}}}</a></div>
     </div>
     <div class="row mt-1">
-        <div class="col-xs-1">{{#pix}} i/groupevent, core, {{#str}} group {{/str}} {{/pix}}</div>
-        <div class="col-xs-11">{{{groupname}}}</div>
+        <div class="col-1">{{#pix}} i/groupevent, core, {{#str}} group {{/str}} {{/pix}}</div>
+        <div class="col-11">{{{groupname}}}</div>
     </div>
 {{/groupname}}
 {{#subscription}}
     {{#displayeventsource}}
         <div class="row mt-1">
-            <div class="col-xs-1">{{#pix}} i/rss, core, {{#str}} eventsource, core_calendar {{/str}} {{/pix}}</div>
-            <div class="col-xs-11">
+            <div class="col-1">{{#pix}} i/rss, core, {{#str}} eventsource, core_calendar {{/str}} {{/pix}}</div>
+            <div class="col-11">
                 {{#subscriptionurl}}
                     <p><a href="{{subscriptionurl}}">{{#str}}subscriptionsource, core_calendar, {{{subscriptionname}}}{{/str}}</a></p>
                 {{/subscriptionurl}}
index 906e6dc..3b51f67 100644 (file)
@@ -34,7 +34,7 @@
 }}
 {{#activities}}
 <div class="row mb-1 row-fluid">
-    <div class="activityinstance col-xs-6">
+    <div class="activityinstance col-6">
         <div class="mod-indent-outer"></div>
         <div>
             {{#canmanage}}
@@ -47,7 +47,7 @@
             </a>
         </div>
     </div>
-    <div class="activity-completionstatus col-xs-6" id="completionstatus_{{cmid}}">
+    <div class="activity-completionstatus col-6" id="completionstatus_{{cmid}}">
         <div class="col-sm-1  p-l-0">
             {{#completionstatus.icon}}
                 {{{completionstatus.icon}}}
index 39c010b..4a28026 100644 (file)
         </div>
     </div>
     <div class="row mb-1">
-        <div class="col-xs-6">
+        <div class="col-6">
             <input type="checkbox" class="mastercheck mr-1" aria-label="{{#str}}checkall, completion{{/str}}">
             <label class="font-weight-bold">{{#str}}activitieslabel, core_completion{{/str}}</label>
         </div>
-        <div class="col-xs-6">
+        <div class="col-6">
             <label class="font-weight-bold">{{#str}}completion, core_completion{{/str}}</label>
             <span>{{{helpicon}}}</span>
         </div>
index 6831a0b..dd2b39f 100644 (file)
         </div>
     </div>
     <div class="row mb-1">
-        <div class="col-xs-6">
+        <div class="col-6">
             <input type="checkbox" class="mastercheck mr-1" aria-label="{{#str}}checkall, completion{{/str}}">
             <label class="font-weight-bold">{{#str}}activitieslabel, core_completion{{/str}}</label>
         </div>
-        <div class="col-xs-6">
+        <div class="col-6">
             <label class="font-weight-bold">{{#str}}completion, core_completion{{/str}}</label>
             <span>{{{helpicon}}}</span>
         </div>
             {{#canmanage}}
              <div class="mb-1">
                 <div class="row mb-1 row-fluid">
-                    <div class="col-xs-6">
+                    <div class="col-6">
                         <label class="accesshide" for="modtype_{{id}}">{{#str}}select, core_completion{{/str}} {{formattedname}}</label>
                         <input id="modtype_{{id}}" type="checkbox" class="mr-1" name="modids[]" value="{{id}}" aria-label="{{#str}}checkactivity, completion, {{{formattedname}}}{{/str}}">
                         <img class="iconlarge activityicon" src="{{icon}}" alt=" " role="presentation" />
                         <span>{{{formattedname}}}</span>
                     </div>
-                    <div class="activity-completionstatus col-xs-6">
+                    <div class="activity-completionstatus col-6">
                         <div class="col-sm-1 p-l-0">
                             {{#completionstatus.icon}}
                                 {{{completionstatus.icon}}}
index 213b2f2..3f62f9d 100644 (file)
Binary files a/lib/editor/atto/plugins/recordrtc/yui/build/moodle-atto_recordrtc-button/moodle-atto_recordrtc-button-debug.js and b/lib/editor/atto/plugins/recordrtc/yui/build/moodle-atto_recordrtc-button/moodle-atto_recordrtc-button-debug.js differ
index c5a0167..ba20c6a 100644 (file)
Binary files a/lib/editor/atto/plugins/recordrtc/yui/build/moodle-atto_recordrtc-button/moodle-atto_recordrtc-button-min.js and b/lib/editor/atto/plugins/recordrtc/yui/build/moodle-atto_recordrtc-button/moodle-atto_recordrtc-button-min.js differ
index 213b2f2..3f62f9d 100644 (file)
Binary files a/lib/editor/atto/plugins/recordrtc/yui/build/moodle-atto_recordrtc-button/moodle-atto_recordrtc-button.js and b/lib/editor/atto/plugins/recordrtc/yui/build/moodle-atto_recordrtc-button/moodle-atto_recordrtc-button.js differ
index 29ab713..3ffa677 100644 (file)
@@ -215,7 +215,7 @@ Y.namespace('M.atto_recordrtc').Button = Y.Base.create('button', Y.M.editor_atto
     _createContent: function(type) {
         var isAudio = (type === 'audio'),
             bsRow = 'row',
-            bsCol = 'col-xs-',
+            bsCol = 'col-',
             bsAlDang = 'alert-danger',
             bsSsBtn = 'btn btn-lg btn-outline-danger btn-block';
 
index 3dfb5d1..2d9381e 100644 (file)
         <td class="align-bottom">
             <div class="container-fluid">
                 <div class="row-fluid">
-                    <div class="col-xs-6">
+                    <div class="col-6">
                         {{#str}} loggedin, message {{/str}}
                         {{#onlinehelphtml}}{{{.}}}{{/onlinehelphtml}}
                     </div>
-                    <div class="col-xs-6">
+                    <div class="col-6">
                         {{#str}} loggedoff, message {{/str}}
                         {{#offlinehelphtml}}{{{.}}}{{/offlinehelphtml}}
                     </div>
index 77bcf27..7770700 100644 (file)
@@ -67,7 +67,7 @@
                 <form>
                     <div class="container-fluid">
                         <div class="row-fluid">
-                            <div class="col-xs-6">
+                            <div class="col-6">
                                 {{#loggedin}}
                                     {{< core/hover_tooltip }}
                                         {{$anchor}}
@@ -92,7 +92,7 @@
                                     {{/ core/hover_tooltip }}
                                 {{/loggedin}}
                             </div>
-                            <div class="col-xs-6">
+                            <div class="col-6">
                                 {{#loggedoff}}
                                     {{< core/hover_tooltip }}
                                         {{$anchor}}
index 6a96553..d0cb969 100644 (file)
     }
 }}
 <tr data-prediction-id="{{predictionid}}" class="d-flex">
-    <td class="insight-checkbox-cell col-xs-1{{^bulkactions}} hidden{{/bulkactions}}">
+    <td class="insight-checkbox-cell col-1{{^bulkactions}} hidden{{/bulkactions}}">
         {{{toggleslave}}}
     </td>
-    <td class="col-xs-8">
+    <td class="col-8">
         {{#sampleimage}}
             {{{sampleimage}}}
         {{/sampleimage}}
         {{{sampledescription}}}
     </td>
-    <td class="col-xs-3{{^actions}} hidden{{/actions}}">
+    <td class="col-3{{^actions}} hidden{{/actions}}">
     {{#actions}}
         {{> core/action_menu}}
     {{/actions}}
index fa75339..ecd91d5 100644 (file)
         {{/showpredictionheading}}
         <thead>
             <tr class="d-flex">
-                <th scope="col" class="col-xs-1{{^bulkactions}} hidden{{/bulkactions}}">{{{hiddencheckboxtoggleall}}}</th>
-                <th scope="col" class="col-xs-8">{{#str}}description{{/str}}</th>
-                <th scope="col" class="col-xs-3{{^actions}} hidden{{/actions}}">{{#str}}actions{{/str}}</th>
+                <th scope="col" class="col-1{{^bulkactions}} hidden{{/bulkactions}}">{{{hiddencheckboxtoggleall}}}</th>
+                <th scope="col" class="col-8">{{#str}}description{{/str}}</th>
+                <th scope="col" class="col-3{{^actions}} hidden{{/actions}}">{{#str}}actions{{/str}}</th>
             </tr>
         </thead>
         <tbody>
index 90e8c85..1bd88c4 100644 (file)
@@ -215,13 +215,6 @@ $bs4aspacers: map-merge((
   }
 }
 
-// Adding compatibility for col-xs-* classes.
-@for $i from 1 through $grid-columns {
-  .col-xs-#{$i} {
-    @extend .col-#{$i};
-  }
-}
-
 input[disabled] {
     cursor: not-allowed;
 }
index 29457c8..826add7 100644 (file)
@@ -2814,7 +2814,7 @@ pre {
     padding-right: 0;
     padding-left: 0; }
 
-.col-1, .col-xs-1, .col-2, .col-xs-2, .col-3, .col-xs-3, .col-4, .col-xs-4, .col-5, .col-xs-5, .col-6, .col-xs-6, .col-7, .col-xs-7, .col-8, .col-xs-8, .col-9, .col-xs-9, .col-10, .col-xs-10, .col-11, .col-xs-11, .col-12, .col-xs-12, .col,
+.col-1, .col-2, .col-3, .col-4, .col-5, .col-6, .col-7, .col-8, .col-9, .col-10, .col-11, .col-12, .col,
 .col-auto, .col-sm-1, .col-sm-2, .col-sm-3, .col-sm-4, .col-sm-5, .col-sm-6, .col-sm-7, .col-sm-8, .col-sm-9, .col-sm-10, .col-sm-11, .col-sm-12, .col-sm,
 .col-sm-auto, .col-md-1, .col-md-2, .col-md-3, .col-md-4, .col-md-5, .col-md-6, .col-md-7, .col-md-8, .col-md-9, .col-md-10, .col-md-11, .col-md-12, .col-md,
 .col-md-auto, .col-lg-1, .col-lg-2, .col-lg-3, .col-lg-4, .col-lg-5, .col-lg-6, .col-lg-7, .col-lg-8, .col-lg-9, .col-lg-10, .col-lg-11, .col-lg-12, .col-lg,
@@ -2835,51 +2835,51 @@ pre {
   width: auto;
   max-width: 100%; }
 
-.col-1, .col-xs-1 {
+.col-1 {
   flex: 0 0 8.3333333333%;
   max-width: 8.3333333333%; }
 
-.col-2, .col-xs-2 {
+.col-2 {
   flex: 0 0 16.6666666667%;
   max-width: 16.6666666667%; }
 
-.col-3, .col-xs-3 {
+.col-3 {
   flex: 0 0 25%;
   max-width: 25%; }
 
-.col-4, .col-xs-4 {
+.col-4 {
   flex: 0 0 33.3333333333%;
   max-width: 33.3333333333%; }
 
-.col-5, .col-xs-5 {
+.col-5 {
   flex: 0 0 41.6666666667%;
   max-width: 41.6666666667%; }
 
-.col-6, .col-xs-6 {
+.col-6 {
   flex: 0 0 50%;
   max-width: 50%; }
 
-.col-7, .col-xs-7 {
+.col-7 {
   flex: 0 0 58.3333333333%;
   max-width: 58.3333333333%; }
 
-.col-8, .col-xs-8 {
+.col-8 {
   flex: 0 0 66.6666666667%;
   max-width: 66.6666666667%; }
 
-.col-9, .col-xs-9 {
+.col-9 {
   flex: 0 0 75%;
   max-width: 75%; }
 
-.col-10, .col-xs-10 {
+.col-10 {
   flex: 0 0 83.3333333333%;
   max-width: 83.3333333333%; }
 
-.col-11, .col-xs-11 {
+.col-11 {
   flex: 0 0 91.6666666667%;
   max-width: 91.6666666667%; }
 
-.col-12, .col-xs-12 {
+.col-12 {
   flex: 0 0 100%;
   max-width: 100%; }
 
index f7454f6..b4a3abc 100644 (file)
@@ -2816,7 +2816,7 @@ pre {
     padding-right: 0;
     padding-left: 0; }
 
-.col-1, .col-xs-1, .col-2, .col-xs-2, .col-3, .col-xs-3, .col-4, .col-xs-4, .col-5, .col-xs-5, .col-6, .col-xs-6, .col-7, .col-xs-7, .col-8, .col-xs-8, .col-9, .col-xs-9, .col-10, .col-xs-10, .col-11, .col-xs-11, .col-12, .col-xs-12, .col,
+.col-1, .col-2, .col-3, .col-4, .col-5, .col-6, .col-7, .col-8, .col-9, .col-10, .col-11, .col-12, .col,
 .col-auto, .col-sm-1, .col-sm-2, .col-sm-3, .col-sm-4, .col-sm-5, .col-sm-6, .col-sm-7, .col-sm-8, .col-sm-9, .col-sm-10, .col-sm-11, .col-sm-12, .col-sm,
 .col-sm-auto, .col-md-1, .col-md-2, .col-md-3, .col-md-4, .col-md-5, .col-md-6, .col-md-7, .col-md-8, .col-md-9, .col-md-10, .col-md-11, .col-md-12, .col-md,
 .col-md-auto, .col-lg-1, .col-lg-2, .col-lg-3, .col-lg-4, .col-lg-5, .col-lg-6, .col-lg-7, .col-lg-8, .col-lg-9, .col-lg-10, .col-lg-11, .col-lg-12, .col-lg,
@@ -2837,51 +2837,51 @@ pre {
   width: auto;
   max-width: 100%; }
 
-.col-1, .col-xs-1 {
+.col-1 {
   flex: 0 0 8.3333333333%;
   max-width: 8.3333333333%; }
 
-.col-2, .col-xs-2 {
+.col-2 {
   flex: 0 0 16.6666666667%;
   max-width: 16.6666666667%; }
 
-.col-3, .col-xs-3 {
+.col-3 {
   flex: 0 0 25%;
   max-width: 25%; }
 
-.col-4, .col-xs-4 {
+.col-4 {
   flex: 0 0 33.3333333333%;
   max-width: 33.3333333333%; }
 
-.col-5, .col-xs-5 {
+.col-5 {
   flex: 0 0 41.6666666667%;
   max-width: 41.6666666667%; }
 
-.col-6, .col-xs-6 {
+.col-6 {
   flex: 0 0 50%;
   max-width: 50%; }
 
-.col-7, .col-xs-7 {
+.col-7 {
   flex: 0 0 58.3333333333%;
   max-width: 58.3333333333%; }
 
-.col-8, .col-xs-8 {
+.col-8 {
   flex: 0 0 66.6666666667%;
   max-width: 66.6666666667%; }
 
-.col-9, .col-xs-9 {
+.col-9 {
   flex: 0 0 75%;
   max-width: 75%; }
 
-.col-10, .col-xs-10 {
+.col-10 {
   flex: 0 0 83.3333333333%;
   max-width: 83.3333333333%; }
 
-.col-11, .col-xs-11 {
+.col-11 {
   flex: 0 0 91.6666666667%;
   max-width: 91.6666666667%; }
 
-.col-12, .col-xs-12 {
+.col-12 {
   flex: 0 0 100%;
   max-width: 100%; }