diff --git a/theme/boost/scss/moodle/blocks.scss b/theme/boost/scss/moodle/blocks.scss index dcbdfe4a7ad..b603dd261a1 100644 --- a/theme/boost/scss/moodle/blocks.scss +++ b/theme/boost/scss/moodle/blocks.scss @@ -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; @@ -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}); } } } @@ -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}); } } } @@ -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}); } } } @@ -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; } diff --git a/theme/boost/style/moodle.css b/theme/boost/style/moodle.css index 46703787944..68934ab02e4 100644 --- a/theme/boost/style/moodle.css +++ b/theme/boost/style/moodle.css @@ -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; @@ -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; } } diff --git a/theme/bootstrapbase/less/moodle/blocks.less b/theme/bootstrapbase/less/moodle/blocks.less index 7edeaa71241..fcf8d928605 100644 --- a/theme/bootstrapbase/less/moodle/blocks.less +++ b/theme/bootstrapbase/less/moodle/blocks.less @@ -442,7 +442,8 @@ flex-grow: 0; flex-shrink: 0; min-width: 0; - flex-basis: 100%; + width: 100%; + flex-basis: auto; } @media (min-width: 576px) { .dashboard-card { @@ -450,13 +451,13 @@ 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)"; } } } @@ -467,7 +468,7 @@ margin: 0; height: unset; .dashboard-card { - flex-basis: 100%; + width: 100%; margin-left: 0; margin-right: 0; } diff --git a/theme/bootstrapbase/style/moodle.css b/theme/bootstrapbase/style/moodle.css index 230c0b0bcf3..b31fdb8470b 100644 --- a/theme/bootstrapbase/style/moodle.css +++ b/theme/bootstrapbase/style/moodle.css @@ -16673,7 +16673,8 @@ 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 { @@ -16681,12 +16682,12 @@ body { 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) { @@ -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; }