Merge branch 'dashboard-split-overview-block' of https://github.com/ryanwyllie/moodle

This commit is contained in:
Andrew Nicols 2018-09-27 14:08:55 +08:00
commit 20f9b981f9
137 changed files with 5871 additions and 2450 deletions

View file

@ -158,34 +158,6 @@ $doughnut-fill-colour: $brand-warning;
}
.block_myoverview {
.event-list-item {
.event-icon {
vertical-align: middle;
&::before {
content: '';
display: inline-block;
height: 100%;
vertical-align: middle;
}
}
.event-name-container {
vertical-align: middle;
max-width: calc(100% - 50px);
.event-name {
display: block;
}
}
}
.content-centred {
max-width: 900px;
margin-left: auto;
margin-right: auto;
}
.empty-placeholder-image-sm {
height: 50px;
}

View file

@ -2108,3 +2108,36 @@ div.editor_atto_toolbar button .icon {
width: auto;
}
.bg-pulse-grey {
animation: bg-pulse-grey 2s infinite linear;
}
@keyframes bg-pulse-grey {
0% {
background-color: $gray-100;
}
50% {
background-color: darken($gray-100, 5%);
}
100% {
background-color: $gray-100;
}
}
@each $size, $length in $spacers {
.line-height-#{$size} {
line-height: $length !important; /* stylelint-disable-line declaration-no-important */
}
}
.dir-rtl {
.dir-rtl-hide {
display: none;
}
}
.dir-ltr {
.dir-ltr-hide {
display: none;
}
}

View file

@ -8,6 +8,18 @@ $icon-height: 16px;
$icon-big-width: 64px;
$icon-big-height: 64px;
// stylelint-disable
$iconsizes: () !default;
$iconsizes: map-merge((
0: 0,
1: ($icon-width * .25),
2: ($icon-width * .5),
3: $icon-width,
4: ($icon-width * 1.5),
5: ($icon-width * 3)
), $iconsizes);
// stylelint-enable
.icon {
font-size: $icon-height;
width: $icon-width;
@ -59,11 +71,29 @@ $icon-big-height: 64px;
margin: 0;
}
.icon-no-margin {
.icon {
margin-left: 0;
margin-right: 0;
margin-top: 0;
margin-bottom: 0;
}
}
.icon-large > .icon {
width: ($icon-width * 2);
height: ($icon-height * 2);
}
@each $size, $length in $iconsizes {
.icon-size-#{$size} {
.icon {
height: $length !important; /* stylelint-disable-line declaration-no-important */
width: $length !important; /* stylelint-disable-line declaration-no-important */
}
}
}
.helplink .icon {
margin-left: 0.5rem;
}

View file

@ -97,3 +97,11 @@ body {
.userpicture {
border-radius: 50%;
}
// Reset the default styling back to the bootstrap defaults for
// the secondary outline button because gray-200 is much too light
// for an outline button.
.btn-outline-secondary {
@include button-outline-variant($gray-600);
border-color: $border-color;
}

View file

@ -10417,6 +10417,47 @@ div.editor_atto_toolbar button .icon {
.w-auto {
width: auto; }
.bg-pulse-grey {
animation: bg-pulse-grey 2s infinite linear; }
@keyframes bg-pulse-grey {
0% {
background-color: #f8f9fa; }
50% {
background-color: #e9ecef; }
100% {
background-color: #f8f9fa; } }
.line-height-0 {
line-height: 0 !important;
/* stylelint-disable-line declaration-no-important */ }
.line-height-1 {
line-height: 0.25rem !important;
/* stylelint-disable-line declaration-no-important */ }
.line-height-2 {
line-height: 0.5rem !important;
/* stylelint-disable-line declaration-no-important */ }
.line-height-3 {
line-height: 1rem !important;
/* stylelint-disable-line declaration-no-important */ }
.line-height-4 {
line-height: 1.5rem !important;
/* stylelint-disable-line declaration-no-important */ }
.line-height-5 {
line-height: 3rem !important;
/* stylelint-disable-line declaration-no-important */ }
.dir-rtl .dir-rtl-hide {
display: none; }
.dir-ltr .dir-ltr-hide {
display: none; }
.icon {
font-size: 16px;
width: 16px;
@ -10453,10 +10494,52 @@ div.editor_atto_toolbar button .icon {
.icon-no-spacing a > .icon {
margin: 0; }
.icon-no-margin .icon {
margin-left: 0;
margin-right: 0;
margin-top: 0;
margin-bottom: 0; }
.icon-large > .icon {
width: 32px;
height: 32px; }
.icon-size-0 .icon {
height: 0 !important;
/* stylelint-disable-line declaration-no-important */
width: 0 !important;
/* stylelint-disable-line declaration-no-important */ }
.icon-size-1 .icon {
height: 4px !important;
/* stylelint-disable-line declaration-no-important */
width: 4px !important;
/* stylelint-disable-line declaration-no-important */ }
.icon-size-2 .icon {
height: 8px !important;
/* stylelint-disable-line declaration-no-important */
width: 8px !important;
/* stylelint-disable-line declaration-no-important */ }
.icon-size-3 .icon {
height: 16px !important;
/* stylelint-disable-line declaration-no-important */
width: 16px !important;
/* stylelint-disable-line declaration-no-important */ }
.icon-size-4 .icon {
height: 24px !important;
/* stylelint-disable-line declaration-no-important */
width: 24px !important;
/* stylelint-disable-line declaration-no-important */ }
.icon-size-5 .icon {
height: 48px !important;
/* stylelint-disable-line declaration-no-important */
width: 48px !important;
/* stylelint-disable-line declaration-no-important */ }
.helplink .icon {
margin-left: 0.5rem; }
@ -11297,25 +11380,6 @@ div.editor_atto_toolbar button .icon {
width: 45px;
font-size: 45px; }
.block_myoverview .event-list-item .event-icon {
vertical-align: middle; }
.block_myoverview .event-list-item .event-icon::before {
content: '';
display: inline-block;
height: 100%;
vertical-align: middle; }
.block_myoverview .event-list-item .event-name-container {
vertical-align: middle;
max-width: calc(100% - 50px); }
.block_myoverview .event-list-item .event-name-container .event-name {
display: block; }
.block_myoverview .content-centred {
max-width: 900px;
margin-left: auto;
margin-right: auto; }
.block_myoverview .empty-placeholder-image-sm {
height: 50px; }
@ -17008,3 +17072,27 @@ body {
.userpicture {
border-radius: 50%; }
.btn-outline-secondary {
color: #868e96;
background-color: transparent;
background-image: none;
border-color: #868e96;
border-color: #dee2e6; }
.btn-outline-secondary:hover {
color: #fff;
background-color: #868e96;
border-color: #868e96; }
.btn-outline-secondary:focus, .btn-outline-secondary.focus {
box-shadow: 0 0 0 0.2rem rgba(134, 142, 150, 0.5); }
.btn-outline-secondary.disabled, .btn-outline-secondary:disabled {
color: #868e96;
background-color: transparent; }
.btn-outline-secondary:not(:disabled):not(.disabled):active, .btn-outline-secondary:not(:disabled):not(.disabled).active,
.show > .btn-outline-secondary.dropdown-toggle {
color: #fff;
background-color: #868e96;
border-color: #868e96; }
.btn-outline-secondary:not(:disabled):not(.disabled):active:focus, .btn-outline-secondary:not(:disabled):not(.disabled).active:focus,
.show > .btn-outline-secondary.dropdown-toggle:focus {
box-shadow: 0 0 0 0.2rem rgba(134, 142, 150, 0.5); }