Merge branch 'MDL-58732-master' of git://github.com/ryanwyllie/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 1 May 2017 07:22:53 +0000 (15:22 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 1 May 2017 07:22:53 +0000 (15:22 +0800)
blocks/myoverview/templates/course-event-list.mustache
blocks/myoverview/templates/main.mustache
theme/boost/scss/moodle/blocks.scss
theme/bootstrapbase/less/moodle/blocks.less
theme/bootstrapbase/style/moodle.css
theme/bootstrapbase/templates/block_myoverview/course-event-list.mustache

index 6a51666..74922d6 100644 (file)
@@ -87,7 +87,7 @@
             </button>
         </div>
     </div>
-    <div class="hidden text-xs-center text-center" data-region="empty-message">
+    <div class="hidden text-xs-center text-center m-y-3" data-region="empty-message">
         <img class="empty-placeholder-image-sm"
              src="{{urls.noevents}}"
              alt="{{#str}} noevents, block_myoverview {{/str}}"
index 54fc37a..3a1a942 100644 (file)
@@ -36,7 +36,7 @@
             </a>
         </li>
     </ul>
-    <div class="tab-content">
+    <div class="tab-content content-centred">
         <div role="tabpanel" class="tab-pane fade in active" id="myoverview_timeline_view">
             {{> block_myoverview/timeline-view }}
         </div>
index 6a0962c..bfa7815 100644 (file)
@@ -179,14 +179,18 @@ $doughnut-fill-colour: $brand-warning;
         }
     }
 
+    .content-centred {
+        max-width: 900px;
+        margin-left: auto;
+        margin-right: auto;
+    }
+
     .empty-placeholder-image-sm {
-        height: 70px;
-        width: 85px;
+        height: 50px;
     }
 
     .empty-placeholder-image-lg {
         height: 125px;
-        width: 145px;
     }
 
     .courses-view-course-item {
@@ -194,3 +198,11 @@ $doughnut-fill-colour: $brand-warning;
         overflow-y: hidden;
     }
 }
+
+@media (min-width: 1600px) {
+    .block_myoverview {
+        .courses-view-course-item {
+            height: 190px;
+        }
+    }
+}
index caf8d62..c42131d 100644 (file)
     }
 
     .empty-placeholder-image-sm {
-        height: 70px;
-        width: 85px;
+        height: 50px;
     }
 
     .empty-placeholder-image-lg {
         height: 125px;
-        width: 145px;
     }
 
     .courses-view-course-item {
index cc7e9c6..d8496eb 100644 (file)
@@ -16406,12 +16406,10 @@ body {
   display: block;
 }
 .block_myoverview .empty-placeholder-image-sm {
-  height: 70px;
-  width: 85px;
+  height: 50px;
 }
 .block_myoverview .empty-placeholder-image-lg {
   height: 125px;
-  width: 145px;
 }
 .block_myoverview .courses-view-course-item {
   height: 220px;
index d900b32..f6bcb03 100644 (file)
@@ -28,6 +28,7 @@
      data-limit="{{$limit}}20{{/limit}}"
      data-course-id="{{$courseid}}{{/courseid}}"
      data-last-id="{{$lastid}}{{/lastid}}"
+     data-midnight="{{midnight}}"
      id="event-list-container-{{$courseid}}{{/courseid}}">
 
     <div data-region="event-list-content">
@@ -86,7 +87,7 @@
             </button>
         </div>
     </div>
-    <div class="hidden text-xs-center text-center" data-region="empty-message">
+    <div class="hidden text-xs-center text-center m-y-3" data-region="empty-message">
         <img class="empty-placeholder-image-sm"
              src="{{urls.noevents}}"
              alt="{{#str}} noevents, block_myoverview {{/str}}"