From 2b311e768930932e789102f5ff942f61d81b5f57 Mon Sep 17 00:00:00 2001 From: Bas Brands Date: Mon, 5 Nov 2018 15:17:35 +0100 Subject: [PATCH 01/10] MDL-63830 block_myoverview: progressbar styles boost using bg-white and border allow collapsing of list view content removed obsolete styles for old progress circles bootstrapbase --- .../templates/progress-bar.mustache | 2 +- .../myoverview/templates/view-list.mustache | 6 +- theme/bootstrapbase/less/moodle/blocks.less | 90 ----- theme/bootstrapbase/style/moodle.css | 365 ------------------ 4 files changed, 4 insertions(+), 459 deletions(-) diff --git a/blocks/myoverview/templates/progress-bar.mustache b/blocks/myoverview/templates/progress-bar.mustache index 971e75ba5b6..9bb0a5732f4 100644 --- a/blocks/myoverview/templates/progress-bar.mustache +++ b/blocks/myoverview/templates/progress-bar.mustache @@ -25,7 +25,7 @@ } }} -
+
diff --git a/blocks/myoverview/templates/view-list.mustache b/blocks/myoverview/templates/view-list.mustache index 617ba20188b..05e1c529295 100644 --- a/blocks/myoverview/templates/view-list.mustache +++ b/blocks/myoverview/templates/view-list.mustache @@ -40,7 +40,7 @@ data-region="course-content" data-course-id="{{{id}}}">
-
+
{{> core_course/favouriteicon }} @@ -50,11 +50,11 @@
{{#hasprogress}} -
+
{{> block_myoverview/progress-bar}}
{{/hasprogress}} -
+
{{> block_myoverview/course-action-menu }}
diff --git a/theme/bootstrapbase/less/moodle/blocks.less b/theme/bootstrapbase/less/moodle/blocks.less index 7edeaa71241..ee83c57351d 100644 --- a/theme/bootstrapbase/less/moodle/blocks.less +++ b/theme/bootstrapbase/less/moodle/blocks.less @@ -250,96 +250,6 @@ } } -@chart-size: 70px; -@doughnut-border-size: 15px; -@doughnut-dasharray: 173; -@doughnut-empty-colour: @grayLighter; -@doughnut-fill-colour: @orange; - -.generate-percents(@i: 1) when (@i =< 100) { - &.percent-@{i} { - stroke-dashoffset: @doughnut-dasharray - (@i / 100 * @doughnut-dasharray); - } - - .generate-percents((@i + 1)); -} - -.progress-chart-container { - height: @chart-size; - width: @chart-size; - - .progress-doughnut { - position: relative; - height: @chart-size; - width: @chart-size; - background-clip: padding-box; - border: @doughnut-border-size solid @doughnut-empty-colour; - border-radius: 50%; - box-sizing: border-box; - - .progress-text { - position: absolute; - top: 50%; - /*rtl:ignore*/ - left: 50%; - transform: translate(-50%, -50%); - color: @doughnut-empty-colour; - - &.has-percent { - color: @doughnut-fill-colour; - } - } - - .progress-indicator { - position: absolute; - top: (@doughnut-border-size * -1); - left: (@doughnut-border-size * -1); - height: @chart-size; - width: @chart-size; - - svg { - position: relative; - height: 100%; - width: 100%; - - .circle { - stroke-width: @doughnut-border-size; - stroke: @doughnut-fill-colour; - fill: none; - stroke-dasharray: @doughnut-dasharray; - stroke-dashoffset: @doughnut-dasharray; - transform: rotate(-90deg); - transform-origin: center center; - - .generate-percents(); - } - } - } - } - - .no-progress { - height: @chart-size; - width: @chart-size; - background-color: @doughnut-empty-colour; - border-radius: 50%; - position: relative; - - .icon, - .smallicon { - position: absolute; - top: 50%; - /*rtl:ignore*/ - left: 50%; - margin: 0; - padding: 0; - transform: translate(-45%, -45%); - color: #fff; - height: (@chart-size / 2); - width: (@chart-size / 2); - } - } -} - .block_starredcourses, .block_recentlyaccesseditems, .block_recentlyaccessedcourses, diff --git a/theme/bootstrapbase/style/moodle.css b/theme/bootstrapbase/style/moodle.css index 230c0b0bcf3..702a3bbd0f2 100644 --- a/theme/bootstrapbase/style/moodle.css +++ b/theme/bootstrapbase/style/moodle.css @@ -16181,371 +16181,6 @@ body { display: block; width: 100%; } -.progress-chart-container { - height: 70px; - width: 70px; -} -.progress-chart-container .progress-doughnut { - position: relative; - height: 70px; - width: 70px; - background-clip: padding-box; - border: 15px solid #eee; - border-radius: 50%; - box-sizing: border-box; -} -.progress-chart-container .progress-doughnut .progress-text { - position: absolute; - top: 50%; - /*rtl:ignore*/ - left: 50%; - transform: translate(-50%, -50%); - color: #eee; -} -.progress-chart-container .progress-doughnut .progress-text.has-percent { - color: #f89406; -} -.progress-chart-container .progress-doughnut .progress-indicator { - position: absolute; - top: -15px; - left: -15px; - height: 70px; - width: 70px; -} -.progress-chart-container .progress-doughnut .progress-indicator svg { - position: relative; - height: 100%; - width: 100%; -} -.progress-chart-container .progress-doughnut .progress-indicator svg .circle { - stroke-width: 15px; - stroke: #f89406; - fill: none; - stroke-dasharray: 173; - stroke-dashoffset: 173; - transform: rotate(-90deg); - transform-origin: center center; -} -.progress-chart-container .progress-doughnut .progress-indicator svg .circle.percent-1 { - stroke-dashoffset: 171.27; -} -.progress-chart-container .progress-doughnut .progress-indicator svg .circle.percent-2 { - stroke-dashoffset: 169.54; -} -.progress-chart-container .progress-doughnut .progress-indicator svg .circle.percent-3 { - stroke-dashoffset: 167.81; -} -.progress-chart-container .progress-doughnut .progress-indicator svg .circle.percent-4 { - stroke-dashoffset: 166.08; -} -.progress-chart-container .progress-doughnut .progress-indicator svg .circle.percent-5 { - stroke-dashoffset: 164.35; -} -.progress-chart-container .progress-doughnut .progress-indicator svg .circle.percent-6 { - stroke-dashoffset: 162.62; -} -.progress-chart-container .progress-doughnut .progress-indicator svg .circle.percent-7 { - stroke-dashoffset: 160.89; -} -.progress-chart-container .progress-doughnut .progress-indicator svg .circle.percent-8 { - stroke-dashoffset: 159.16; -} -.progress-chart-container .progress-doughnut .progress-indicator svg .circle.percent-9 { - stroke-dashoffset: 157.43; -} -.progress-chart-container .progress-doughnut .progress-indicator svg .circle.percent-10 { - stroke-dashoffset: 155.7; -} -.progress-chart-container .progress-doughnut .progress-indicator svg .circle.percent-11 { - stroke-dashoffset: 153.97; -} -.progress-chart-container .progress-doughnut .progress-indicator svg .circle.percent-12 { - stroke-dashoffset: 152.24; -} -.progress-chart-container .progress-doughnut .progress-indicator svg .circle.percent-13 { - stroke-dashoffset: 150.51; -} -.progress-chart-container .progress-doughnut .progress-indicator svg .circle.percent-14 { - stroke-dashoffset: 148.78; -} -.progress-chart-container .progress-doughnut .progress-indicator svg .circle.percent-15 { - stroke-dashoffset: 147.05; -} -.progress-chart-container .progress-doughnut .progress-indicator svg .circle.percent-16 { - stroke-dashoffset: 145.32; -} -.progress-chart-container .progress-doughnut .progress-indicator svg .circle.percent-17 { - stroke-dashoffset: 143.59; -} -.progress-chart-container .progress-doughnut .progress-indicator svg .circle.percent-18 { - stroke-dashoffset: 141.86; -} -.progress-chart-container .progress-doughnut .progress-indicator svg .circle.percent-19 { - stroke-dashoffset: 140.13; -} -.progress-chart-container .progress-doughnut .progress-indicator svg .circle.percent-20 { - stroke-dashoffset: 138.4; -} -.progress-chart-container .progress-doughnut .progress-indicator svg .circle.percent-21 { - stroke-dashoffset: 136.67; -} -.progress-chart-container .progress-doughnut .progress-indicator svg .circle.percent-22 { - stroke-dashoffset: 134.94; -} -.progress-chart-container .progress-doughnut .progress-indicator svg .circle.percent-23 { - stroke-dashoffset: 133.21; -} -.progress-chart-container .progress-doughnut .progress-indicator svg .circle.percent-24 { - stroke-dashoffset: 131.48; -} -.progress-chart-container .progress-doughnut .progress-indicator svg .circle.percent-25 { - stroke-dashoffset: 129.75; -} -.progress-chart-container .progress-doughnut .progress-indicator svg .circle.percent-26 { - stroke-dashoffset: 128.02; -} -.progress-chart-container .progress-doughnut .progress-indicator svg .circle.percent-27 { - stroke-dashoffset: 126.29; -} -.progress-chart-container .progress-doughnut .progress-indicator svg .circle.percent-28 { - stroke-dashoffset: 124.56; -} -.progress-chart-container .progress-doughnut .progress-indicator svg .circle.percent-29 { - stroke-dashoffset: 122.83; -} -.progress-chart-container .progress-doughnut .progress-indicator svg .circle.percent-30 { - stroke-dashoffset: 121.1; -} -.progress-chart-container .progress-doughnut .progress-indicator svg .circle.percent-31 { - stroke-dashoffset: 119.37; -} -.progress-chart-container .progress-doughnut .progress-indicator svg .circle.percent-32 { - stroke-dashoffset: 117.64; -} -.progress-chart-container .progress-doughnut .progress-indicator svg .circle.percent-33 { - stroke-dashoffset: 115.91; -} -.progress-chart-container .progress-doughnut .progress-indicator svg .circle.percent-34 { - stroke-dashoffset: 114.18; -} -.progress-chart-container .progress-doughnut .progress-indicator svg .circle.percent-35 { - stroke-dashoffset: 112.45; -} -.progress-chart-container .progress-doughnut .progress-indicator svg .circle.percent-36 { - stroke-dashoffset: 110.72; -} -.progress-chart-container .progress-doughnut .progress-indicator svg .circle.percent-37 { - stroke-dashoffset: 108.99; -} -.progress-chart-container .progress-doughnut .progress-indicator svg .circle.percent-38 { - stroke-dashoffset: 107.26; -} -.progress-chart-container .progress-doughnut .progress-indicator svg .circle.percent-39 { - stroke-dashoffset: 105.53; -} -.progress-chart-container .progress-doughnut .progress-indicator svg .circle.percent-40 { - stroke-dashoffset: 103.8; -} -.progress-chart-container .progress-doughnut .progress-indicator svg .circle.percent-41 { - stroke-dashoffset: 102.07; -} -.progress-chart-container .progress-doughnut .progress-indicator svg .circle.percent-42 { - stroke-dashoffset: 100.34; -} -.progress-chart-container .progress-doughnut .progress-indicator svg .circle.percent-43 { - stroke-dashoffset: 98.61; -} -.progress-chart-container .progress-doughnut .progress-indicator svg .circle.percent-44 { - stroke-dashoffset: 96.88; -} -.progress-chart-container .progress-doughnut .progress-indicator svg .circle.percent-45 { - stroke-dashoffset: 95.15; -} -.progress-chart-container .progress-doughnut .progress-indicator svg .circle.percent-46 { - stroke-dashoffset: 93.42; -} -.progress-chart-container .progress-doughnut .progress-indicator svg .circle.percent-47 { - stroke-dashoffset: 91.69; -} -.progress-chart-container .progress-doughnut .progress-indicator svg .circle.percent-48 { - stroke-dashoffset: 89.96; -} -.progress-chart-container .progress-doughnut .progress-indicator svg .circle.percent-49 { - stroke-dashoffset: 88.23; -} -.progress-chart-container .progress-doughnut .progress-indicator svg .circle.percent-50 { - stroke-dashoffset: 86.5; -} -.progress-chart-container .progress-doughnut .progress-indicator svg .circle.percent-51 { - stroke-dashoffset: 84.77; -} -.progress-chart-container .progress-doughnut .progress-indicator svg .circle.percent-52 { - stroke-dashoffset: 83.04; -} -.progress-chart-container .progress-doughnut .progress-indicator svg .circle.percent-53 { - stroke-dashoffset: 81.31; -} -.progress-chart-container .progress-doughnut .progress-indicator svg .circle.percent-54 { - stroke-dashoffset: 79.58; -} -.progress-chart-container .progress-doughnut .progress-indicator svg .circle.percent-55 { - stroke-dashoffset: 77.85; -} -.progress-chart-container .progress-doughnut .progress-indicator svg .circle.percent-56 { - stroke-dashoffset: 76.12; -} -.progress-chart-container .progress-doughnut .progress-indicator svg .circle.percent-57 { - stroke-dashoffset: 74.39; -} -.progress-chart-container .progress-doughnut .progress-indicator svg .circle.percent-58 { - stroke-dashoffset: 72.66; -} -.progress-chart-container .progress-doughnut .progress-indicator svg .circle.percent-59 { - stroke-dashoffset: 70.93; -} -.progress-chart-container .progress-doughnut .progress-indicator svg .circle.percent-60 { - stroke-dashoffset: 69.2; -} -.progress-chart-container .progress-doughnut .progress-indicator svg .circle.percent-61 { - stroke-dashoffset: 67.47; -} -.progress-chart-container .progress-doughnut .progress-indicator svg .circle.percent-62 { - stroke-dashoffset: 65.74; -} -.progress-chart-container .progress-doughnut .progress-indicator svg .circle.percent-63 { - stroke-dashoffset: 64.01; -} -.progress-chart-container .progress-doughnut .progress-indicator svg .circle.percent-64 { - stroke-dashoffset: 62.28; -} -.progress-chart-container .progress-doughnut .progress-indicator svg .circle.percent-65 { - stroke-dashoffset: 60.55; -} -.progress-chart-container .progress-doughnut .progress-indicator svg .circle.percent-66 { - stroke-dashoffset: 58.82; -} -.progress-chart-container .progress-doughnut .progress-indicator svg .circle.percent-67 { - stroke-dashoffset: 57.09; -} -.progress-chart-container .progress-doughnut .progress-indicator svg .circle.percent-68 { - stroke-dashoffset: 55.36; -} -.progress-chart-container .progress-doughnut .progress-indicator svg .circle.percent-69 { - stroke-dashoffset: 53.63; -} -.progress-chart-container .progress-doughnut .progress-indicator svg .circle.percent-70 { - stroke-dashoffset: 51.9; -} -.progress-chart-container .progress-doughnut .progress-indicator svg .circle.percent-71 { - stroke-dashoffset: 50.17; -} -.progress-chart-container .progress-doughnut .progress-indicator svg .circle.percent-72 { - stroke-dashoffset: 48.44; -} -.progress-chart-container .progress-doughnut .progress-indicator svg .circle.percent-73 { - stroke-dashoffset: 46.71; -} -.progress-chart-container .progress-doughnut .progress-indicator svg .circle.percent-74 { - stroke-dashoffset: 44.98; -} -.progress-chart-container .progress-doughnut .progress-indicator svg .circle.percent-75 { - stroke-dashoffset: 43.25; -} -.progress-chart-container .progress-doughnut .progress-indicator svg .circle.percent-76 { - stroke-dashoffset: 41.52; -} -.progress-chart-container .progress-doughnut .progress-indicator svg .circle.percent-77 { - stroke-dashoffset: 39.79; -} -.progress-chart-container .progress-doughnut .progress-indicator svg .circle.percent-78 { - stroke-dashoffset: 38.06; -} -.progress-chart-container .progress-doughnut .progress-indicator svg .circle.percent-79 { - stroke-dashoffset: 36.33; -} -.progress-chart-container .progress-doughnut .progress-indicator svg .circle.percent-80 { - stroke-dashoffset: 34.6; -} -.progress-chart-container .progress-doughnut .progress-indicator svg .circle.percent-81 { - stroke-dashoffset: 32.87; -} -.progress-chart-container .progress-doughnut .progress-indicator svg .circle.percent-82 { - stroke-dashoffset: 31.14; -} -.progress-chart-container .progress-doughnut .progress-indicator svg .circle.percent-83 { - stroke-dashoffset: 29.41; -} -.progress-chart-container .progress-doughnut .progress-indicator svg .circle.percent-84 { - stroke-dashoffset: 27.68; -} -.progress-chart-container .progress-doughnut .progress-indicator svg .circle.percent-85 { - stroke-dashoffset: 25.95; -} -.progress-chart-container .progress-doughnut .progress-indicator svg .circle.percent-86 { - stroke-dashoffset: 24.22; -} -.progress-chart-container .progress-doughnut .progress-indicator svg .circle.percent-87 { - stroke-dashoffset: 22.49; -} -.progress-chart-container .progress-doughnut .progress-indicator svg .circle.percent-88 { - stroke-dashoffset: 20.76; -} -.progress-chart-container .progress-doughnut .progress-indicator svg .circle.percent-89 { - stroke-dashoffset: 19.03; -} -.progress-chart-container .progress-doughnut .progress-indicator svg .circle.percent-90 { - stroke-dashoffset: 17.3; -} -.progress-chart-container .progress-doughnut .progress-indicator svg .circle.percent-91 { - stroke-dashoffset: 15.57; -} -.progress-chart-container .progress-doughnut .progress-indicator svg .circle.percent-92 { - stroke-dashoffset: 13.84; -} -.progress-chart-container .progress-doughnut .progress-indicator svg .circle.percent-93 { - stroke-dashoffset: 12.11; -} -.progress-chart-container .progress-doughnut .progress-indicator svg .circle.percent-94 { - stroke-dashoffset: 10.38; -} -.progress-chart-container .progress-doughnut .progress-indicator svg .circle.percent-95 { - stroke-dashoffset: 8.65; -} -.progress-chart-container .progress-doughnut .progress-indicator svg .circle.percent-96 { - stroke-dashoffset: 6.92; -} -.progress-chart-container .progress-doughnut .progress-indicator svg .circle.percent-97 { - stroke-dashoffset: 5.19; -} -.progress-chart-container .progress-doughnut .progress-indicator svg .circle.percent-98 { - stroke-dashoffset: 3.46; -} -.progress-chart-container .progress-doughnut .progress-indicator svg .circle.percent-99 { - stroke-dashoffset: 1.73; -} -.progress-chart-container .progress-doughnut .progress-indicator svg .circle.percent-100 { - stroke-dashoffset: 0; -} -.progress-chart-container .no-progress { - height: 70px; - width: 70px; - background-color: #eee; - border-radius: 50%; - position: relative; -} -.progress-chart-container .no-progress .icon, -.progress-chart-container .no-progress .smallicon { - position: absolute; - top: 50%; - /*rtl:ignore*/ - left: 50%; - margin: 0; - padding: 0; - transform: translate(-45%, -45%); - color: #fff; - height: 35px; - width: 35px; -} .block_starredcourses .empty-placeholder-image-lg, .block_recentlyaccesseditems .empty-placeholder-image-lg, .block_recentlyaccessedcourses .empty-placeholder-image-lg, From aba5b89c7af3b3ebac47b6a9252a892c48851673 Mon Sep 17 00:00:00 2001 From: Bas Brands Date: Mon, 5 Nov 2018 15:25:04 +0100 Subject: [PATCH 02/10] MDL-63830 block_myoverview: card footer styles --- blocks/myoverview/templates/view-cards.mustache | 2 +- theme/bootstrapbase/less/moodle/blocks.less | 2 -- theme/bootstrapbase/style/moodle.css | 2 -- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/blocks/myoverview/templates/view-cards.mustache b/blocks/myoverview/templates/view-cards.mustache index 74408f9560f..ba119b4fd37 100644 --- a/blocks/myoverview/templates/view-cards.mustache +++ b/blocks/myoverview/templates/view-cards.mustache @@ -57,7 +57,7 @@
{{#hasprogress}} -
+
{{> block_myoverview/progress-bar}}
{{/hasprogress}} diff --git a/theme/bootstrapbase/less/moodle/blocks.less b/theme/bootstrapbase/less/moodle/blocks.less index ee83c57351d..d1b521f9840 100644 --- a/theme/bootstrapbase/less/moodle/blocks.less +++ b/theme/bootstrapbase/less/moodle/blocks.less @@ -263,8 +263,6 @@ } .dashboard-card-footer { padding: 0.8rem; - background-color: @wellBackground; - border-top: 1px solid darken(@wellBackground, 7%); .border-bottom-radius(@baseBorderRadius); } .progress { diff --git a/theme/bootstrapbase/style/moodle.css b/theme/bootstrapbase/style/moodle.css index 702a3bbd0f2..66ed6211a79 100644 --- a/theme/bootstrapbase/style/moodle.css +++ b/theme/bootstrapbase/style/moodle.css @@ -16199,8 +16199,6 @@ body { .block_recentlyaccessedcourses .dashboard-card-footer, .block_myoverview .dashboard-card-footer { padding: 0.8rem; - background-color: #f5f5f5; - border-top: 1px solid #e3e3e3; -webkit-border-bottom-right-radius: 4px; -moz-border-radius-bottomright: 4px; border-bottom-right-radius: 4px; From 78c06a660b03ace5b988d3d46f5a01e9aff0fdc0 Mon Sep 17 00:00:00 2001 From: Bas Brands Date: Mon, 5 Nov 2018 15:44:14 +0100 Subject: [PATCH 03/10] MDL-63830 block_myoverview: star icon updates Change the star icon from being in a button and allow it to be inline using spans instead of divs. Add the option to passes css classed to the template. --- .../myoverview/templates/view-cards.mustache | 4 +-- .../myoverview/templates/view-list.mustache | 4 +-- .../templates/view-summary.mustache | 16 +++++----- .../behat/block_myoverview_favourite.feature | 3 -- .../templates/view-cards.mustache | 2 +- .../templates/view-cards.mustache | 4 +-- course/templates/favouriteicon.mustache | 29 ++++++------------ lang/en/course.php | 1 - pix/i/star.png | Bin 392 -> 390 bytes pix/i/star.svg | 4 +-- theme/boost/scss/moodle/blocks.scss | 3 ++ theme/boost/style/moodle.css | 3 ++ theme/bootstrapbase/less/moodle/blocks.less | 3 ++ theme/bootstrapbase/style/moodle.css | 4 +++ 14 files changed, 40 insertions(+), 40 deletions(-) diff --git a/blocks/myoverview/templates/view-cards.mustache b/blocks/myoverview/templates/view-cards.mustache index ba119b4fd37..ed99b6ae208 100644 --- a/blocks/myoverview/templates/view-cards.mustache +++ b/blocks/myoverview/templates/view-cards.mustache @@ -42,13 +42,13 @@
{{#str}}aria:courseimage, core_course{{/str}} - {{> core_course/favouriteicon }}
- + {{> core_course/favouriteicon }} + {{#str}}aria:coursename, core_course{{/str}} {{#shortentext}}40, {{{fullname}}} {{/shortentext}} diff --git a/blocks/myoverview/templates/view-list.mustache b/blocks/myoverview/templates/view-list.mustache index 05e1c529295..41b17a7b5de 100644 --- a/blocks/myoverview/templates/view-list.mustache +++ b/blocks/myoverview/templates/view-list.mustache @@ -40,8 +40,8 @@ data-region="course-content" data-course-id="{{{id}}}">
-
-
+
+
{{> core_course/favouriteicon }} {{#str}}aria:coursename, core_course{{/str}} diff --git a/blocks/myoverview/templates/view-summary.mustache b/blocks/myoverview/templates/view-summary.mustache index 061aac47dbe..15010b21a77 100644 --- a/blocks/myoverview/templates/view-summary.mustache +++ b/blocks/myoverview/templates/view-summary.mustache @@ -41,19 +41,19 @@ data-course-id="{{{id}}}">
-
- {{> core_course/favouriteicon }} -
{{#str}}aria:courseimage, core_course{{/str}}
-
- - {{#str}}aria:coursename, core_course{{/str}} -

{{{fullname}}}

- +
+
+ {{> core_course/favouriteicon }} + + {{#str}}aria:coursename, core_course{{/str}} +

{{{fullname}}}

+ +
{{> block_myoverview/course-action-menu }}
diff --git a/blocks/myoverview/tests/behat/block_myoverview_favourite.feature b/blocks/myoverview/tests/behat/block_myoverview_favourite.feature index 08527be51d5..40a2442cdf0 100644 --- a/blocks/myoverview/tests/behat/block_myoverview_favourite.feature +++ b/blocks/myoverview/tests/behat/block_myoverview_favourite.feature @@ -30,7 +30,6 @@ Feature: The my overview block allows users to favourite their courses And I reload the page Then "//div[@class='card dashboard-card' and contains(.,'Course 2')]//span[@data-region='is-favourite' and @aria-hidden='false']" "xpath_element" should exist And "//div[@class='card dashboard-card' and contains(.,'Course 2')]//span[@data-region='is-favourite' and @aria-hidden='true']" "xpath_element" should not exist - And "//div[@class='card dashboard-card' and contains(.,'Course 2')]//span[@data-region='not-favourite' and @aria-hidden='true']" "xpath_element" should exist And "//div[@class='card dashboard-card' and contains(.,'Course 1')]//span[@data-region='is-favourite' and @aria-hidden='true']" "xpath_element" should exist And "//div[@class='card dashboard-card' and contains(.,'Course 3')]//span[@data-region='is-favourite' and @aria-hidden='true']" "xpath_element" should exist And I log out @@ -45,7 +44,6 @@ Feature: The my overview block allows users to favourite their courses And I reload the page Then "//li[contains(concat(' ', normalize-space(@class), ' '), 'list-group-item') and contains(.,'Course 5')]//span[@data-region='is-favourite' and @aria-hidden='false']" "xpath_element" should exist And "//li[contains(concat(' ', normalize-space(@class), ' '), 'list-group-item') and contains(.,'Course 5')]//span[@data-region='is-favourite' and @aria-hidden='true']" "xpath_element" should not exist - And "//li[contains(concat(' ', normalize-space(@class), ' '), 'list-group-item') and contains(.,'Course 5')]//span[@data-region='not-favourite' and @aria-hidden='true']" "xpath_element" should exist And "//li[contains(concat(' ', normalize-space(@class), ' '), 'list-group-item') and contains(.,'Course 1')]//span[@data-region='is-favourite' and @aria-hidden='true']" "xpath_element" should exist And "//li[contains(concat(' ', normalize-space(@class), ' '), 'list-group-item') and contains(.,'Course 3')]//span[@data-region='is-favourite' and @aria-hidden='true']" "xpath_element" should exist And I log out @@ -60,7 +58,6 @@ Feature: The my overview block allows users to favourite their courses And I reload the page Then "//div[contains(concat(' ', normalize-space(@class), ' '), 'course-summaryitem') and contains(.,'Course 5')]//span[@data-region='is-favourite' and @aria-hidden='false']" "xpath_element" should exist And "//div[contains(concat(' ', normalize-space(@class), ' '), 'course-summaryitem') and contains(.,'Course 5')]//span[@data-region='is-favourite' and @aria-hidden='true']" "xpath_element" should not exist - And "//div[contains(concat(' ', normalize-space(@class), ' '), 'course-summaryitem') and contains(.,'Course 5')]//span[@data-region='not-favourite' and @aria-hidden='true']" "xpath_element" should exist And "//div[contains(concat(' ', normalize-space(@class), ' '), 'course-summaryitem') and contains(.,'Course 1')]//span[@data-region='is-favourite' and @aria-hidden='true']" "xpath_element" should exist And "//div[contains(concat(' ', normalize-space(@class), ' '), 'course-summaryitem') and contains(.,'Course 3')]//span[@data-region='is-favourite' and @aria-hidden='true']" "xpath_element" should exist And I log out diff --git a/blocks/recentlyaccessedcourses/templates/view-cards.mustache b/blocks/recentlyaccessedcourses/templates/view-cards.mustache index 57dba61e45c..9e223da6bae 100644 --- a/blocks/recentlyaccessedcourses/templates/view-cards.mustache +++ b/blocks/recentlyaccessedcourses/templates/view-cards.mustache @@ -39,11 +39,11 @@
{{#str}}aria:courseimage, core_course{{/str}} - {{>core_course/favouriteicon }}
+ {{> core_course/favouriteicon }} {{{fullname}}}
diff --git a/blocks/starredcourses/templates/view-cards.mustache b/blocks/starredcourses/templates/view-cards.mustache index 05d672a2485..bb44b0535f5 100644 --- a/blocks/starredcourses/templates/view-cards.mustache +++ b/blocks/starredcourses/templates/view-cards.mustache @@ -32,13 +32,13 @@
{{#str}}aria:courseimage, core_course{{/str}} - {{>core_course/favouriteicon }}
- + {{>core_course/favouriteicon }} + {{#str}}aria:coursename, core_course{{/str}} {{#shortentext}}40, {{{fullname}}} {{/shortentext}} diff --git a/course/templates/favouriteicon.mustache b/course/templates/favouriteicon.mustache index 3b4831666e5..8aa8e6e7d5c 100644 --- a/course/templates/favouriteicon.mustache +++ b/course/templates/favouriteicon.mustache @@ -25,25 +25,16 @@ "isfavourite": true } }} -
-
- - {{#pix}} i/star, core, {{#str}} favourite, core_course {{/str}} {{/pix}} - {{#str}} aria:favourite, core_course {{/str}} - - - {{#pix}} i/empty, core, {{#str}} notfavourite, core_course {{/str}} {{/pix}} - -
-
+ + {{#pix}} i/star, core, {{#str}} favourite, core_course {{/str}} {{/pix}} + {{#str}} aria:favourite, core_course {{/str}} + + diff --git a/lang/en/course.php b/lang/en/course.php index 511efd8cc96..bf8d76e62d0 100644 --- a/lang/en/course.php +++ b/lang/en/course.php @@ -26,7 +26,6 @@ $string['aria:courseimage'] = 'Course image:'; $string['aria:coursename'] = 'Course name:'; $string['aria:favourite'] = 'Course is starred'; $string['favourite'] = 'Starred course'; -$string['notfavourite'] = 'Not starred'; $string['privacy:perpage'] = 'The number of courses to show per page.'; $string['privacy:completionpath'] = 'Course completion'; $string['privacy:metadata:completionsummary'] = 'The course contains completion information about the user.'; diff --git a/pix/i/star.png b/pix/i/star.png index f5058acbabb864b44fa524e09be7460d650fb74b..3ba7acbbbba047ff0abddd1bc9f62e44973df948 100644 GIT binary patch delta 345 zcmV-f0jBfD<1DbAU*~8YuwgKtQPvl$ipm!CGGF z1|>7Vn-$R3JD4K73%BhEEv@>KAQ!-pWw-%S#9O>-6*@o0o4*E*dc1xZ9{vpoG;SRi zmF_M@0rH`H?Na9iQZmsSuza2Xl0XBcD)j3VpLz_D4WJGrSw9&FkHk6viDn!n+i2Nm rXQ>wIR9HJZ=F2J59PG0M{3m?_WjaxE6!8fXv@j%s5}(3C4O;0dOvp6W zf`wZN0UIr3mtd2puo6K;pFj(3)1~p+Bs0e*fi+|oEW`r?GyjbGbi3U}@BOARrmm_r zU=>)K(mn!DBJvVKcvjUb=UjgdzUhRt+fx3>cCoi8$#Fy-g3+zA%q=k?ezrsQH*o$4v2FCE}U~WX<$~fD_L$; ztxsdK0vf6NU{rhn5RvuVfFwyuKo$59kq%HBjYi9=dI-D%)n2c+koL@_AH`y^I2;a7 tRQ0UYY7J6UCrOe^;J|x7pY_H6nQ!#OZO7OhpWOfe002ovPDHLkV1iABn;ifE diff --git a/pix/i/star.svg b/pix/i/star.svg index 8b389575764..70f566da5e2 100644 --- a/pix/i/star.svg +++ b/pix/i/star.svg @@ -1,6 +1,6 @@ - + - + diff --git a/theme/boost/scss/moodle/blocks.scss b/theme/boost/scss/moodle/blocks.scss index dcbdfe4a7ad..4b54d75d9dd 100644 --- a/theme/boost/scss/moodle/blocks.scss +++ b/theme/boost/scss/moodle/blocks.scss @@ -97,6 +97,9 @@ $card-gutter : $card-deck-margin * 2; } .icon { margin-right: 0; + &.fa-star { + color: $blue; + } } a, .btn-link { diff --git a/theme/boost/style/moodle.css b/theme/boost/style/moodle.css index 46703787944..b7e764085fb 100644 --- a/theme/boost/style/moodle.css +++ b/theme/boost/style/moodle.css @@ -11164,6 +11164,9 @@ div.editor_atto_toolbar button .icon { .block_recentlyaccesseditems .icon, .block_recentlyaccessedcourses .icon { margin-right: 0; } + .block_myoverview .icon.fa-star, + .block_starredcourses .icon.fa-star { + color: #1177d1; } .block_myoverview a, .block_myoverview .btn-link, diff --git a/theme/bootstrapbase/less/moodle/blocks.less b/theme/bootstrapbase/less/moodle/blocks.less index d1b521f9840..71e95ec10ec 100644 --- a/theme/bootstrapbase/less/moodle/blocks.less +++ b/theme/bootstrapbase/less/moodle/blocks.less @@ -289,6 +289,9 @@ .summary img { max-width: 100%; } + img.icon { + padding: 0; + } @media (max-width: 576px) { .summaryimage { diff --git a/theme/bootstrapbase/style/moodle.css b/theme/bootstrapbase/style/moodle.css index 66ed6211a79..3f6e64a9846 100644 --- a/theme/bootstrapbase/style/moodle.css +++ b/theme/bootstrapbase/style/moodle.css @@ -16249,6 +16249,10 @@ body { .block_myoverview .summary img { max-width: 100%; } +.block_starredcourses img.icon, +.block_myoverview img.icon { + padding: 0; +} @media (max-width: 576px) { .block_starredcourses .summaryimage, .block_recentlyaccesseditems .summaryimage, From 95acd7b1b49a6388a83088db19a0cbcf9d73e047 Mon Sep 17 00:00:00 2001 From: Bas Brands Date: Mon, 5 Nov 2018 15:46:33 +0100 Subject: [PATCH 04/10] MDL-63830 block_myoverview: remove margin card title --- blocks/myoverview/templates/view-cards.mustache | 2 +- blocks/starredcourses/templates/view-cards.mustache | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/blocks/myoverview/templates/view-cards.mustache b/blocks/myoverview/templates/view-cards.mustache index ed99b6ae208..2361ed16ebe 100644 --- a/blocks/myoverview/templates/view-cards.mustache +++ b/blocks/myoverview/templates/view-cards.mustache @@ -46,7 +46,7 @@
-
+
{{> core_course/favouriteicon }} {{#str}}aria:coursename, core_course{{/str}} diff --git a/blocks/starredcourses/templates/view-cards.mustache b/blocks/starredcourses/templates/view-cards.mustache index bb44b0535f5..c00954097e8 100644 --- a/blocks/starredcourses/templates/view-cards.mustache +++ b/blocks/starredcourses/templates/view-cards.mustache @@ -36,7 +36,7 @@
-
+
{{>core_course/favouriteicon }} {{#str}}aria:coursename, core_course{{/str}} From 1a97254201f389ce741d49373462c82e24ae8d58 Mon Sep 17 00:00:00 2001 From: Bas Brands Date: Mon, 5 Nov 2018 15:52:26 +0100 Subject: [PATCH 05/10] MDL-63830 block_myoverview: move course menu button up --- theme/boost/scss/moodle/blocks.scss | 3 +++ theme/boost/style/moodle.css | 12 ++++++++++++ theme/bootstrapbase/less/moodle/blocks.less | 3 +++ theme/bootstrapbase/less/moodle/bs4-compat.less | 14 ++++++++++++++ theme/bootstrapbase/style/moodle.css | 16 ++++++++++++++++ 5 files changed, 48 insertions(+) diff --git a/theme/boost/scss/moodle/blocks.scss b/theme/boost/scss/moodle/blocks.scss index 4b54d75d9dd..fd932755ae2 100644 --- a/theme/boost/scss/moodle/blocks.scss +++ b/theme/boost/scss/moodle/blocks.scss @@ -101,6 +101,9 @@ $card-gutter : $card-deck-margin * 2; color: $blue; } } + .card .coursemenubtn { + margin-top: -0.5rem; + } a, .btn-link { color: inherit; diff --git a/theme/boost/style/moodle.css b/theme/boost/style/moodle.css index b7e764085fb..14938419f36 100644 --- a/theme/boost/style/moodle.css +++ b/theme/boost/style/moodle.css @@ -11168,6 +11168,18 @@ div.editor_atto_toolbar button .icon { .block_starredcourses .icon.fa-star { color: #1177d1; } +.block_myoverview .card .coursemenubtn, .block_myoverview #page-enrol-users #filterform .coursemenubtn, #page-enrol-users .block_myoverview #filterform .coursemenubtn, .block_myoverview .que .history .coursemenubtn, .que .block_myoverview .history .coursemenubtn, .block_myoverview .userprofile .profile_tree section .coursemenubtn, .userprofile .profile_tree .block_myoverview section .coursemenubtn, .block_myoverview .groupinfobox .coursemenubtn, .block_myoverview .well .coursemenubtn, +.block_starredcourses .card .coursemenubtn, +.block_starredcourses #page-enrol-users #filterform .coursemenubtn, +#page-enrol-users .block_starredcourses #filterform .coursemenubtn, +.block_starredcourses .que .history .coursemenubtn, +.que .block_starredcourses .history .coursemenubtn, +.block_starredcourses .userprofile .profile_tree section .coursemenubtn, +.userprofile .profile_tree .block_starredcourses section .coursemenubtn, +.block_starredcourses .groupinfobox .coursemenubtn, +.block_starredcourses .well .coursemenubtn { + margin-top: -0.5rem; } + .block_myoverview a, .block_myoverview .btn-link, .block_starredcourses a, diff --git a/theme/bootstrapbase/less/moodle/blocks.less b/theme/bootstrapbase/less/moodle/blocks.less index 71e95ec10ec..087315571af 100644 --- a/theme/bootstrapbase/less/moodle/blocks.less +++ b/theme/bootstrapbase/less/moodle/blocks.less @@ -292,6 +292,9 @@ img.icon { padding: 0; } + .card .coursemenubtn { + margin-top: -0.5rem; + } @media (max-width: 576px) { .summaryimage { diff --git a/theme/bootstrapbase/less/moodle/bs4-compat.less b/theme/bootstrapbase/less/moodle/bs4-compat.less index 7ae0982bdf7..937b4349df1 100644 --- a/theme/bootstrapbase/less/moodle/bs4-compat.less +++ b/theme/bootstrapbase/less/moodle/bs4-compat.less @@ -356,3 +356,17 @@ .mt-auto { margin-top: auto; } + +.mr-2 { + margin-right: @baseFontSize / 2 !important; +} + +.icon-size-3 { + height: 36px !important; + width: 36px !important; + img { + height: 16px !important; + width: 16px !important; + padding-right: 0; + } +} diff --git a/theme/bootstrapbase/style/moodle.css b/theme/bootstrapbase/style/moodle.css index 3f6e64a9846..d02b542b330 100644 --- a/theme/bootstrapbase/style/moodle.css +++ b/theme/bootstrapbase/style/moodle.css @@ -16253,6 +16253,10 @@ body { .block_myoverview img.icon { padding: 0; } +.block_starredcourses .card .coursemenubtn, +.block_myoverview .card .coursemenubtn { + margin-top: -0.5rem; +} @media (max-width: 576px) { .block_starredcourses .summaryimage, .block_recentlyaccesseditems .summaryimage, @@ -21922,3 +21926,15 @@ ul.indented-list { .mt-auto { margin-top: auto; } +.mr-2 { + margin-right: 7px !important; +} +.icon-size-3 { + height: 36px !important; + width: 36px !important; +} +.icon-size-3 img { + height: 16px !important; + width: 16px !important; + padding-right: 0; +} From 97593c37d874057df70220faa30557cad27ea1b6 Mon Sep 17 00:00:00 2001 From: Bas Brands Date: Mon, 5 Nov 2018 16:03:54 +0100 Subject: [PATCH 06/10] MDL-63830 block_myoverview: text colour course names Using same card HTMl for recently accessed courses --- .../myoverview/templates/view-list.mustache | 2 +- .../templates/view-cards.mustache | 21 ++++++------ theme/boost/scss/moodle/blocks.scss | 2 +- theme/boost/style/moodle.css | 32 +++++++++++++++---- theme/bootstrapbase/less/moodle/blocks.less | 3 ++ theme/bootstrapbase/style/moodle.css | 10 ++++++ 6 files changed, 53 insertions(+), 17 deletions(-) diff --git a/blocks/myoverview/templates/view-list.mustache b/blocks/myoverview/templates/view-list.mustache index 41b17a7b5de..6661455b2d6 100644 --- a/blocks/myoverview/templates/view-list.mustache +++ b/blocks/myoverview/templates/view-list.mustache @@ -43,7 +43,7 @@
{{> core_course/favouriteicon }} - + {{#str}}aria:coursename, core_course{{/str}} {{{fullname}}} diff --git a/blocks/recentlyaccessedcourses/templates/view-cards.mustache b/blocks/recentlyaccessedcourses/templates/view-cards.mustache index 9e223da6bae..31a6bc082a7 100644 --- a/blocks/recentlyaccessedcourses/templates/view-cards.mustache +++ b/blocks/recentlyaccessedcourses/templates/view-cards.mustache @@ -36,19 +36,22 @@
{{#courses}}
- -
+ +
{{#str}}aria:courseimage, core_course{{/str}}
-
-
-
- {{> core_course/favouriteicon }} - {{{fullname}}} -
+ +
+
+
+ {{> core_course/favouriteicon }} + + {{#str}}aria:coursename, core_course{{/str}} + {{#shortentext}}40, {{{fullname}}} {{/shortentext}} +
- +
{{/courses}}
\ No newline at end of file diff --git a/theme/boost/scss/moodle/blocks.scss b/theme/boost/scss/moodle/blocks.scss index fd932755ae2..50adc9ab7d1 100644 --- a/theme/boost/scss/moodle/blocks.scss +++ b/theme/boost/scss/moodle/blocks.scss @@ -104,7 +104,7 @@ $card-gutter : $card-deck-margin * 2; .card .coursemenubtn { margin-top: -0.5rem; } - a, + a.coursename, .btn-link { color: inherit; } diff --git a/theme/boost/style/moodle.css b/theme/boost/style/moodle.css index 14938419f36..f5408d2760f 100644 --- a/theme/boost/style/moodle.css +++ b/theme/boost/style/moodle.css @@ -11165,7 +11165,9 @@ div.editor_atto_toolbar button .icon { .block_recentlyaccessedcourses .icon { margin-right: 0; } .block_myoverview .icon.fa-star, - .block_starredcourses .icon.fa-star { + .block_starredcourses .icon.fa-star, + .block_recentlyaccesseditems .icon.fa-star, + .block_recentlyaccessedcourses .icon.fa-star { color: #1177d1; } .block_myoverview .card .coursemenubtn, .block_myoverview #page-enrol-users #filterform .coursemenubtn, #page-enrol-users .block_myoverview #filterform .coursemenubtn, .block_myoverview .que .history .coursemenubtn, .que .block_myoverview .history .coursemenubtn, .block_myoverview .userprofile .profile_tree section .coursemenubtn, .userprofile .profile_tree .block_myoverview section .coursemenubtn, .block_myoverview .groupinfobox .coursemenubtn, .block_myoverview .well .coursemenubtn, @@ -11177,16 +11179,34 @@ div.editor_atto_toolbar button .icon { .block_starredcourses .userprofile .profile_tree section .coursemenubtn, .userprofile .profile_tree .block_starredcourses section .coursemenubtn, .block_starredcourses .groupinfobox .coursemenubtn, -.block_starredcourses .well .coursemenubtn { +.block_starredcourses .well .coursemenubtn, +.block_recentlyaccesseditems .card .coursemenubtn, +.block_recentlyaccesseditems #page-enrol-users #filterform .coursemenubtn, +#page-enrol-users .block_recentlyaccesseditems #filterform .coursemenubtn, +.block_recentlyaccesseditems .que .history .coursemenubtn, +.que .block_recentlyaccesseditems .history .coursemenubtn, +.block_recentlyaccesseditems .userprofile .profile_tree section .coursemenubtn, +.userprofile .profile_tree .block_recentlyaccesseditems section .coursemenubtn, +.block_recentlyaccesseditems .groupinfobox .coursemenubtn, +.block_recentlyaccesseditems .well .coursemenubtn, +.block_recentlyaccessedcourses .card .coursemenubtn, +.block_recentlyaccessedcourses #page-enrol-users #filterform .coursemenubtn, +#page-enrol-users .block_recentlyaccessedcourses #filterform .coursemenubtn, +.block_recentlyaccessedcourses .que .history .coursemenubtn, +.que .block_recentlyaccessedcourses .history .coursemenubtn, +.block_recentlyaccessedcourses .userprofile .profile_tree section .coursemenubtn, +.userprofile .profile_tree .block_recentlyaccessedcourses section .coursemenubtn, +.block_recentlyaccessedcourses .groupinfobox .coursemenubtn, +.block_recentlyaccessedcourses .well .coursemenubtn { margin-top: -0.5rem; } -.block_myoverview a, +.block_myoverview a.coursename, .block_myoverview .btn-link, -.block_starredcourses a, +.block_starredcourses a.coursename, .block_starredcourses .btn-link, -.block_recentlyaccesseditems a, +.block_recentlyaccesseditems a.coursename, .block_recentlyaccesseditems .btn-link, -.block_recentlyaccessedcourses a, +.block_recentlyaccessedcourses a.coursename, .block_recentlyaccessedcourses .btn-link { color: inherit; } diff --git a/theme/bootstrapbase/less/moodle/blocks.less b/theme/bootstrapbase/less/moodle/blocks.less index 087315571af..13cd0d0d90c 100644 --- a/theme/bootstrapbase/less/moodle/blocks.less +++ b/theme/bootstrapbase/less/moodle/blocks.less @@ -295,6 +295,9 @@ .card .coursemenubtn { margin-top: -0.5rem; } + a.coursename { + color: @textColor; + } @media (max-width: 576px) { .summaryimage { diff --git a/theme/bootstrapbase/style/moodle.css b/theme/bootstrapbase/style/moodle.css index d02b542b330..ec08a50448c 100644 --- a/theme/bootstrapbase/style/moodle.css +++ b/theme/bootstrapbase/style/moodle.css @@ -16250,13 +16250,23 @@ body { max-width: 100%; } .block_starredcourses img.icon, +.block_recentlyaccesseditems img.icon, +.block_recentlyaccessedcourses img.icon, .block_myoverview img.icon { padding: 0; } .block_starredcourses .card .coursemenubtn, +.block_recentlyaccesseditems .card .coursemenubtn, +.block_recentlyaccessedcourses .card .coursemenubtn, .block_myoverview .card .coursemenubtn { margin-top: -0.5rem; } +.block_starredcourses a.coursename, +.block_recentlyaccesseditems a.coursename, +.block_recentlyaccessedcourses a.coursename, +.block_myoverview a.coursename { + color: #333; +} @media (max-width: 576px) { .block_starredcourses .summaryimage, .block_recentlyaccesseditems .summaryimage, From f1b1f3804ead96fd04db46329a6f579a4a6f4569 Mon Sep 17 00:00:00 2001 From: Bas Brands Date: Mon, 5 Nov 2018 16:07:59 +0100 Subject: [PATCH 07/10] MDL-63830 block_myoverview: rounded images for summary view --- blocks/myoverview/templates/view-summary.mustache | 8 ++++---- theme/boost/scss/moodle/blocks.scss | 1 + theme/boost/style/moodle.css | 1 + theme/bootstrapbase/less/moodle/blocks.less | 2 ++ theme/bootstrapbase/style/moodle.css | 4 ++++ 5 files changed, 12 insertions(+), 4 deletions(-) diff --git a/blocks/myoverview/templates/view-summary.mustache b/blocks/myoverview/templates/view-summary.mustache index 15010b21a77..c9510f54aa0 100644 --- a/blocks/myoverview/templates/view-summary.mustache +++ b/blocks/myoverview/templates/view-summary.mustache @@ -39,13 +39,13 @@
-
- -
+
+ +
{{#str}}aria:courseimage, core_course{{/str}}
-
+
{{> core_course/favouriteicon }} diff --git a/theme/boost/scss/moodle/blocks.scss b/theme/boost/scss/moodle/blocks.scss index 50adc9ab7d1..4d5fb1fdb48 100644 --- a/theme/boost/scss/moodle/blocks.scss +++ b/theme/boost/scss/moodle/blocks.scss @@ -131,6 +131,7 @@ $card-gutter : $card-deck-margin * 2; .summaryimage { height: 7rem; + width: 7rem; background-position: center; background-size: cover; } diff --git a/theme/boost/style/moodle.css b/theme/boost/style/moodle.css index f5408d2760f..3d84e63b80f 100644 --- a/theme/boost/style/moodle.css +++ b/theme/boost/style/moodle.css @@ -11289,6 +11289,7 @@ div.editor_atto_toolbar button .icon { .summaryimage { height: 7rem; + width: 7rem; background-position: center; background-size: cover; } diff --git a/theme/bootstrapbase/less/moodle/blocks.less b/theme/bootstrapbase/less/moodle/blocks.less index 13cd0d0d90c..0123a2f1c01 100644 --- a/theme/bootstrapbase/less/moodle/blocks.less +++ b/theme/bootstrapbase/less/moodle/blocks.less @@ -400,6 +400,8 @@ .summaryimage { height: 7rem; + width: 7rem; + .border-radius(50%); background-position: center; background-size: cover; } diff --git a/theme/bootstrapbase/style/moodle.css b/theme/bootstrapbase/style/moodle.css index ec08a50448c..f8f5b628642 100644 --- a/theme/bootstrapbase/style/moodle.css +++ b/theme/bootstrapbase/style/moodle.css @@ -16366,6 +16366,10 @@ body { } .summaryimage { height: 7rem; + width: 7rem; + -webkit-border-radius: 50%; + -moz-border-radius: 50%; + border-radius: 50%; background-position: center; background-size: cover; } From 44b549260d81e081d2506cf1765266c7b58ae479 Mon Sep 17 00:00:00 2001 From: Bas Brands Date: Mon, 5 Nov 2018 16:16:18 +0100 Subject: [PATCH 08/10] MDL-63830 block_myoverview: reuse css for dashboard blocks target block content only use same html accross blocks add one-row class for scrolling cards --- blocks/myoverview/templates/main.mustache | 2 +- .../templates/main.mustache | 2 +- .../recentlyaccessedcourses-view.mustache | 2 +- .../templates/view-cards.mustache | 4 +- .../templates/main.mustache | 2 +- .../recentlyaccesseditems-view.mustache | 2 +- .../templates/view-cards.mustache | 16 +- blocks/starredcourses/templates/main.mustache | 2 +- .../templates/view-cards.mustache | 2 +- blocks/starredcourses/templates/view.mustache | 2 +- theme/boost/scss/moodle/blocks.scss | 23 +-- theme/boost/style/moodle.css | 140 ++---------------- theme/bootstrapbase/less/moodle/blocks.less | 31 +--- theme/bootstrapbase/style/moodle.css | 77 ++-------- 14 files changed, 64 insertions(+), 243 deletions(-) diff --git a/blocks/myoverview/templates/main.mustache b/blocks/myoverview/templates/main.mustache index 00a51d0f583..059263cf7ba 100644 --- a/blocks/myoverview/templates/main.mustache +++ b/blocks/myoverview/templates/main.mustache @@ -23,7 +23,7 @@ {} }} -