Skip to content

Commit

Permalink
Merge branch 'MDL-63675-master' of git://github.com/bmbrands/moodle
Browse files Browse the repository at this point in the history
  • Loading branch information
David Monllao committed Nov 7, 2018
2 parents d403571 + 4f42ca1 commit b6816ed
Show file tree
Hide file tree
Showing 4 changed files with 35 additions and 29 deletions.
22 changes: 12 additions & 10 deletions theme/boost/scss/moodle/blocks.scss
View file
Expand Up @@ -131,8 +131,10 @@ $card-gutter : $card-deck-margin * 2;

.dashboard-card-deck .dashboard-card {
margin-bottom: $card-gutter;
flex-basis: 100%;
flex-basis: auto;
width: 100%;
flex-grow: 0;
flex-shrink: 0;
.dashboard-card-img {
height: 7rem;
background-position: center;
Expand All @@ -146,22 +148,22 @@ $card-gutter : $card-deck-margin * 2;
.dashboard-card-deck {
@include media-breakpoint-up(sm) {
.dashboard-card {
flex-basis: calc(50% - #{$card-gutter});
width: calc(50% - #{$card-gutter});
}
}
@include media-breakpoint-up(md) {
.dashboard-card {
flex-basis: calc(33.33% - #{$card-gutter});
width: calc(33.33% - #{$card-gutter});
}
}
@include media-breakpoint-up(lg) {
.dashboard-card {
flex-basis: calc(25% - #{$card-gutter});
width: calc(25% - #{$card-gutter});
}
}
@include media-breakpoint-up(xl) {
.dashboard-card {
flex-basis: calc(20% - #{$card-gutter});
width: calc(20% - #{$card-gutter});
}
}
}
Expand All @@ -170,12 +172,12 @@ $card-gutter : $card-deck-margin * 2;
.dashboard-card-deck {
@include media-breakpoint-up(lg) {
.dashboard-card {
flex-basis: calc(33.33% - #{$card-gutter});
width: calc(33.33% - #{$card-gutter});
}
}
@include media-breakpoint-up(xl) {
.dashboard-card {
flex-basis: calc(25% - #{$card-gutter});
width: calc(25% - #{$card-gutter});
}
}
}
Expand All @@ -185,12 +187,12 @@ body.drawer-open-left #region-main.has-blocks {
.dashboard-card-deck {
@include media-breakpoint-up(lg) {
.dashboard-card {
flex-basis: calc(33.33% - #{$card-gutter});
width: calc(33.33% - #{$card-gutter});
}
}
@media (min-width: 1400px) {
.dashboard-card {
flex-basis: calc(25% - #{$card-gutter});
width: calc(25% - #{$card-gutter});
}
}
}
Expand All @@ -201,7 +203,7 @@ body.drawer-open-left #region-main.has-blocks {
.dashboard-card-deck {
margin: 0;
.dashboard-card {
flex-basis: 100% !important;
width: 100% !important;
margin-left: 0;
margin-right: 0;
}
Expand Down
24 changes: 13 additions & 11 deletions theme/boost/style/moodle.css
View file
Expand Up @@ -11259,8 +11259,10 @@ div.editor_atto_toolbar button .icon {

.dashboard-card-deck .dashboard-card {
margin-bottom: 0.5rem;
flex-basis: 100%;
flex-grow: 0; }
flex-basis: auto;
width: 100%;
flex-grow: 0;
flex-shrink: 0; }
.dashboard-card-deck .dashboard-card .dashboard-card-img {
height: 7rem;
background-position: center;
Expand All @@ -11270,41 +11272,41 @@ div.editor_atto_toolbar button .icon {

@media (min-width: 576px) {
.dashboard-card-deck .dashboard-card {
flex-basis: calc(50% - 0.5rem); } }
width: calc(50% - 0.5rem); } }

@media (min-width: 768px) {
.dashboard-card-deck .dashboard-card {
flex-basis: calc(33.33% - 0.5rem); } }
width: calc(33.33% - 0.5rem); } }

@media (min-width: 992px) {
.dashboard-card-deck .dashboard-card {
flex-basis: calc(25% - 0.5rem); } }
width: calc(25% - 0.5rem); } }

@media (min-width: 1200px) {
.dashboard-card-deck .dashboard-card {
flex-basis: calc(20% - 0.5rem); } }
width: calc(20% - 0.5rem); } }

@media (min-width: 992px) {
#region-main.has-blocks .dashboard-card-deck .dashboard-card {
flex-basis: calc(33.33% - 0.5rem); } }
width: calc(33.33% - 0.5rem); } }

@media (min-width: 1200px) {
#region-main.has-blocks .dashboard-card-deck .dashboard-card {
flex-basis: calc(25% - 0.5rem); } }
width: calc(25% - 0.5rem); } }

@media (min-width: 992px) {
body.drawer-open-left #region-main.has-blocks .dashboard-card-deck .dashboard-card {
flex-basis: calc(33.33% - 0.5rem); } }
width: calc(33.33% - 0.5rem); } }

@media (min-width: 1400px) {
body.drawer-open-left #region-main.has-blocks .dashboard-card-deck .dashboard-card {
flex-basis: calc(25% - 0.5rem); } }
width: calc(25% - 0.5rem); } }

@media (min-width: 1200px) {
#block-region-side-pre .dashboard-card-deck {
margin: 0; }
#block-region-side-pre .dashboard-card-deck .dashboard-card {
flex-basis: 100% !important;
width: 100% !important;
margin-left: 0;
margin-right: 0; } }

Expand Down
9 changes: 5 additions & 4 deletions theme/bootstrapbase/less/moodle/blocks.less
View file
Expand Up @@ -442,21 +442,22 @@
flex-grow: 0;
flex-shrink: 0;
min-width: 0;
flex-basis: 100%;
width: 100%;
flex-basis: auto;
}
@media (min-width: 576px) {
.dashboard-card {
display: flex;
flex-direction: column;
margin-right: 0.25rem;
margin-left: 0.25rem;
flex-basis: ~"calc(50% - 0.6rem)";
width: ~"calc(50% - 0.5rem)";
}
}

@media (min-width: 1200px) {
.dashboard-card {
flex-basis: ~"calc(33.333% - 0.5rem)";
width: ~"calc(33.333% - 0.5rem)";
}
}
}
Expand All @@ -467,7 +468,7 @@
margin: 0;
height: unset;
.dashboard-card {
flex-basis: 100%;
width: 100%;
margin-left: 0;
margin-right: 0;
}
Expand Down
9 changes: 5 additions & 4 deletions theme/bootstrapbase/style/moodle.css
View file
Expand Up @@ -16673,20 +16673,21 @@ body {
flex-grow: 0;
flex-shrink: 0;
min-width: 0;
flex-basis: 100%;
width: 100%;
flex-basis: auto;
}
@media (min-width: 576px) {
.dashboard-card-deck .dashboard-card {
display: flex;
flex-direction: column;
margin-right: 0.25rem;
margin-left: 0.25rem;
flex-basis: calc(50% - 0.6rem);
width: calc(50% - 0.5rem);
}
}
@media (min-width: 1200px) {
.dashboard-card-deck .dashboard-card {
flex-basis: calc(33.333% - 0.5rem);
width: calc(33.333% - 0.5rem);
}
}
@media (min-width: 768px) {
Expand All @@ -16697,7 +16698,7 @@ body {
}
#block-region-side-post .dashboard-card-deck .dashboard-card,
#block-region-side-pre .dashboard-card-deck .dashboard-card {
flex-basis: 100%;
width: 100%;
margin-left: 0;
margin-right: 0;
}
Expand Down

0 comments on commit b6816ed

Please sign in to comment.