diff --git a/blocks/myoverview/templates/courses-view.mustache b/blocks/myoverview/templates/courses-view.mustache index c5be1e801e2..661da4dae0b 100644 --- a/blocks/myoverview/templates/courses-view.mustache +++ b/blocks/myoverview/templates/courses-view.mustache @@ -35,13 +35,6 @@ data-prev-display="{{view}}" data-nocoursesimg="{{nocoursesimg}}">
-
-
- {{> block_myoverview/placeholder-course }} - {{> block_myoverview/placeholder-course }} - {{> block_myoverview/placeholder-course }} - {{> block_myoverview/placeholder-course }} -
-
+ {{> block_myoverview/placeholders }}
\ No newline at end of file diff --git a/blocks/myoverview/templates/no-courses.mustache b/blocks/myoverview/templates/no-courses.mustache index 2da14419e0f..ba52e4acdbd 100644 --- a/blocks/myoverview/templates/no-courses.mustache +++ b/blocks/myoverview/templates/no-courses.mustache @@ -24,8 +24,8 @@ "nocoursesimg": "https://moodlesite/theme/image.php/boost/block_myoverview/1535727318/courses" } }} -
- + {{#str}} nocourses, block_myoverview {{/str}} diff --git a/blocks/myoverview/templates/placeholder-course.mustache b/blocks/myoverview/templates/placeholder-course.mustache deleted file mode 100644 index e3770428485..00000000000 --- a/blocks/myoverview/templates/placeholder-course.mustache +++ /dev/null @@ -1,33 +0,0 @@ -{{! - This file is part of Moodle - http://moodle.org/ - - Moodle is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - Moodle is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with Moodle. If not, see . -}} -{{! - @template block_myoverview/placeholder-course - - This template renders an course card item loading placeholder for the myoverview block. - - Example context (json): - {} -}} -
-
-
-
-
-
-
-
-
diff --git a/blocks/myoverview/templates/placeholders.mustache b/blocks/myoverview/templates/placeholders.mustache new file mode 100644 index 00000000000..d61c9843703 --- /dev/null +++ b/blocks/myoverview/templates/placeholders.mustache @@ -0,0 +1,99 @@ +{{! + This file is part of Moodle - http://moodle.org/ + + Moodle is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + Moodle is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with Moodle. If not, see . +}} +{{! + @template block_myoverview/placeholders + + This template renders the loading placeholders for the myoverview block. + + Example context (json): + {} +}} + diff --git a/blocks/recentlyaccessedcourses/templates/no-courses.mustache b/blocks/recentlyaccessedcourses/templates/no-courses.mustache index 0cb3109b07f..27ab207dad3 100644 --- a/blocks/recentlyaccessedcourses/templates/no-courses.mustache +++ b/blocks/recentlyaccessedcourses/templates/no-courses.mustache @@ -25,7 +25,7 @@ } }}
- {{#str}} nocourses, block_recentlyaccessedcourses {{/str}} diff --git a/blocks/recentlyaccessedcourses/templates/placeholder-course.mustache b/blocks/recentlyaccessedcourses/templates/placeholder-course.mustache index da6b32521ce..63c455df72b 100644 --- a/blocks/recentlyaccessedcourses/templates/placeholder-course.mustache +++ b/blocks/recentlyaccessedcourses/templates/placeholder-course.mustache @@ -25,7 +25,7 @@
-
-
+
+
-
\ No newline at end of file +
diff --git a/blocks/recentlyaccessedcourses/templates/recentlyaccessedcourses-view.mustache b/blocks/recentlyaccessedcourses/templates/recentlyaccessedcourses-view.mustache index 5a4d166ef4b..b2771542aa6 100644 --- a/blocks/recentlyaccessedcourses/templates/recentlyaccessedcourses-view.mustache +++ b/blocks/recentlyaccessedcourses/templates/recentlyaccessedcourses-view.mustache @@ -29,12 +29,7 @@ data-nocoursesimgurl="{{nocoursesimgurl}}">
-
- {{> block_recentlyaccessedcourses/placeholder-course }} - {{> block_recentlyaccessedcourses/placeholder-course }} - {{> block_recentlyaccessedcourses/placeholder-course }} - {{> block_recentlyaccessedcourses/placeholder-course }} - {{> block_recentlyaccessedcourses/placeholder-course }} +
{{> block_recentlyaccessedcourses/placeholder-course }} {{> block_recentlyaccessedcourses/placeholder-course }} {{> block_recentlyaccessedcourses/placeholder-course }} diff --git a/blocks/recentlyaccesseditems/templates/no-items.mustache b/blocks/recentlyaccesseditems/templates/no-items.mustache index 794f42474c4..8919e52d7b6 100644 --- a/blocks/recentlyaccesseditems/templates/no-items.mustache +++ b/blocks/recentlyaccesseditems/templates/no-items.mustache @@ -24,11 +24,11 @@ "noitemsimgurl": "https://moodlesite/theme/image.php/boost/block_recentlyaccesseditems/1535727318/items" } }} -
+
{{#str}} noitems, block_recentlyaccesseditems {{/str}} -

{{#str}} noitems, block_recentlyaccesseditems {{/str}}

+

{{#str}} noitems, block_recentlyaccesseditems {{/str}}

\ No newline at end of file diff --git a/blocks/recentlyaccesseditems/templates/placeholder-item.mustache b/blocks/recentlyaccesseditems/templates/placeholder-item.mustache index 91155c9ec1d..0e5cd86e9a3 100644 --- a/blocks/recentlyaccesseditems/templates/placeholder-item.mustache +++ b/blocks/recentlyaccesseditems/templates/placeholder-item.mustache @@ -22,14 +22,12 @@ Example context (json): {} }} -
-
-
-
+
+
+
-
-
+
+
-
\ No newline at end of file diff --git a/blocks/starredcourses/templates/no-courses.mustache b/blocks/starredcourses/templates/no-courses.mustache index 1b749648f8d..a00de4eee3e 100644 --- a/blocks/starredcourses/templates/no-courses.mustache +++ b/blocks/starredcourses/templates/no-courses.mustache @@ -20,7 +20,7 @@ } }}
- {{#str}} nocourses, block_starredcourses {{/str}} diff --git a/blocks/starredcourses/templates/placeholder-course.mustache b/blocks/starredcourses/templates/placeholder-course.mustache index 0e35afe39ae..3ce061eb579 100644 --- a/blocks/starredcourses/templates/placeholder-course.mustache +++ b/blocks/starredcourses/templates/placeholder-course.mustache @@ -21,6 +21,6 @@
-
+
diff --git a/blocks/starredcourses/templates/view.mustache b/blocks/starredcourses/templates/view.mustache index 15009bbe04b..7046b9626bc 100644 --- a/blocks/starredcourses/templates/view.mustache +++ b/blocks/starredcourses/templates/view.mustache @@ -29,7 +29,7 @@ data-nocoursesimg="{{nocoursesimg}}">
-
+
{{> block_starredcourses/placeholder-course }} {{> block_starredcourses/placeholder-course }} {{> block_starredcourses/placeholder-course }} diff --git a/lib/templates/paged_content_pages.mustache b/lib/templates/paged_content_pages.mustache index bd53214d2a8..a85b0eb2388 100644 --- a/lib/templates/paged_content_pages.mustache +++ b/lib/templates/paged_content_pages.mustache @@ -37,8 +37,8 @@ }}
{{#pages}} diff --git a/theme/boost/scss/moodle/blocks.scss b/theme/boost/scss/moodle/blocks.scss index 19d6ec8b2af..d1c52e4a216 100644 --- a/theme/boost/scss/moodle/blocks.scss +++ b/theme/boost/scss/moodle/blocks.scss @@ -78,7 +78,7 @@ $blocks-plus-gutter: $blocks-column-width + ( $grid-gutter-width / 2 ); $card-gutter : $card-deck-margin * 2; .block .empty-placeholder-image-lg { - height: 125px; + height: 5rem; } .block .block-cards { @@ -219,6 +219,15 @@ body.drawer-open-left #region-main.has-blocks { } } +.block_myoverview { + .content { + min-height: 19.35rem; + } + .paged-content-page-container { + min-height: 13rem; + } +} + // Show expand collapse with font-awesome. .block_settings .block_tree [aria-expanded="true"], .block_settings .block_tree [aria-expanded="true"].emptybranch, diff --git a/theme/boost/scss/moodle/core.scss b/theme/boost/scss/moodle/core.scss index 7fc00a8717e..470d2b05872 100644 --- a/theme/boost/scss/moodle/core.scss +++ b/theme/boost/scss/moodle/core.scss @@ -2149,3 +2149,7 @@ div.editor_atto_toolbar button .icon { display: none; } } + +.paged-content-page-container { + min-height: 3.125rem; +} diff --git a/theme/boost/style/moodle.css b/theme/boost/style/moodle.css index a0250ee4e32..12d5556b93d 100644 --- a/theme/boost/style/moodle.css +++ b/theme/boost/style/moodle.css @@ -10468,6 +10468,9 @@ div.editor_atto_toolbar button .icon { .dir-ltr .dir-ltr-hide { display: none; } +.paged-content-page-container { + min-height: 3.125rem; } + .icon { font-size: 16px; width: 16px; @@ -11138,7 +11141,7 @@ div.editor_atto_toolbar button .icon { width: 100%; } } .block .empty-placeholder-image-lg { - height: 125px; } + height: 5rem; } .block .block-cards .course-info-container { padding: 0.8rem; } @@ -11238,6 +11241,12 @@ div.editor_atto_toolbar button .icon { width: auto; margin-right: 6px; } +.block_myoverview .content { + min-height: 19.35rem; } + +.block_myoverview .paged-content-page-container { + min-height: 13rem; } + .block_settings .block_tree [aria-expanded="true"], .block_settings .block_tree [aria-expanded="true"].emptybranch, .block_settings .block_tree [aria-expanded="false"], diff --git a/theme/bootstrapbase/less/moodle/blocks.less b/theme/bootstrapbase/less/moodle/blocks.less index be6af729a3f..a1c91473e29 100644 --- a/theme/bootstrapbase/less/moodle/blocks.less +++ b/theme/bootstrapbase/less/moodle/blocks.less @@ -326,6 +326,15 @@ } } +.block_myoverview { + .content { + min-height: 19.35rem; + } + .paged-content-page-container { + min-height: 13rem; + } +} + .dashboard-card-deck { box-sizing: border-box; *, diff --git a/theme/bootstrapbase/style/moodle.css b/theme/bootstrapbase/style/moodle.css index 62755b1fa05..f858298069a 100644 --- a/theme/bootstrapbase/style/moodle.css +++ b/theme/bootstrapbase/style/moodle.css @@ -16249,6 +16249,12 @@ body { text-decoration: none; color: unset; } +.block_myoverview .content { + min-height: 19.35rem; +} +.block_myoverview .paged-content-page-container { + min-height: 13rem; +} .dashboard-card-deck { box-sizing: border-box; display: flex;