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

NoelDeMartin · Oct 5, 2021 · a4a59a4 · a4a59a4
2 parents 85c1947 + 61bacfb
commit a4a59a4
Show file tree

Hide file tree

Showing 20 changed files with 472 additions and 152 deletions.
diff --git a/admin/tool/componentlibrary/hugo/dist/css/docs.css b/admin/tool/componentlibrary/hugo/dist/css/docs.css
diff --git a/admin/tool/componentlibrary/hugo/dist/css/docs.css.map b/admin/tool/componentlibrary/hugo/dist/css/docs.css.map
diff --git a/admin/tool/componentlibrary/hugo/scss/_componentlibrary.scss b/admin/tool/componentlibrary/hugo/scss/_componentlibrary.scss
@@ -1,6 +1,7 @@
 .path-admin-tool-componentlibrary {
     #page-header,
-    #maincontent {
+    #maincontent,
+    .secondarynavigation {
         display: none;
     }
     #region-main {

diff --git a/admin/tool/componentlibrary/hugo/site/layouts/_default/docs.html b/admin/tool/componentlibrary/hugo/site/layouts/_default/docs.html
@@ -11,7 +11,7 @@
                             <label for="searchinput-componentlibrary">
                                 <span class="sr-only">Search component library</span>
                             </label>
-                            <input type="text" id="searchinput-componentlibrary" class="form-control" placeholder="Search"
+                            <input type="text" id="searchinput-componentlibrary" class="form-control rounded" placeholder="Search"
                                 aria-label="Search component library" name="clsearch" data-region="input" autocomplete="off">
                             <ul class="dropdown-menu w-100">
                             </ul>

diff --git a/lib/templates/emoji/picker.mustache b/lib/templates/emoji/picker.mustache
@@ -39,79 +39,79 @@
 >
     <div class="card-header px-1 pt-1 pb-0 d-flex justify-content-between flex-shrink-0">
         <button
-            class="btn btn-outline-secondary icon-no-margin category-button selected"
+            class="btn btn-outline-secondary icon-no-margin category-button rounded-0 selected"
             data-action="show-category"
             data-category="Recent"
             title="{{#str}} emojicategoryrecent, core {{/str}}"
         >
             {{#pix}} i/emojicategoryrecent, core {{/pix}}
         </button>
         <button
-            class="btn btn-outline-secondary icon-no-margin category-button"
+            class="btn btn-outline-secondary icon-no-margin category-button rounded-0"
             data-action="show-category"
             data-category="Smileys & Emotion"
             title="{{#str}} emojicategorysmileysemotion, core {{/str}}"
         >
             {{#pix}} i/emojicategorysmileysemotion, core {{/pix}}
         </button>
         <button
-            class="btn btn-outline-secondary icon-no-margin category-button"
+            class="btn btn-outline-secondary icon-no-margin category-button rounded-0"
             data-action="show-category"
             data-category="People & Body"
             title="{{#str}} emojicategorypeoplebody, core {{/str}}"
         >
             {{#pix}} i/emojicategorypeoplebody, core {{/pix}}
         </button>
         <button
-            class="btn btn-outline-secondary icon-no-margin category-button"
+            class="btn btn-outline-secondary icon-no-margin category-button rounded-0"
             data-action="show-category"
             data-category="Animals & Nature"
             title="{{#str}} emojicategoryanimalsnature, core {{/str}}"
         >
             {{#pix}} i/emojicategoryanimalsnature, core {{/pix}}
         </button>
         <button
-            class="btn btn-outline-secondary icon-no-margin category-button"
+            class="btn btn-outline-secondary icon-no-margin category-button rounded-0"
             data-action="show-category"
             data-category="Food & Drink"
             title="{{#str}} emojicategoryfooddrink, core {{/str}}"
         >
             {{#pix}} i/emojicategoryfooddrink, core {{/pix}}
         </button>
         <button
-            class="btn btn-outline-secondary icon-no-margin category-button"
+            class="btn btn-outline-secondary icon-no-margin category-button rounded-0"
             data-action="show-category"
             data-category="Travel & Places"
             title="{{#str}} emojicategorytravelplaces, core {{/str}}"
         >
             {{#pix}} i/emojicategorytravelplaces, core {{/pix}}
         </button>
         <button
-            class="btn btn-outline-secondary icon-no-margin category-button"
+            class="btn btn-outline-secondary icon-no-margin category-button rounded-0"
             data-action="show-category"
             data-category="Activities"
             title="{{#str}} emojicategoryactivities, core {{/str}}"
         >
             {{#pix}} i/emojicategoryactivities, core {{/pix}}
         </button>
         <button
-            class="btn btn-outline-secondary icon-no-margin category-button"
+            class="btn btn-outline-secondary icon-no-margin category-button rounded-0"
             data-action="show-category"
             data-category="Objects"
             title="{{#str}} emojicategoryobjects, core {{/str}}"
         >
             {{#pix}} i/emojicategoryobjects, core {{/pix}}
         </button>
         <button
-            class="btn btn-outline-secondary icon-no-margin category-button"
+            class="btn btn-outline-secondary icon-no-margin category-button rounded-0"
             data-action="show-category"
             data-category="Symbols"
             title="{{#str}} emojicategorysymbols, core {{/str}}"
         >
             {{#pix}} i/emojicategorysymbols, core {{/pix}}
         </button>
         <button
-            class="btn btn-outline-secondary icon-no-margin category-button"
+            class="btn btn-outline-secondary icon-no-margin category-button rounded-0"
             data-action="show-category"
             data-category="Flags"
             title="{{#str}} emojicategoryflags, core {{/str}}"

diff --git a/lib/templates/search_input_auto.mustache b/lib/templates/search_input_auto.mustache
@@ -46,7 +46,7 @@
            data-region="input"
            data-action="search"
            id="searchinput"
-           class="form-control withclear"
+           class="form-control withclear rounded"
            placeholder="{{$placeholder}}{{#str}} search, core {{/str}}{{/placeholder}}"
            name="search"
            value="{{$value}}{{/value}}"

diff --git a/lib/templates/search_input_navbar.mustache b/lib/templates/search_input_navbar.mustache
@@ -70,7 +70,7 @@
         </form>
     </div>
     <a
-        class="btn btn-open nav-link"
+        class="btn btn-open rounded-0 nav-link"
         data-toggle="collapse"
         data-action="opensearch"
         href="#searchform-navbar"

diff --git a/message/templates/message_drawer_view_overview_section.mustache b/message/templates/message_drawer_view_overview_section.mustache
@@ -36,12 +36,12 @@
 }}
 
 <div
-    class="section border-0 card"
+    class="section border-0 card rounded-0"
     data-region="{{$region}}{{/region}}"
 >
-    <div id="{{$region}}{{/region}}-toggle" class="card-header p-0" data-region="toggle">
+    <div id="{{$region}}{{/region}}-toggle" class="card-header rounded-0 p-0" data-region="toggle">
         <button
-            class="btn btn-link w-100 text-left p-1 p-sm-2 d-flex align-items-center overview-section-toggle {{^expanded}}collapsed{{/expanded}}"
+            class="btn btn-link w-100 text-left p-1 p-sm-2 d-flex rounded-0 align-items-center overview-section-toggle {{^expanded}}collapsed{{/expanded}}"
             data-toggle="collapse"
             data-target="#{{$region}}{{/region}}-target-{{uniqid}}"
             aria-expanded="{{#expanded}}true{{/expanded}}{{^expanded}}false{{/expanded}}"

diff --git a/theme/boost/scss/moodle/atto.scss b/theme/boost/scss/moodle/atto.scss
@@ -28,6 +28,8 @@ div.editor_atto_toolbar {
     border: 1px solid $input-border-color;
     width: 100%;
     padding: 0 0 9px 0;
+    border-top-left-radius: $border-radius;
+    border-top-right-radius: $border-radius;
 }
 
 div.editor_atto_toolbar button {
@@ -218,6 +220,8 @@ div.editor_atto_content:hover .atto_control {
 .editor_atto_content.form-control {
     width: 100%;
     border-top: 0;
+    border-top-left-radius: 0;
+    border-top-right-radius: 0;
 }
 
 /** Atto fields do not have form-control because that would break the layout of the editor.
@@ -232,4 +236,4 @@ div.editor_atto_content:hover .atto_control {
 }
 div.editor_atto_toolbar button .icon {
     color: $gray-700;
-}
+}
diff --git a/theme/boost/scss/moodle/blocks.scss b/theme/boost/scss/moodle/blocks.scss
@@ -165,6 +165,8 @@ $card-gutter : $card-deck-margin * 2;
             height: 7rem;
             background-position: center;
             background-size: cover;
+            border-bottom-left-radius: 0;
+            border-bottom-right-radius: 0;
         }
         .dashboard-card-footer {
             padding: 0.8rem;

diff --git a/theme/boost/scss/moodle/filemanager.scss b/theme/boost/scss/moodle/filemanager.scss
@@ -43,6 +43,8 @@
 .fp-navbar {
     border-color: $input-border-color;
     border-bottom: 0;
+    border-bottom-left-radius: 0;
+    border-bottom-right-radius: 0;
 }
 
 .file-picker .fp-content {
@@ -607,6 +609,7 @@ a.ygtvspacer:hover {
 .filemanager-container {
     min-height: 140px;
     border: 1px solid $input-border-color;
+    @include border-radius();
 }
 
 .filemanager .fp-content {
@@ -618,6 +621,8 @@ a.ygtvspacer:hover {
 .filemanager-container,
 .filepicker-filelist {
     overflow: hidden;
+    border-top-left-radius: 0;
+    border-top-right-radius: 0;
 }
 
 .file-picker .yui3-datatable-header {

diff --git a/theme/boost/scss/moodle/grade.scss b/theme/boost/scss/moodle/grade.scss
@@ -402,10 +402,6 @@
  */
 .path-grade-report-grader {
     .gradeparent {
-        table {
-            @include border-radius($border-radius);
-        }
-
         tr .cell,
         .floater .cell {
             background-color: $pagination-bg;

diff --git a/theme/boost/scss/moodle/layout.scss b/theme/boost/scss/moodle/layout.scss
@@ -58,8 +58,8 @@
     left: 0;
     z-index: 2;
     .btn {
-        border-top-right-radius: 4px;
-        border-bottom-right-radius: 4px;
+        border-top-left-radius: 0;
+        border-bottom-left-radius: 0;
         padding: 0.375rem;
         width: 2.5rem;
         color: $white;
@@ -79,8 +79,8 @@
     right: 0;
     z-index: 2;
     .btn {
-        border-top-left-radius: 4px;
-        border-bottom-left-radius: 4px;
+        border-top-right-radius: 0;
+        border-bottom-right-radius: 0;
         padding: 0.375rem;
         width: 2.5rem;
         color: $white;

diff --git a/theme/boost/scss/moodle/message.scss b/theme/boost/scss/moodle/message.scss
@@ -536,14 +536,17 @@ $message-day-color: color-yiq($message-app-bg) !default;
             }
         }
     }
-    .list-group .list-group-item {
-        border-left: 0;
-        border-right: 0;
-        &:first-child {
-            border-top: 0;
-        }
-        &:last-child {
-            border-bottom: 0;
+    .list-group {
+        border-radius: 0;
+        .list-group-item {
+            border-left: 0;
+            border-right: 0;
+            &:first-child {
+                border-top: 0;
+            }
+            &:last-child {
+                border-bottom: 0;
+            }
         }
     }
     .last-message {

diff --git a/theme/boost/scss/moodle/modules.scss b/theme/boost/scss/moodle/modules.scss
@@ -1063,13 +1063,6 @@ div#dock {
     }
 }
 
-// Usermenu
-.usermenu {
-    .login {
-        line-height: 2.25rem;
-    }
-}
-
 .userloggedinas,
 .userswitchedrole,
 .loginfailures {

diff --git a/theme/boost/scss/moodle/navbar.scss b/theme/boost/scss/moodle/navbar.scss
@@ -30,8 +30,20 @@
             display: flex;
             align-items: center;
         }
-        .dropdown-toggle::after {
-            display: none;
+        .dropdown {
+            display: flex;
+            align-items: center;
+            .dropdown-toggle {
+                padding-top: 0;
+                padding-bottom: 0;
+                border-radius: 0;
+                display: flex;
+                align-items: center;
+                height: 100%;
+            }
+            .dropdown-toggle::after {
+                display: none;
+            }
         }
         .dropdown-menu {
             min-width: 235px;
@@ -73,6 +85,10 @@
                 }
             }
         }
+        .login {
+            display: flex;
+            align-items: center;
+        }
     }
     .langmenu {
         .dropdown-menu {

diff --git a/theme/boost/scss/moodle/search.scss b/theme/boost/scss/moodle/search.scss
@@ -12,6 +12,12 @@
 }
 
 .simplesearchform {
+    @if $enable-rounded {
+        .input-group input.form-control {
+            border-top-left-radius: $border-radius;
+            border-bottom-left-radius: $border-radius;
+        }
+    }
     .btn {
         padding-left: 0.5rem;
         padding-right: 0.5rem;

diff --git a/theme/boost/scss/preset/default.scss b/theme/boost/scss/preset/default.scss
@@ -36,7 +36,6 @@ $warning-outline: #a6670e;
 $table-accent-bg:             rgba($black, .03) !default;
 
 // Options
-$enable-rounded: false !default;
 $enable-responsive-font-sizes: true !default;
 
 // Body