Merge branch 'MDL-63372-35' of https://github.com/lucaboesch/moodle i…

…nto MOODLE_35_STABLE
moodle · Feb 6, 2019 · fb14b2a · fb14b2a
2 parents cf775cb + 88e90e3
commit fb14b2a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/theme/boost/scss/moodle/blocks.scss b/theme/boost/scss/moodle/blocks.scss
@@ -199,7 +199,7 @@ $doughnut-fill-colour: $brand-warning;
     }
 }
 
-.card-deck {
+.block_myoverview .card-deck {
     .card {
         $card-gutter : $card-deck-margin * 2;
         flex-grow: 0;

diff --git a/theme/boost/style/moodle.css b/theme/boost/style/moodle.css
@@ -11310,14 +11310,14 @@ div.editor_atto_toolbar button .icon {
 .block_myoverview .empty-placeholder-image-lg {
   height: 125px; }
 
-.card-deck .card, .card-deck #page-enrol-users #filterform, #page-enrol-users .card-deck #filterform, .card-deck .que .history, .que .card-deck .history, .card-deck .userprofile .profile_tree section, .userprofile .profile_tree .card-deck section, .card-deck .groupinfobox, .card-deck .well {
+.block_myoverview .card-deck .card, .block_myoverview .card-deck #page-enrol-users #filterform, #page-enrol-users .block_myoverview .card-deck #filterform, .block_myoverview .card-deck .que .history, .que .block_myoverview .card-deck .history, .block_myoverview .card-deck .userprofile .profile_tree section, .userprofile .profile_tree .block_myoverview .card-deck section, .block_myoverview .card-deck .groupinfobox, .block_myoverview .card-deck .well {
   flex-grow: 0;
   flex-shrink: 0;
   flex-basis: calc(50% - 30px); }
 
-.card-deck .myoverviewimg {
+.block_myoverview .card-deck .myoverviewimg {
   height: 150px; }
-  .card-deck .myoverviewimg.courseimage {
+  .block_myoverview .card-deck .myoverviewimg.courseimage {
     background-position: center;
     background-size: cover; }