mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-21 00:12:56 +02:00
Code Issues Projects Releases Wiki Activity

MDL-72455 theme_boost: enable roundness for bootstrap components

Browse Source
This commit is contained in:
Bas Brands 2021-09-02 11:21:08 +02:00
parent 214adb7984
commit 61bacfb935
20 changed files with 472 additions and 152 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
admin/tool/componentlibrary/hugo/dist/css/docs.css vendored
View File

@ -1089,7 +1089,8 @@
}
.path-admin-tool-componentlibrary #page-header,
.path-admin-tool-componentlibrary #maincontent {
.path-admin-tool-componentlibrary #maincontent,
.path-admin-tool-componentlibrary .secondarynavigation {
display: none;
}

4
admin/tool/componentlibrary/hugo/dist/css/docs.css.map vendored
View File

File diff suppressed because one or more lines are too long

3
admin/tool/componentlibrary/hugo/scss/_componentlibrary.scss
View File

@ -1,6 +1,7 @@
.path-admin-tool-componentlibrary {
#page-header,
#maincontent {
#maincontent,
.secondarynavigation {
display: none;
}
#region-main {

2
admin/tool/componentlibrary/hugo/site/layouts/_default/docs.html
View File

@ -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>

20
lib/templates/emoji/picker.mustache
View File

@ -39,7 +39,7 @@
>
<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}}"
@ -47,7 +47,7 @@
{{#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}}"
@ -55,7 +55,7 @@
{{#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}}"
@ -63,7 +63,7 @@
{{#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}}"
@ -71,7 +71,7 @@
{{#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}}"
@ -79,7 +79,7 @@
{{#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}}"
@ -87,7 +87,7 @@
{{#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}}"
@ -95,7 +95,7 @@
{{#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}}"
@ -103,7 +103,7 @@
{{#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}}"
@ -111,7 +111,7 @@
{{#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}}"

2
lib/templates/search_input_auto.mustache
View File

@ -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}}"

2
lib/templates/search_input_navbar.mustache
View File

@ -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"

6
message/templates/message_drawer_view_overview_section.mustache
View File

@ -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}}"

6
theme/boost/scss/moodle/atto.scss
View File

@ -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;
}
}

2
theme/boost/scss/moodle/blocks.scss
View File

@ -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;

5
theme/boost/scss/moodle/filemanager.scss
View File

@ -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 {

4
theme/boost/scss/moodle/grade.scss
View File

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

8
theme/boost/scss/moodle/layout.scss
View File

@ -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;

19
theme/boost/scss/moodle/message.scss
View File

@ -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 {

7
theme/boost/scss/moodle/modules.scss
View File

@ -1063,13 +1063,6 @@ div#dock {
}
}
// Usermenu
.usermenu {
.login {
line-height: 2.25rem;
}
}
.userloggedinas,
.userswitchedrole,
.loginfailures {

20
theme/boost/scss/moodle/navbar.scss
View File

@ -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 {

6
theme/boost/scss/moodle/search.scss
View File

@ -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;

1
theme/boost/scss/preset/default.scss
View File

@ -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

430
theme/boost/style/moodle.css
View File

File diff suppressed because it is too large Load Diff

74
theme/classic/style/moodle.css
View File

@ -12920,7 +12920,9 @@ body.dragging .dragging {
.dashboard-card-deck .dashboard-card .dashboard-card-img {
height: 7rem;
background-position: center;
background-size: cover; }
background-size: cover;
border-bottom-left-radius: 0;
border-bottom-right-radius: 0; }
.dashboard-card-deck .dashboard-card .dashboard-card-footer {
padding: 0.8rem; }
@ -14691,7 +14693,9 @@ body.drawer-ease {
.fp-navbar {
border-color: #8f959e;
border-bottom: 0; }
border-bottom: 0;
border-bottom-left-radius: 0;
border-bottom-right-radius: 0; }
.file-picker .fp-content {
border-top: 0;
@ -15154,7 +15158,8 @@ a.ygtvspacer:hover {
.filepicker-filelist,
.filemanager-container {
min-height: 140px;
border: 1px solid #8f959e; }
border: 1px solid #8f959e;
border-radius: 0.25rem; }
.filemanager .fp-content {
overflow: auto;
@ -15163,7 +15168,9 @@ a.ygtvspacer:hover {
.filemanager-container,
.filepicker-filelist {
overflow: hidden; }
overflow: hidden;
border-top-left-radius: 0;
border-top-right-radius: 0; }
.file-picker .yui3-datatable-header {
/*rtl:raw:
@ -15812,13 +15819,15 @@ a.ygtvspacer:hover {
display: flex; }
.message-app .view-conversation .content-message-container img {
max-width: 100%; }
.message-app .list-group .list-group-item {
border-left: 0;
border-right: 0; }
.message-app .list-group .list-group-item:first-child {
border-top: 0; }
.message-app .list-group .list-group-item:last-child {
border-bottom: 0; }
.message-app .list-group {
border-radius: 0; }
.message-app .list-group .list-group-item {
border-left: 0;
border-right: 0; }
.message-app .list-group .list-group-item:first-child {
border-top: 0; }
.message-app .list-group .list-group-item:last-child {
border-bottom: 0; }
.message-app .last-message {
min-height: 1.5rem; }
.message-app .section .collapsing {
@ -16703,6 +16712,10 @@ body.path-question-type .mform fieldset.hidden {
.search-results .result .filename {
font-style: italic; }
.simplesearchform .input-group input.form-control {
border-top-left-radius: 0.25rem;
border-bottom-left-radius: 0.25rem; }
.simplesearchform .btn {
padding-left: 0.5rem;
padding-right: 0.5rem; }
@ -17872,9 +17885,6 @@ div#dock {
overflow: hidden;
width: 0; }
.usermenu .login {
line-height: 2.25rem; }
.userloggedinas .usermenu .usertext,
.userswitchedrole .usermenu .usertext,
.loginfailures .usermenu .usertext {
@ -18935,9 +18945,6 @@ p.arrow_button {
/**
* Grader report.
*/
.path-grade-report-grader .gradeparent table {
border-radius: 0.25rem; }
.path-grade-report-grader .gradeparent tr .cell,
.path-grade-report-grader .gradeparent .floater .cell {
background-color: #fff; }
@ -19699,8 +19706,8 @@ span[data-flexitour="container"][x-placement="right"], span[data-flexitour="cont
left: 0;
z-index: 2; }
.drawer-left-toggle .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: #fff;
@ -19718,8 +19725,8 @@ span[data-flexitour="container"][x-placement="right"], span[data-flexitour="cont
right: 0;
z-index: 2; }
.drawer-right-toggle .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: #fff;
@ -19866,7 +19873,9 @@ div.editor_atto_toolbar {
min-height: 35px;
border: 1px solid #8f959e;
width: 100%;
padding: 0 0 9px 0; }
padding: 0 0 9px 0;
border-top-left-radius: 0.25rem;
border-top-right-radius: 0.25rem; }
div.editor_atto_toolbar button {
padding: 4px 9px;
@ -20020,7 +20029,9 @@ div.editor_atto_content:hover .atto_control {
.editor_atto_content.form-control {
width: 100%;
border-top: 0; }
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.
So they need these extra styles to highlight the editor when there is a validation error. */
@ -20238,8 +20249,18 @@ div.editor_atto_toolbar button .icon {
.navbar.fixed-top .usermenu .action-menu {
display: flex;
align-items: center; }
.navbar.fixed-top .usermenu .dropdown-toggle::after {
display: none; }
.navbar.fixed-top .usermenu .dropdown {
display: flex;
align-items: center; }
.navbar.fixed-top .usermenu .dropdown .dropdown-toggle {
padding-top: 0;
padding-bottom: 0;
border-radius: 0;
display: flex;
align-items: center;
height: 100%; }
.navbar.fixed-top .usermenu .dropdown .dropdown-toggle::after {
display: none; }
.navbar.fixed-top .usermenu .dropdown-menu {
min-width: 235px; }
.navbar.fixed-top .usermenu .dropdown-menu .carousel-navigation-link > * {
@ -20265,6 +20286,9 @@ div.editor_atto_toolbar button .icon {
content: "";
font-size: 0.75rem;
padding-left: .25rem; }
.navbar.fixed-top .usermenu .login {
display: flex;
align-items: center; }
.navbar.fixed-top .langmenu .dropdown-menu .dropdown-item[aria-current="true"]::before {
content: "\f00c";
font-size: 0.75rem;