MDL-68112 core_course: Use bootstrap input-group
authorPeter Dias <peter@moodle.com>
Mon, 9 Mar 2020 04:57:49 +0000 (12:57 +0800)
committerPeter Dias <peter@moodle.com>
Thu, 9 Apr 2020 10:21:24 +0000 (18:21 +0800)
course/amd/build/local/activitychooser/selectors.min.js
course/amd/build/local/activitychooser/selectors.min.js.map
course/amd/src/local/activitychooser/selectors.js
course/templates/local/activitychooser/search.mustache
theme/boost/scss/moodle/core.scss
theme/boost/style/moodle.css
theme/classic/style/moodle.css

index bc9cee0..1fddca8 100644 (file)
Binary files a/course/amd/build/local/activitychooser/selectors.min.js and b/course/amd/build/local/activitychooser/selectors.min.js differ
index f6b3784..bfa0617 100644 (file)
Binary files a/course/amd/build/local/activitychooser/selectors.min.js.map and b/course/amd/build/local/activitychooser/selectors.min.js.map differ
index b8361e6..3a15f75 100644 (file)
@@ -83,7 +83,7 @@ export default {
         tab: 'a[data-toggle="tab"]',
         activetab: 'a[data-toggle="tab"][aria-selected="true"]',
         visibletabs: 'a[data-toggle="tab"]:not(.d-none)',
-        searchicon: '.searchbar-append .search-icon',
-        clearsearch: '.searchbar-append .clear'
+        searchicon: '.input-group-append .search-icon',
+        clearsearch: '.input-group-append .clear'
     },
 };
index b0e62f6..8380231 100644 (file)
     <input type="text"
            data-action="search"
            id="searchinput"
-           class="form-control form-control-lg searchinput px-3 py-2"
+           class="form-control searchinput"
            placeholder="{{#str}} search, core {{/str}}"
            name="search"
            autocomplete="off"
     >
-    <div class="searchbar-append d-flex px-3">
-        <div class="search-icon">
-            {{#pix}} a/search, core {{/pix}}
-        </div>
-        <div class="clear d-none">
-            <button class="btn p-0" data-action="clearsearch">
-                <span class="d-flex" aria-hidden="true">{{#pix}} e/cancel_solid_circle, core {{/pix}}</span>
-                <span class="sr-only">{{#str}} clearsearch, core {{/str}}</span>
-            </button>
+    <div class="input-group-append">
+        <div class="input-group-text">
+            <div class="search-icon">
+                {{#pix}} a/search, core {{/pix}}
+            </div>
+            <div class="clear d-none">
+                <button class="btn p-0" data-action="clearsearch">
+                    <span class="d-flex" aria-hidden="true">{{#pix}} e/cancel_solid_circle, core {{/pix}}</span>
+                    <span class="sr-only">{{#str}} clearsearch, core {{/str}}</span>
+                </button>
+            </div>
         </div>
     </div>
 </div>
index c2d84ff..00987da 100644 (file)
@@ -1530,44 +1530,13 @@ body#page-lib-editor-tinymce-plugins-moodlemedia-preview {
     overflow-y: hidden;
 }
 
-.modchooser .searchcontainer .searchbar {
+.modchooser .searchcontainer .searchbar .input-group-append {
+    align-items: center;
 
-    .searchinput {
-        font-size: inherit;
-        border: 1px solid #dee2e6;
-        border-top-left-radius: .3rem;
-        border-bottom-left-radius: .3rem;
-        border-right: none;
-    }
-
-    .searchbar-append {
-        align-items: center;
-        border: 1px solid #dee2e6;
-        border-left: none;
-        border-top-right-radius: .3rem;
-        border-bottom-right-radius: .3rem;
-
-        i {
-            color: #868e96;
-            margin: 0;
-            vertical-align: middle;
-        }
-
-        .clear {
-            i {
-                height: 23px;
-                width: 23px;
-                font-size: 23px;
-                pointer-events: none;
-            }
-        }
-        .search-icon {
-            i {
-                height: 20px;
-                width: 20px;
-                font-size: 20px;
-            }
-        }
+    i {
+        color: #868e96;
+        margin: 0;
+        vertical-align: middle;
     }
 }
 
index fc53575..521e5e0 100644 (file)
@@ -10668,32 +10668,12 @@ body#page-lib-editor-tinymce-plugins-moodlemedia-preview {
 .modchoosercontainer.noscroll {
   overflow-y: hidden; }
 
-.modchooser .searchcontainer .searchbar .searchinput {
-  font-size: inherit;
-  border: 1px solid #dee2e6;
-  border-top-left-radius: .3rem;
-  border-bottom-left-radius: .3rem;
-  border-right: none; }
-
-.modchooser .searchcontainer .searchbar .searchbar-append {
-  align-items: center;
-  border: 1px solid #dee2e6;
-  border-left: none;
-  border-top-right-radius: .3rem;
-  border-bottom-right-radius: .3rem; }
-  .modchooser .searchcontainer .searchbar .searchbar-append i {
+.modchooser .searchcontainer .searchbar .input-group-append {
+  align-items: center; }
+  .modchooser .searchcontainer .searchbar .input-group-append i {
     color: #868e96;
     margin: 0;
     vertical-align: middle; }
-  .modchooser .searchcontainer .searchbar .searchbar-append .clear i {
-    height: 23px;
-    width: 23px;
-    font-size: 23px;
-    pointer-events: none; }
-  .modchooser .searchcontainer .searchbar .searchbar-append .search-icon i {
-    height: 20px;
-    width: 20px;
-    font-size: 20px; }
 
 .modchoosercontainer .optionscontainer,
 .modchoosercontainer .searchresultitemscontainer {
index a360666..bb8f59e 100644 (file)
@@ -10875,32 +10875,12 @@ body#page-lib-editor-tinymce-plugins-moodlemedia-preview {
 .modchoosercontainer.noscroll {
   overflow-y: hidden; }
 
-.modchooser .searchcontainer .searchbar .searchinput {
-  font-size: inherit;
-  border: 1px solid #dee2e6;
-  border-top-left-radius: .3rem;
-  border-bottom-left-radius: .3rem;
-  border-right: none; }
-
-.modchooser .searchcontainer .searchbar .searchbar-append {
-  align-items: center;
-  border: 1px solid #dee2e6;
-  border-left: none;
-  border-top-right-radius: .3rem;
-  border-bottom-right-radius: .3rem; }
-  .modchooser .searchcontainer .searchbar .searchbar-append i {
+.modchooser .searchcontainer .searchbar .input-group-append {
+  align-items: center; }
+  .modchooser .searchcontainer .searchbar .input-group-append i {
     color: #868e96;
     margin: 0;
     vertical-align: middle; }
-  .modchooser .searchcontainer .searchbar .searchbar-append .clear i {
-    height: 23px;
-    width: 23px;
-    font-size: 23px;
-    pointer-events: none; }
-  .modchooser .searchcontainer .searchbar .searchbar-append .search-icon i {
-    height: 20px;
-    width: 20px;
-    font-size: 20px; }
 
 .modchoosercontainer .optionscontainer,
 .modchoosercontainer .searchresultitemscontainer {