mirror of
https://github.com/moodle/moodle.git
synced 2025-08-08 02:16:41 +02:00
Merge branch 'MDL-64821-master-2' of https://github.com/ryanwyllie/moodle
This commit is contained in:
Jake Dallimore
commit
c3122dfcf5
50 changed files with 2204 additions and 183 deletions
2
theme/boost/amd/build/loader.min.js
vendored
2
theme/boost/amd/build/loader.min.js
vendored
|
|
@ -1,2 +1,2 @@
|
|||
define ("theme_boost/loader",["jquery","./tether","core/event"],function(a,b,c){window.jQuery=a;window.Tether=b;M.util.js_pending("theme_boost/loader:children");require(["theme_boost/aria","theme_boost/pending","theme_boost/util","theme_boost/alert","theme_boost/button","theme_boost/carousel","theme_boost/collapse","theme_boost/dropdown","theme_boost/modal","theme_boost/scrollspy","theme_boost/tab","theme_boost/tooltip","theme_boost/popover"],function(b){a("body").popover({trigger:"focus",selector:"[data-toggle=popover][data-trigger!=hover]"});a("html").popover({container:"body",selector:"[data-toggle=popover][data-trigger=hover]",trigger:"hover",delay:{hide:500}});a.fn.dropdown.Constructor.Default.flip=!1;a("a[data-toggle=\"tab\"]").on("shown.bs.tab",function(b){var c=a(b.target).attr("href");if(history.replaceState){history.replaceState(null,null,c)}else{location.hash=c}});var d=window.location.hash;if(d){a(".nav-link[href=\""+d+"\"]").tab("show")}c.getLegacyEvents().done(function(b){a(document).on(b.FILTER_CONTENT_UPDATED,function(){a("body").popover({selector:"[data-toggle=\"popover\"]",trigger:"focus"})})});b.init();M.util.js_complete("theme_boost/loader:children")});return{}});
|
||||
define ("theme_boost/loader",["jquery","./tether","core/event"],function(a,b,c){window.jQuery=a;window.Tether=b;M.util.js_pending("theme_boost/loader:children");require(["theme_boost/aria","theme_boost/pending","theme_boost/util","theme_boost/alert","theme_boost/button","theme_boost/carousel","theme_boost/collapse","theme_boost/dropdown","theme_boost/modal","theme_boost/scrollspy","theme_boost/tab","theme_boost/tooltip","theme_boost/popover"],function(b){a("body").popover({trigger:"focus",selector:"[data-toggle=popover][data-trigger!=hover]"});a("html").popover({container:"body",selector:"[data-toggle=popover][data-trigger=hover]",trigger:"hover",delay:{hide:500}});a("html").tooltip({container:"body",selector:"[data-toggle=\"tooltip\"]"});a.fn.dropdown.Constructor.Default.flip=!1;a("a[data-toggle=\"tab\"]").on("shown.bs.tab",function(b){var c=a(b.target).attr("href");if(history.replaceState){history.replaceState(null,null,c)}else{location.hash=c}});var d=window.location.hash;if(d){a(".nav-link[href=\""+d+"\"]").tab("show")}c.getLegacyEvents().done(function(b){a(document).on(b.FILTER_CONTENT_UPDATED,function(){a("body").popover({selector:"[data-toggle=\"popover\"]",trigger:"focus"})})});b.init();M.util.js_complete("theme_boost/loader:children")});return{}});
|
||||
//# sourceMappingURL=loader.min.js.map
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -59,6 +59,11 @@ define(['jquery', './tether', 'core/event'], function(jQuery, Tether, Event) {
|
|||
}
|
||||
});
|
||||
|
||||
jQuery("html").tooltip({
|
||||
container: "body",
|
||||
selector: '[data-toggle="tooltip"]'
|
||||
});
|
||||
|
||||
// Disables flipping the dropdowns up and getting hidden behind the navbar.
|
||||
jQuery.fn.dropdown.Constructor.Default.flip = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -46,3 +46,23 @@ p.arrow_button {
|
|||
margin: 0 0 10px 5px;
|
||||
}
|
||||
|
||||
.btn.btn-icon {
|
||||
@extend .btn-link;
|
||||
|
||||
height: $icon-width;
|
||||
width: $icon-width;
|
||||
padding: 0;
|
||||
border-radius: 50%;
|
||||
flex-shrink: 0;
|
||||
|
||||
@include hover-focus {
|
||||
background-color: $gray-200;
|
||||
}
|
||||
|
||||
@each $size, $length in $iconsizes {
|
||||
&.icon-size-#{$size} {
|
||||
height: ($length + 20px) !important; /* stylelint-disable-line declaration-no-important */
|
||||
width: ($length + 20px) !important; /* stylelint-disable-line declaration-no-important */
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2158,13 +2158,13 @@ div.editor_atto_toolbar button .icon {
|
|||
}
|
||||
}
|
||||
|
||||
$switch-height: (1rem * .8) !default;
|
||||
$switch-height: 1.25rem !default;
|
||||
$switch-height-half: ($switch-height / 2) !default;
|
||||
$switch-border-radius: $switch-height !default;
|
||||
$switch-bg: $custom-control-indicator-bg !default;
|
||||
$switch-bg: $gray-300 !default;
|
||||
$switch-checked-bg: map-get($theme-colors, 'primary') !default;
|
||||
$switch-disabled-bg: $custom-control-indicator-disabled-bg !default;
|
||||
$switch-disabled-color: $custom-control-label-disabled-color !default;
|
||||
$switch-disabled-bg: $gray-200 !default;
|
||||
$switch-disabled-color: $gray-600 !default;
|
||||
$switch-thumb-bg: $white !default;
|
||||
$switch-thumb-border-radius: 50% !default;
|
||||
$switch-thumb-padding: 2px !default;
|
||||
|
|
|
|||
|
|
@ -173,6 +173,208 @@ select {
|
|||
}
|
||||
}
|
||||
|
||||
$author-image-width: 70px;
|
||||
$author-image-margin: 24px;
|
||||
$author-image-width-sm: 30px;
|
||||
$author-image-margin-sm: 8px;
|
||||
|
||||
/** Gently highlight the selected post by changing it's background to blue and then fading it out. */
|
||||
@keyframes background-highlight {
|
||||
from {
|
||||
background-color: rgba(0, 123, 255, 0.5);
|
||||
}
|
||||
to {
|
||||
background-color: inherit;
|
||||
}
|
||||
}
|
||||
|
||||
.path-mod-forum.modern-display-mode {
|
||||
.discussionsubscription {
|
||||
margin-top: 0;
|
||||
text-align: inherit;
|
||||
margin-bottom: 0;
|
||||
}
|
||||
|
||||
.preload-subscribe,
|
||||
.preload-unsubscribe {
|
||||
display: none;
|
||||
}
|
||||
|
||||
.post-message {
|
||||
line-height: 1.6;
|
||||
}
|
||||
|
||||
.indent {
|
||||
margin-left: 0;
|
||||
}
|
||||
|
||||
/** Reset the badge styling back to pill style. */
|
||||
.badge {
|
||||
font-size: inherit;
|
||||
font-weight: inherit;
|
||||
padding-left: .5rem;
|
||||
padding-right: .5rem;
|
||||
border-radius: 10rem;
|
||||
}
|
||||
|
||||
.badge-light {
|
||||
background-color: #f6f6f6;
|
||||
color: #5b5b5b;
|
||||
}
|
||||
|
||||
/** Style the ratings like a badge. */
|
||||
.rating-aggregate-container {
|
||||
background-color: #f6f6f6;
|
||||
color: #5b5b5b;
|
||||
padding: .25em .5em;
|
||||
line-height: 1;
|
||||
margin-right: .5rem;
|
||||
vertical-align: middle;
|
||||
border-radius: 10rem;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.ratinginput {
|
||||
padding: .25em 1.75rem 0.25em .75em;
|
||||
line-height: 1;
|
||||
height: auto;
|
||||
border-radius: 10rem;
|
||||
}
|
||||
|
||||
.group-image {
|
||||
width: 35px;
|
||||
height: 35px;
|
||||
margin-right: 0;
|
||||
float: none;
|
||||
display: inline-block;
|
||||
}
|
||||
|
||||
/** Don't show the discussion locked alert in this mode because it's already indicated with a badge. */
|
||||
.alert.discussionlocked {
|
||||
@extend .sr-only;
|
||||
}
|
||||
|
||||
/** Fix muted text contrast ratios for accessibility. */
|
||||
.text-muted,
|
||||
.dimmed_text {
|
||||
color: #707070 !important; /* stylelint-disable-line declaration-no-important */
|
||||
}
|
||||
|
||||
.author-header {
|
||||
font-style: italic;
|
||||
|
||||
.author-name {
|
||||
font-style: normal;
|
||||
}
|
||||
}
|
||||
|
||||
/** Make the tag list text screen reader visible only */
|
||||
.tag_list > b {
|
||||
@extend .sr-only;
|
||||
}
|
||||
|
||||
:target > .focus-target {
|
||||
animation-name: background-highlight;
|
||||
animation-duration: 1s;
|
||||
animation-timing-function: ease-in-out;
|
||||
animation-iteration-count: 1;
|
||||
}
|
||||
|
||||
.forum-post-container {
|
||||
.replies-container {
|
||||
.forum-post-container {
|
||||
border-top: 1px solid #dee2e6;
|
||||
padding-top: 1.5rem;
|
||||
|
||||
.replies-container .forum-post-container {
|
||||
border-top: none;
|
||||
padding-top: 0;
|
||||
}
|
||||
}
|
||||
|
||||
.inline-reply-container .reply-author {
|
||||
display: none;
|
||||
}
|
||||
}
|
||||
|
||||
.post-message p:last-of-type {
|
||||
margin-bottom: 0;
|
||||
}
|
||||
|
||||
.author-image-container {
|
||||
width: $author-image-width;
|
||||
margin-right: $author-image-margin;
|
||||
flex-shrink: 0;
|
||||
}
|
||||
|
||||
.inline-reply-container textarea {
|
||||
border: 0;
|
||||
resize: none;
|
||||
}
|
||||
|
||||
.indent {
|
||||
/**
|
||||
* The first post and first set of replies have a larger author image so offset the 2nd
|
||||
* set of replies by the image width + margin to ensure they align.
|
||||
*/
|
||||
.indent {
|
||||
padding-left: $author-image-width + $author-image-margin;
|
||||
|
||||
/**
|
||||
* Reduce the size of the the author image for all second level replies (and below).
|
||||
*/
|
||||
.author-image-container {
|
||||
width: $author-image-width-sm;
|
||||
margin-right: $author-image-margin-sm;
|
||||
}
|
||||
|
||||
/**
|
||||
* Adjust the indentation offset for all 3rd level replies and below for the smaller author image.
|
||||
*/
|
||||
.indent {
|
||||
padding-left: $author-image-width-sm + $author-image-margin-sm;
|
||||
|
||||
/**
|
||||
* Stop indenting the replies after the 5th reply.
|
||||
*/
|
||||
.indent .indent .indent {
|
||||
padding-left: 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/** Extra small devices (portrait phones, less than 576px). */
|
||||
@include media-breakpoint-down(sm) {
|
||||
#page-mod-forum-discuss.modern-display-mode {
|
||||
.forum-post-container {
|
||||
.author-image-container {
|
||||
width: $author-image-width-sm;
|
||||
margin-right: $author-image-margin-sm;
|
||||
}
|
||||
|
||||
.indent {
|
||||
.indent {
|
||||
padding-left: $author-image-width-sm + $author-image-margin-sm;
|
||||
|
||||
.indent .indent {
|
||||
padding-left: 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.group-image {
|
||||
width: 30px;
|
||||
height: 30px;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// End styling for mod_forum.
|
||||
|
||||
.maincalendar .calendarmonth td,
|
||||
.maincalendar .calendarmonth th {
|
||||
border: 1px dotted $table-border-color;
|
||||
|
|
|
|||
|
|
@ -184,3 +184,76 @@ body:not(.jsenabled) .langmenu:hover > .dropdown-menu,
|
|||
.active.carousel-item-left {
|
||||
transform: translateX(-100%);
|
||||
}
|
||||
|
||||
/**
|
||||
* Reset all of the forced style on the page.
|
||||
* - Remove borders on header and content.
|
||||
* - Remove most of the vertical padding.
|
||||
* - Make the content region flex grow so it pushes things like the
|
||||
* next activity selector to the bottom of the page.
|
||||
*/
|
||||
$allow-reset-style: true !default;
|
||||
|
||||
@if $allow-reset-style {
|
||||
body.reset-style {
|
||||
#page-header {
|
||||
.card {
|
||||
border: none;
|
||||
|
||||
.page-header-headings {
|
||||
h1 {
|
||||
margin-bottom: 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
& > div {
|
||||
padding-top: 0 !important; /* stylelint-disable-line declaration-no-important */
|
||||
padding-bottom: 0 !important; /* stylelint-disable-line declaration-no-important */
|
||||
}
|
||||
}
|
||||
|
||||
#page-content {
|
||||
padding-bottom: 0 !important; /* stylelint-disable-line declaration-no-important */
|
||||
|
||||
#region-main-box {
|
||||
#region-main {
|
||||
border: none;
|
||||
display: inline-flex;
|
||||
flex-direction: column;
|
||||
padding: 0;
|
||||
height: 100%;
|
||||
width: 100%;
|
||||
padding-left: $card-spacer-x;
|
||||
padding-right: $card-spacer-x;
|
||||
vertical-align: top;
|
||||
|
||||
div[role="main"] {
|
||||
flex: 1;
|
||||
}
|
||||
|
||||
.activity-navigation {
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
&.has-blocks {
|
||||
width: calc(100% - #{$blocks-plus-gutter});
|
||||
|
||||
@include media-breakpoint-down(lg) {
|
||||
width: 100%;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
[data-region="blocks-column"] {
|
||||
margin-left: auto;
|
||||
}
|
||||
|
||||
@include media-breakpoint-down(lg) {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -1 +1,4 @@
|
|||
// General variables for all presets
|
||||
|
||||
// Disable the Boost theme reset styling and fixed width content.
|
||||
$allow-reset-style: false;
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
Loading…
Add table
Add a link
Reference in a new issue