moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-04 16:36:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-68550-master' of https://github.com/rezaies/moodle

Browse source
This commit is contained in:
Paul Holden 2022-11-10 11:59:35 +00:00
commit 76c68e2146
10 changed files with 151 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

1
theme/boost/lang/en/deprecated.txt
View file

@ -1,3 +1,4 @@
totop,theme_boost
privacy:drawernavclosed,theme_boost
privacy:drawernavopen,theme_boost
currentinparentheses,theme_boost

2
theme/boost/lang/en/theme_boost.php
View file

@ -32,7 +32,6 @@ $string['brandcolor_desc'] = 'The accent colour.';
$string['bootswatch'] = 'Bootswatch';
$string['bootswatch_desc'] = 'A bootswatch is a set of Bootstrap variables and css to style Bootstrap';
$string['choosereadme'] = 'Boost is a modern highly-customisable theme. This theme is intended to be used directly, or as a parent theme when creating new themes utilising Bootstrap 4.';
$string['currentinparentheses'] = '(current)';
$string['configtitle'] = 'Boost';
$string['generalsettings'] = 'General settings';
$string['loginbackgroundimage'] = 'Login page background image';
@ -64,5 +63,6 @@ $string['privacy:drawerblockopen'] = 'The current preference for the block drawe
$string['totop'] = 'Go to top';
// Deprecated since Moodle 4.1.
$string['currentinparentheses'] = '(current)';
$string['privacy:drawernavclosed'] = 'The current preference for the navigation drawer is closed.';
$string['privacy:drawernavopen'] = 'The current preference for the navigation drawer is open.';

36
theme/boost/scss/moodle/core.scss
View file

@ -2976,3 +2976,39 @@ body.dragging {
}
}
}
.initialbargroups ul {
-webkit-margin-start: 0; /* stylelint-disable-line */
margin-right: -1px;
}
.page-item {
&:first-child {
.page-link {
.initialbargroups & {
@include border-left-radius(0);
@include border-right-radius(0);
}
.initialbargroups .pagination-lg:first-child & {
@include border-left-radius($pagination-border-radius-lg);
}
.initialbargroups .pagination-sm:first-child & {
@include border-left-radius($pagination-border-radius-sm);
}
}
}
&:last-child {
.page-link {
.initialbargroups & {
@include border-left-radius(0);
@include border-right-radius(0);
}
.initialbargroups .pagination-lg:last-child & {
@include border-right-radius($pagination-border-radius-lg);
}
.initialbargroups .pagination-sm:last-child & {
@include border-right-radius($pagination-border-radius-sm);
}
}
}
}

33
theme/boost/style/moodle.css
View file

@ -12280,6 +12280,39 @@ body.dragging .dragging {
.select-menu .dropdown-item[aria-selected="true"] {
font-weight: bold; }
.initialbargroups ul {
-webkit-margin-start: 0;
/* stylelint-disable-line */
margin-right: -1px; }
.initialbargroups .page-item:first-child .page-link {
border-top-left-radius: 0;
border-bottom-left-radius: 0;
border-top-right-radius: 0;
border-bottom-right-radius: 0; }
.initialbargroups .pagination-lg:first-child .page-item:first-child .page-link {
border-top-left-radius: 0.6rem;
border-bottom-left-radius: 0.6rem; }
.initialbargroups .pagination-sm:first-child .page-item:first-child .page-link {
border-top-left-radius: 0.2rem;
border-bottom-left-radius: 0.2rem; }
.initialbargroups .page-item:last-child .page-link {
border-top-left-radius: 0;
border-bottom-left-radius: 0;
border-top-right-radius: 0;
border-bottom-right-radius: 0; }
.initialbargroups .pagination-lg:last-child .page-item:last-child .page-link {
border-top-right-radius: 0.6rem;
border-bottom-right-radius: 0.6rem; }
.initialbargroups .pagination-sm:last-child .page-item:last-child .page-link {
border-top-right-radius: 0.2rem;
border-bottom-right-radius: 0.2rem; }
.icon {
font-size: 16px;
width: 16px;

33
theme/classic/style/moodle.css
View file

@ -12280,6 +12280,39 @@ body.dragging .dragging {
.select-menu .dropdown-item[aria-selected="true"] {
font-weight: bold; }
.initialbargroups ul {
-webkit-margin-start: 0;
/* stylelint-disable-line */
margin-right: -1px; }
.initialbargroups .page-item:first-child .page-link {
border-top-left-radius: 0;
border-bottom-left-radius: 0;
border-top-right-radius: 0;
border-bottom-right-radius: 0; }
.initialbargroups .pagination-lg:first-child .page-item:first-child .page-link {
border-top-left-radius: 0.3rem;
border-bottom-left-radius: 0.3rem; }
.initialbargroups .pagination-sm:first-child .page-item:first-child .page-link {
border-top-left-radius: 0.2rem;
border-bottom-left-radius: 0.2rem; }
.initialbargroups .page-item:last-child .page-link {
border-top-left-radius: 0;
border-bottom-left-radius: 0;
border-top-right-radius: 0;
border-bottom-right-radius: 0; }
.initialbargroups .pagination-lg:last-child .page-item:last-child .page-link {
border-top-right-radius: 0.3rem;
border-bottom-right-radius: 0.3rem; }
.initialbargroups .pagination-sm:last-child .page-item:last-child .page-link {
border-top-right-radius: 0.2rem;
border-bottom-right-radius: 0.2rem; }
.icon {
font-size: 16px;
width: 16px;