Merge branch 'MDL-68975-master' of git://github.com/sarjona/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 20 Aug 2020 00:40:37 +0000 (08:40 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 20 Aug 2020 00:40:37 +0000 (08:40 +0800)
1  2 
contentbank/templates/bankcontent.mustache
theme/boost/style/moodle.css
theme/classic/style/moodle.css

@@@ -122,10 -124,10 +124,10 @@@ data-region="contentbank"
                              <span class="asc">{{#pix}} t/sort_asc, core, {{#str}}asc, core{{/str}} {{/pix}}</span>
                          </button>
                      </div>
-                     <div class="cb-type cb-column d-flex last">
+                     <div class="cb-type cb-column d-flex">
                          <div class="title">{{#str}} type, contentbank {{/str}}</div>
                          <button class="btn btn-sm cb-btnsort dir-none ml-auto" data-string="type" data-action="sorttype"
 -                        title="{{#str}} sortbyx, core, {{#str}} size, contentbank {{/str}} {{/str}}">
 +                        title="{{#str}} sortbyx, core, {{#str}} type, contentbank {{/str}} {{/str}}">
                              <span class="default">{{#pix}} t/sort, core, {{#str}}sort, core {{/str}} {{/pix}}</span>
                              <span class="desc">{{#pix}} t/sort_desc, core, {{#str}}desc, core{{/str}} {{/pix}}</span>
                              <span class="asc">{{#pix}} t/sort_asc, core, {{#str}}asc, core{{/str}} {{/pix}}</span>
Simple merge
Simple merge