L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-87891-main' of https://github.com/sarjona/moodle

Browse Source
This commit is contained in:
Amaia Anabitarte
2026-02-25 16:45:21 +01:00
parent d5730e395b a94b000c49
commit 400a733315
8 changed files with 56 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/admin/tool/componentlibrary/hugo/site/data/fontawesomeicons.json
+1 -1
View File
File diff suppressed because one or more lines are too long
public/pix/e/sidebar_left.svg
+3
View File
@@ -0,0 +1,3 @@
<svg width="20" height="16" viewBox="0 0 20 16" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M14.2296 0C16.8642 0.000258968 19 2.13126 19 4.76041V11.2396C18.9997 13.8685 16.864 15.9997 14.2296 16H5.77137C3.1367 16 1.00026 13.8687 1 11.2396V4.76041C1 2.1311 3.13654 0 5.77137 0H14.2296ZM7.67243 14.3311H14.2296C15.9405 14.3308 17.3283 12.9469 17.3285 11.2396V4.76041C17.3285 3.05287 15.9407 1.66822 14.2296 1.66796H7.67243V14.3311ZM5.77137 1.66796C4.06009 1.66796 2.67243 3.05271 2.67243 4.76041V11.2396C2.67269 12.9471 4.06025 14.3311 5.77137 14.3311H6V1.66796H5.77137Z" fill="#545454"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 647 B

public/pix/e/sidebar_right.svg
+3
View File
@@ -0,0 +1,3 @@
<svg width="20" height="16" viewBox="0 0 20 16" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M13.9658 0C16.7474 0.000258968 19.0012 2.13126 19.0012 4.76041V11.2396C19.0009 13.8685 16.7472 15.9997 13.9658 16H6.03645C3.25479 16 1.00027 13.8687 1 11.2396V4.76041C1 2.1311 3.25462 0 6.03645 0H13.9658ZM13.8624 14.3311H13.9658C15.7721 14.3308 17.2366 12.9469 17.2369 11.2396V4.76041C17.2369 3.05287 15.7723 1.66822 13.9658 1.66796H13.8624V14.3311ZM6.03645 1.66796C4.22969 1.66796 2.76534 3.05271 2.76534 4.76041V11.2396C2.76562 12.9471 4.22986 14.3311 6.03645 14.3311H12.098V1.66796H6.03645Z" fill="#545454"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 664 B

public/theme/boost/scss/moodle/layout.scss
+13 -21
View File
@@ -85,13 +85,12 @@
.drawer-toggler {
position: fixed;
top: calc(#{$navbar-height} + 0.7rem);
top: calc(#{$navbar-height} + 1rem);
z-index: 2;
.btn {
border-radius: 200px;
padding: 16px;
padding: 8px;
margin: auto 16px;
background-color: $gray-300;
box-shadow: $box-shadow-sm;
.icon {
width: auto;
height: auto;
@@ -99,34 +98,21 @@
&:focus {
box-shadow: $input-btn-focus-box-shadow;
}
transition: padding 200ms;
}
}
.drawer-left-toggle {
left: 0;
.btn {
border-top-left-radius: 0;
border-bottom-left-radius: 0;
padding-right: 14px;
padding-left: 10px;
&:hover {
padding-left: 20px;
}
}
}
.drawer-right-toggle {
right: 0;
.btn {
border-top-right-radius: 0;
border-bottom-right-radius: 0;
padding-right: 10px;
padding-left: 14px;
}
.drawer-toggler {
.btn {
&:hover {
padding-right: 20px;
background-color: $gray-400;
}
}
}
@@ -140,6 +126,12 @@
display: none;
}
@include media-breakpoint-down(md) {
.drawer-toggler .btn {
box-shadow: 0 2px 8px 0 rgba($black, .33);
}
}
@include media-breakpoint-down(md) {
//the scroll to top button
.drawer-toggles {
public/theme/boost/style/moodle.css
+10 -22
View File
@@ -39495,15 +39495,13 @@ body.tox-fullscreen .tox.tox-tinymce-aux {
}
.drawer-toggles .drawer-toggler {
position: fixed;
top: calc(60px + 0.7rem);
top: calc(60px + 1rem);
z-index: 2;
}
.drawer-toggles .drawer-toggler .btn {
border-radius: 200px;
padding: 16px;
padding: 8px;
margin: auto 16px;
background-color: #dee2e6;
box-shadow: 0 0.125rem 0.25rem rgba(0, 0, 0, 0.075);
transition: padding 200ms;
}
.drawer-toggles .drawer-toggler .btn .icon {
width: auto;
@@ -39515,26 +39513,11 @@ body.tox-fullscreen .tox.tox-tinymce-aux {
.drawer-toggles .drawer-left-toggle {
left: 0;
}
.drawer-toggles .drawer-left-toggle .btn {
border-top-left-radius: 0;
border-bottom-left-radius: 0;
padding-right: 14px;
padding-left: 10px;
}
.drawer-toggles .drawer-left-toggle .btn:hover {
padding-left: 20px;
}
.drawer-toggles .drawer-right-toggle {
right: 0;
}
.drawer-toggles .drawer-right-toggle .btn {
border-top-right-radius: 0;
border-bottom-right-radius: 0;
padding-right: 10px;
padding-left: 14px;
}
.drawer-toggles .drawer-right-toggle .btn:hover {
padding-right: 20px;
.drawer-toggles .drawer-toggler .btn:hover {
background-color: #ced4da;
}
#page.drawers.show-drawer-left .drawer-left-toggle {
@@ -39545,6 +39528,11 @@ body.tox-fullscreen .tox.tox-tinymce-aux {
display: none;
}
@media (max-width: 767.98px) {
.drawer-toggler .btn {
box-shadow: 0 2px 8px 0 rgba(0, 0, 0, 0.33);
}
}
@media (max-width: 767.98px) {
.drawer-toggles {
z-index: 100;
public/theme/boost/templates/drawer.mustache
+4 -1
View File
@@ -52,7 +52,10 @@
data-bs-placement="{{$tooltipplacement}}right{{/tooltipplacement}}"
title="{{$closebuttontext}}{{#str}}closedrawer, core{{/str}}{{/closebuttontext}}"
>
{{#pix}} e/cancel, core {{/pix}}
{{$closebuttonicon}}
{{! This is the default icon used if the parent doesn't override it }}
{{#pix}} e/cancel, core {{/pix}}
{{/closebuttonicon}}
</button>
</div>
</div>
public/theme/boost/templates/drawers.mustache
+12 -3
View File
@@ -73,6 +73,10 @@
{{$drawerstate}}show-drawer-left{{/drawerstate}}
{{$tooltipplacement}}right{{/tooltipplacement}}
{{$closebuttontext}}{{#str}}closecourseindex, core{{/str}}{{/closebuttontext}}
{{$closebuttonicon}}
<span class="dir-rtl-hide">{{#pix}} e/sidebar_left, core {{/pix}}</span>
<span class="dir-ltr-hide">{{#pix}} e/sidebar_right, core {{/pix}}</span>
{{/closebuttonicon}}
{{/ theme_boost/drawer}}
{{/courseindex}}
{{#hasblocks}}
@@ -91,6 +95,10 @@
{{$tooltipplacement}}left{{/tooltipplacement}}
{{$drawercloseonresize}}1{{/drawercloseonresize}}
{{$closebuttontext}}{{#str}}closeblockdrawer, core{{/str}}{{/closebuttontext}}
{{$closebuttonicon}}
<span class="dir-rtl-hide">{{#pix}} e/sidebar_right, core {{/pix}}</span>
<span class="dir-ltr-hide">{{#pix}} e/sidebar_left, core {{/pix}}</span>
{{/closebuttonicon}}
{{/ theme_boost/drawer}}
{{/hasblocks}}
<div id="page" data-region="mainpage" data-usertour="scroller" class="drawers {{#courseindexopen}}show-drawer-left{{/courseindexopen}} {{#blockdraweropen}}show-drawer-right{{/blockdraweropen}} drag-container">
@@ -108,7 +116,8 @@
title="{{#str}}opendrawerindex, core{{/str}}"
>
<span class="visually-hidden">{{#str}}opendrawerindex, core{{/str}}</span>
{{#pix}} t/index_drawer, moodle {{/pix}}
<span class="dir-rtl-hide">{{#pix}} e/sidebar_left, core {{/pix}}</span>
<span class="dir-ltr-hide">{{#pix}} e/sidebar_right, core {{/pix}}</span>
</button>
</div>
{{/courseindex}}
@@ -124,8 +133,8 @@
title="{{#str}}opendrawerblocks, core{{/str}}"
>
<span class="visually-hidden">{{#str}}opendrawerblocks, core{{/str}}</span>
<span class="dir-rtl-hide">{{#pix}}t/blocks_drawer, core{{/pix}}</span>
<span class="dir-ltr-hide">{{#pix}}t/blocks_drawer_rtl, core{{/pix}}</span>
<span class="dir-rtl-hide">{{#pix}} e/sidebar_right, core {{/pix}}</span>
<span class="dir-ltr-hide">{{#pix}} e/sidebar_left, core {{/pix}}</span>
</button>
</div>
{{/hasblocks}}
public/theme/classic/style/moodle.css
+10 -22
View File
@@ -39429,15 +39429,13 @@ body.tox-fullscreen .tox.tox-tinymce-aux {
}
.drawer-toggles .drawer-toggler {
position: fixed;
top: calc(50px + 0.7rem);
top: calc(50px + 1rem);
z-index: 2;
}
.drawer-toggles .drawer-toggler .btn {
border-radius: 200px;
padding: 16px;
padding: 8px;
margin: auto 16px;
background-color: #dee2e6;
box-shadow: 0 0.125rem 0.25rem rgba(0, 0, 0, 0.075);
transition: padding 200ms;
}
.drawer-toggles .drawer-toggler .btn .icon {
width: auto;
@@ -39449,26 +39447,11 @@ body.tox-fullscreen .tox.tox-tinymce-aux {
.drawer-toggles .drawer-left-toggle {
left: 0;
}
.drawer-toggles .drawer-left-toggle .btn {
border-top-left-radius: 0;
border-bottom-left-radius: 0;
padding-right: 14px;
padding-left: 10px;
}
.drawer-toggles .drawer-left-toggle .btn:hover {
padding-left: 20px;
}
.drawer-toggles .drawer-right-toggle {
right: 0;
}
.drawer-toggles .drawer-right-toggle .btn {
border-top-right-radius: 0;
border-bottom-right-radius: 0;
padding-right: 10px;
padding-left: 14px;
}
.drawer-toggles .drawer-right-toggle .btn:hover {
padding-right: 20px;
.drawer-toggles .drawer-toggler .btn:hover {
background-color: #ced4da;
}
#page.drawers.show-drawer-left .drawer-left-toggle {
@@ -39479,6 +39462,11 @@ body.tox-fullscreen .tox.tox-tinymce-aux {
display: none;
}
@media (max-width: 767.98px) {
.drawer-toggler .btn {
box-shadow: 0 2px 8px 0 rgba(0, 0, 0, 0.33);
}
}
@media (max-width: 767.98px) {
.drawer-toggles {
z-index: 100;