Merge branch 'MDL-81823-main' of https://github.com/roland04/moodle

This commit is contained in:
Huong Nguyen 2024-11-19 10:28:33 +07:00
commit c6353ef018
No known key found for this signature in database
GPG Key ID: 40D88AB693A3E72A
6 changed files with 15 additions and 7 deletions

View File

@ -40,7 +40,7 @@
{{#emojis}}
<button
type="button"
class="btn btn-link btn-icon p-0 rounded-lg emoji-button {{#active}}active{{/active}}"
class="btn btn-link btn-icon p-0 rounded-3 emoji-button {{#active}}active{{/active}}"
title="{{displayshortname}}"
data-region="emoji-button"
data-unified="{{unified}}"

View File

@ -41,7 +41,7 @@
<button
data-short-names="{{shortnames}}"
data-unified="{{unified}}"
class="btn btn-link btn-icon p-0 rounded-lg emoji-button"
class="btn btn-link btn-icon p-0 rounded-3 emoji-button"
title="{{shortnames}}"
>{{text}}</button>
{{/emojis}}

View File

@ -154,7 +154,7 @@
{{#pix}} i/moremenu {{/pix}}
</button>
<!-- inline style to fix RTL placement bug -->
<div class="dropdown-menu dropdown-menu-right rounded-lg shadow border-0" aria-labelledby="post-actions-menu-{{id}}-{{uniqid}}" style="right: auto" role="menubar">
<div class="dropdown-menu dropdown-menu-right rounded-3 shadow border-0" aria-labelledby="post-actions-menu-{{id}}-{{uniqid}}" style="right: auto" role="menubar">
{{#capabilities}}
{{#view}}
<a

View File

@ -114,3 +114,11 @@ $alert-color-scale: 50% !default;
.rounded-end {
@extend .rounded-right;
}
// Generate sized rounded classes.
.rounded-1 {
@extend .rounded-sm;
}
.rounded-3 {
@extend .rounded-lg;
}

View File

@ -19489,7 +19489,7 @@ button.bg-dark:focus {
border-color: #fff !important;
}
.rounded-sm {
.rounded-sm, .rounded-1 {
border-radius: 0.2rem !important;
}
@ -19517,7 +19517,7 @@ button.bg-dark:focus {
border-bottom-left-radius: 0.5rem !important;
}
.rounded-lg {
.rounded-lg, .rounded-3 {
border-radius: 0.6rem !important;
}

View File

@ -19489,7 +19489,7 @@ button.bg-dark:focus {
border-color: #fff !important;
}
.rounded-sm {
.rounded-sm, .rounded-1 {
border-radius: 0.2rem !important;
}
@ -19517,7 +19517,7 @@ button.bg-dark:focus {
border-bottom-left-radius: 0.25rem !important;
}
.rounded-lg {
.rounded-lg, .rounded-3 {
border-radius: 0.3rem !important;
}