Merge branch 'MDL-63813-master' of git://github.com/andrewnicols/moodle

moodle · Oct 30, 2018 · a78e942 · a78e942
2 parents 5bfa505 + 98f65cf
commit a78e942
Showing 1 changed file with 45 additions and 43 deletions.
diff --git a/theme/bootstrapbase/templates/core/paged_content_paging_bar.mustache b/theme/bootstrapbase/templates/core/paged_content_paging_bar.mustache
@@ -138,48 +138,50 @@
         {{/arialabels.paginationactivenavitemcomponents}}
     >
 
-        <ul class="mb-0">
-            {{#previous}}
-                {{< core/paged_content_paging_bar_item }}
-                    {{$item-content}}
-                        <span aria-hidden="true">&laquo;</span>
-                        <span class="sr-only">{{#str}}previous{{/str}}</span>
-                    {{/item-content}}
-                    {{$attributes}}data-control="previous"{{/attributes}}
-                {{/ core/paged_content_paging_bar_item }}
-            {{/previous}}
-            {{#first}}
-                {{< core/paged_content_paging_bar_item }}
-                    {{$item-content}}
-                        <span aria-hidden="true">{{#str}}first{{/str}}</span>
-                        <span class="sr-only">{{#str}}first{{/str}}</span>
-                    {{/item-content}}
-                    {{$attributes}}data-control="first"{{/attributes}}
-                {{/ core/paged_content_paging_bar_item }}
-            {{/first}}
-            {{#pages}}
-                {{< core/paged_content_paging_bar_item }}
-                    {{$attributes}}data-page="true"{{/attributes}}
-                {{/ core/paged_content_paging_bar_item }}
-            {{/pages}}
-            {{#last}}
-                {{< core/paged_content_paging_bar_item }}
-                    {{$item-content}}
-                        <span aria-hidden="true">{{#str}}last{{/str}}</span>
-                        <span class="sr-only">{{#str}}last{{/str}}</span>
-                    {{/item-content}}
-                    {{$attributes}}data-control="last"{{/attributes}}
-                {{/ core/paged_content_paging_bar_item }}
-            {{/last}}
-            {{#next}}
-                {{< core/paged_content_paging_bar_item }}
-                    {{$item-content}}
-                        <span aria-hidden="true">&raquo;</span>
-                        <span class="sr-only">{{#str}}next{{/str}}</span>
-                    {{/item-content}}
-                    {{$attributes}}data-control="next"{{/attributes}}
-                {{/ core/paged_content_paging_bar_item }}
-            {{/next}}
-        </ul>
+        <div class="d-inline-block">
+            <ul class="mb-0 d-flex">
+                {{#previous}}
+                    {{< core/paged_content_paging_bar_item }}
+                        {{$item-content}}
+                            <span aria-hidden="true">&laquo;</span>
+                            <span class="sr-only">{{#str}}previous{{/str}}</span>
+                        {{/item-content}}
+                        {{$attributes}}data-control="previous"{{/attributes}}
+                    {{/ core/paged_content_paging_bar_item }}
+                {{/previous}}
+                {{#first}}
+                    {{< core/paged_content_paging_bar_item }}
+                        {{$item-content}}
+                            <span aria-hidden="true">{{#str}}first{{/str}}</span>
+                            <span class="sr-only">{{#str}}first{{/str}}</span>
+                        {{/item-content}}
+                        {{$attributes}}data-control="first"{{/attributes}}
+                    {{/ core/paged_content_paging_bar_item }}
+                {{/first}}
+                {{#pages}}
+                    {{< core/paged_content_paging_bar_item }}
+                        {{$attributes}}data-page="true"{{/attributes}}
+                    {{/ core/paged_content_paging_bar_item }}
+                {{/pages}}
+                {{#last}}
+                    {{< core/paged_content_paging_bar_item }}
+                        {{$item-content}}
+                            <span aria-hidden="true">{{#str}}last{{/str}}</span>
+                            <span class="sr-only">{{#str}}last{{/str}}</span>
+                        {{/item-content}}
+                        {{$attributes}}data-control="last"{{/attributes}}
+                    {{/ core/paged_content_paging_bar_item }}
+                {{/last}}
+                {{#next}}
+                    {{< core/paged_content_paging_bar_item }}
+                        {{$item-content}}
+                            <span aria-hidden="true">&raquo;</span>
+                            <span class="sr-only">{{#str}}next{{/str}}</span>
+                        {{/item-content}}
+                        {{$attributes}}data-control="next"{{/attributes}}
+                    {{/ core/paged_content_paging_bar_item }}
+                {{/next}}
+            </ul>
+        </div>
     </div>
 </div>