MDL-60700 calendar: remove bottom margin for description in summary

moodle · Nov 7, 2017 · f0fc8a1 · f0fc8a1
1 parent 8926030
commit f0fc8a1
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 2 deletions.
diff --git a/calendar/templates/event_summary_body.mustache b/calendar/templates/event_summary_body.mustache
@@ -29,6 +29,7 @@
     }
 }}
 <div{{!
+    }} class="summary-modal-container"{{!
     }} data-region="summary-modal-container"{{!
     }} data-event-id="{{id}}"{{!
     }} data-event-title="{{name}}"{{!
@@ -49,7 +50,7 @@
         {{#description}}
         <div class="row m-t-1">
             <div class="col-xs-1">{{#pix}} i/calendareventdescription, core, {{#str}} description {{/str}} {{/pix}}</div>
-            <div class="col-xs-11">{{{.}}}</div>
+            <div class="description-content col-xs-11">{{{.}}}</div>
         </div>
         {{/description}}
         {{#isactionevent}}

diff --git a/theme/boost/scss/moodle/calendar.scss b/theme/boost/scss/moodle/calendar.scss
@@ -417,3 +417,11 @@ table.calendartable caption {
         display: block;
     }
 }
+
+.summary-modal-container {
+    .description-content {
+        > p {
+            margin: 0;
+        }
+    }
+}
diff --git a/theme/bootstrapbase/less/moodle/calendar.less b/theme/bootstrapbase/less/moodle/calendar.less
@@ -409,3 +409,11 @@
 .calendarwrapper {
     position: relative;
 }
+
+.summary-modal-container {
+    .description-content {
+        > p {
+            margin: 0;
+        }
+    }
+}
diff --git a/theme/bootstrapbase/style/moodle.css b/theme/bootstrapbase/style/moodle.css
@@ -5908,6 +5908,9 @@ img.iconsmall {
 .calendarwrapper {
   position: relative;
 }
+.summary-modal-container .description-content > p {
+  margin: 0;
+}
 /* course.less */
 /* COURSE CONTENT */
 /* stylelint-disable unit-blacklist */

diff --git a/theme/bootstrapbase/templates/core_calendar/event_summary_body.mustache b/theme/bootstrapbase/templates/core_calendar/event_summary_body.mustache
@@ -29,6 +29,7 @@
     }
 }}
 <div{{!
+    }} class="summary-modal-container"{{!
     }} data-region="summary-modal-container"{{!
     }} data-event-id="{{id}}"{{!
     }} data-event-title="{{name}}"{{!
@@ -49,7 +50,7 @@
         {{#description}}
         <div class="row-fluid m-t-1">
             <div class="span1">{{#pix}} i/calendareventdescription, core, {{#str}} description {{/str}} {{/pix}}</div>
-            <div class="span11">{{{.}}}</div>
+            <div class="description-content span11">{{{.}}}</div>
         </div>
         {{/description}}
         {{#iscategoryevent}}