Merge branch 'MDL-68899-master' of git://github.com/mihailges/moodle

This commit is contained in:
Andrew Nicols
2020-06-08 10:29:02 +08:00
2 changed files with 66 additions and 11 deletions
+38 -6
View File
@@ -10,6 +10,7 @@
.region-main {
flex: 0 0 100%;
padding: 0 1rem;
max-width: 100%;
}
&.blocks-pre {
@@ -140,12 +141,43 @@
}
@include media-breakpoint-up(sm) {
.block_myoverview,
.block_recentlyaccesseditems {
.dashboard-card-deck {
.dashboard-card {
width: calc(33.33% - #{$card-gutter});
}
.dashboard-card-deck .dashboard-card {
width: calc(50% - #{$card-gutter});
}
}
@include media-breakpoint-up(md) {
.dashboard-card-deck .dashboard-card {
width: calc(50% - #{$card-gutter});
}
.blocks-post,
.blocks-pre {
.dashboard-card-deck .dashboard-card {
width: calc(100% - #{$card-gutter});
}
}
}
@include media-breakpoint-up(lg) {
.dashboard-card-deck .dashboard-card {
width: calc(33.33% - #{$card-gutter});
}
.blocks-post,
.blocks-pre {
.dashboard-card-deck .dashboard-card {
width: calc(50% - #{$card-gutter});
}
}
}
@include media-breakpoint-up(xl) {
.dashboard-card-deck .dashboard-card {
width: calc(25% - #{$card-gutter});
}
.blocks-post,
.blocks-pre {
.dashboard-card-deck .dashboard-card {
width: calc(33.33% - #{$card-gutter});
}
}
}
+28 -5
View File
@@ -19430,7 +19430,8 @@ body {
display: flex; }
#page-content .region-main {
flex: 0 0 100%;
padding: 0 1rem; }
padding: 0 1rem;
max-width: 100%; }
#page-content.blocks-pre .columnleft {
flex: 0 0 32%;
order: -1;
@@ -19490,7 +19491,8 @@ body {
display: flex; }
#page-content .region-main {
flex: 0 0 100%;
padding: 0 1rem; }
padding: 0 1rem;
max-width: 100%; }
#page-content.blocks-pre .columnleft {
flex: 0 0 25%;
order: -1;
@@ -19550,7 +19552,8 @@ body {
display: flex; }
#page-content .region-main {
flex: 0 0 100%;
padding: 0 1rem; }
padding: 0 1rem;
max-width: 100%; }
#page-content.blocks-pre .columnleft {
flex: 0 0 20%;
order: -1;
@@ -19615,8 +19618,28 @@ body {
/* stylelint-disable-line declaration-no-important */ } }
@media (min-width: 576px) {
.block_myoverview .dashboard-card-deck .dashboard-card,
.block_recentlyaccesseditems .dashboard-card-deck .dashboard-card {
.dashboard-card-deck .dashboard-card {
width: calc(50% - 0.5rem); } }
@media (min-width: 768px) {
.dashboard-card-deck .dashboard-card {
width: calc(50% - 0.5rem); }
.blocks-post .dashboard-card-deck .dashboard-card,
.blocks-pre .dashboard-card-deck .dashboard-card {
width: calc(100% - 0.5rem); } }
@media (min-width: 992px) {
.dashboard-card-deck .dashboard-card {
width: calc(33.33% - 0.5rem); }
.blocks-post .dashboard-card-deck .dashboard-card,
.blocks-pre .dashboard-card-deck .dashboard-card {
width: calc(50% - 0.5rem); } }
@media (min-width: 1200px) {
.dashboard-card-deck .dashboard-card {
width: calc(25% - 0.5rem); }
.blocks-post .dashboard-card-deck .dashboard-card,
.blocks-pre .dashboard-card-deck .dashboard-card {
width: calc(33.33% - 0.5rem); } }
@media (min-width: 768px) {