Merge branch 'MDL-63113-master' of git://github.com/bmbrands/moodle

moodle · Sep 26, 2018 · 201d21e · 201d21e
2 parents 0e79528 + a81e691
commit 201d21e
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 35 deletions.
diff --git a/theme/boost/scss/moodle/core.scss b/theme/boost/scss/moodle/core.scss
@@ -1088,17 +1088,6 @@ body#page-lib-editor-tinymce-plugins-moodlemedia-preview {
     text-align: center;
 }
 
-
-.initialbarlabel {
-    display: inline-block;
-    width: 6em;
-    float: left;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-}
-
-
 /* Moodle Dialogue Settings (moodle-core-dialogue)  */
 .moodle-dialogue-base .moodle-dialogue-lightbox {
     background-color: $gray;

diff --git a/theme/boost/style/moodle.css b/theme/boost/style/moodle.css
@@ -9660,14 +9660,6 @@ body#page-lib-editor-tinymce-plugins-moodlemedia-preview {
   white-space: nowrap;
   text-align: center; }
 
-.initialbarlabel {
-  display: inline-block;
-  width: 6em;
-  float: left;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap; }
-
 /* Moodle Dialogue Settings (moodle-core-dialogue)  */
 .moodle-dialogue-base .moodle-dialogue-lightbox {
   background-color: #495057; }

diff --git a/theme/boost/templates/core/initials_bar.mustache b/theme/boost/templates/core/initials_bar.mustache
@@ -73,24 +73,24 @@
          ]
     }
 }}
-<div class="initialbar {{class}} d-flex">
-    <span class="initialbarlabel">{{title}}</span>
-    <ul class="pagination pagination-sm">
-    {{#current}}
-        <li class="initialbarall page-item">
-            <a class="page-link" href="{{url}}">{{all}}</a>
-        </li>
-    {{/current}}
-    {{^current}}
-        <li class="initialbarall page-item active">
-            <a class="page-link">{{all}}</a>
-        </li>
-    {{/current}}
-    </ul>
-    <div class="initialbargroups d-flex">
+<div class="initialbar {{class}} d-flex flex-wrap justify-content-center justify-content-md-start">
+    <span class="initialbarlabel mr-2">{{title}}</span>
+
+    <div class="initialbargroups d-flex flex-wrap justify-content-center justify-content-md-start">
+        <ul class="pagination pagination-sm">
+        {{#current}}
+            <li class="initialbarall page-item">
+                <a class="page-link" href="{{url}}">{{all}}</a>
+            </li>
+        {{/current}}
+        {{^current}}
+            <li class="initialbarall page-item active">
+                <a class="page-link">{{all}}</a>
+            </li>
+        {{/current}}
+        </ul>
         {{#group}}
             <ul class="pagination pagination-sm">
-
                 {{#letter}}
                     {{#selected}}
                         <li class="page-item active {{name}}"><span class="page-link">{{name}}</span></li>