diff --git a/theme/bootstrapbase/less/moodle/bootstrapoverride.less b/theme/bootstrapbase/less/moodle/bootstrapoverride.less
index b20ea9badcc..f353aa63746 100644
--- a/theme/bootstrapbase/less/moodle/bootstrapoverride.less
+++ b/theme/bootstrapbase/less/moodle/bootstrapoverride.less
@@ -26,9 +26,9 @@ h4 small { font-size: round(@baseFontSize * 0.85); } // ~12px
 
 // Printing.
 @media print {
-  a[href]:after {
-    content: "";
-  }
+    a[href]:after {
+        content: "";
+    }
 }
 
 // Bootstrap's calculation of blocks within a fluid grid. Copied from their grid code.
@@ -65,5 +65,5 @@ sub {
     vertical-align: sub;
 }
 .dropdown-backdrop {
-  position: static;
+    position: static;
 }
diff --git a/theme/bootstrapbase/less/moodle/core.less b/theme/bootstrapbase/less/moodle/core.less
index 4a2e3013485..e9898e1a184 100644
--- a/theme/bootstrapbase/less/moodle/core.less
+++ b/theme/bootstrapbase/less/moodle/core.less
@@ -86,11 +86,11 @@
 .empty-region-side-post.used-region-side-pre, // Post region is empty and pre region is in use.
 .jsenabled.docked-region-side-post.used-region-side-pre { // All post blocks docked and pre region is in use.
     #region-main.span8 {
-    /** Increase the span size by 1 **/
+        /** Increase the span size by 1 **/
         .fluid-span(9);
     }
     #block-region-side-pre.span4 {
-    /** Decrease the span size by 1 **/
+        /** Decrease the span size by 1 **/
         .fluid-span(3);
     }
 }
@@ -289,8 +289,8 @@ h3 img.iconhelp, h3 img.icon,
 h4 img.iconhelp, h4 img.icon,
 h5 img.iconhelp, h5 img.icon,
 h6 img.iconhelp, h6 img.icon {
-  vertical-align: middle;
-  padding: 4px;
+    vertical-align: middle;
+    padding: 4px;
 }
 .dir-rtl img.iconhelp, .dir-rtl .helplink img {
     padding-right: 3px;
@@ -1208,12 +1208,12 @@ tr.flagged-tag a {
             margin-bottom: 0;
         }
     }
-  .user-enroller-panel .uep-search-results .user .details {
-    width: 237px;
-  }
-  .user-enroller-panel .uep-search-results .cohort .details {
-    width: 237px;
-  }
+    .user-enroller-panel .uep-search-results .user .details {
+        width: 237px;
+    }
+    .user-enroller-panel .uep-search-results .cohort .details {
+        width: 237px;
+    }
 }
 .dir-rtl {
     &#page-enrol-users {
@@ -1302,8 +1302,8 @@ tr.flagged-tag a {
     display: table-cell;
 }
 .label .mod-indent {
-  float:left;
-  padding-top:20px
+    float:left;
+    padding-top:20px
 }
 
 /* Creates a series of .mod-indent-# rule declarations based on indent size and number of indent levels. */
@@ -1820,7 +1820,7 @@ body#page-lib-editor-tinymce-plugins-moodlemedia-preview {
 /* The instruction/help area */
 .jschooser .choosercontainer #chooseform .instruction,
 .jschooser .choosercontainer #chooseform .typesummary {
-   display: none;
+    display: none;
     position: absolute;
     top: 0;
     right: 0;
@@ -2428,8 +2428,8 @@ a.disabled {
     color: #808080;
 }
 body.lockscroll {
-  height: 100%;
-  overflow: hidden;
+    height: 100%;
+    overflow: hidden;
 }
 
 .dir-rtl {
@@ -2453,11 +2453,11 @@ body.lockscroll {
 
 dd:before,
 dd:after {
-  display: block;
-  content: " ";
+    display: block;
+    content: " ";
 }
 dd:after {
-  clear: both;
+    clear: both;
 }
 
 // Active tabs with links should have a different
diff --git a/theme/bootstrapbase/less/moodle/course.less b/theme/bootstrapbase/less/moodle/course.less
index 4144a5e768b..c990bb5d15c 100644
--- a/theme/bootstrapbase/less/moodle/course.less
+++ b/theme/bootstrapbase/less/moodle/course.less
@@ -97,24 +97,24 @@
 
             .dimmed {
                 img.activityicon {
-                  opacity: 0.5;
-                  filter: alpha(opacity=50);
+                    opacity: 0.5;
+                    filter: alpha(opacity=50);
                 }
             }
         }
     }
     .label {
-      .contentwithoutlink,
-      .activityinstance {
-        padding-right: 32px;
-        display: block;
-        height: inherit;
-      }
+        .contentwithoutlink,
+        .activityinstance {
+            padding-right: 32px;
+            display: block;
+            height: inherit;
+        }
 
-      .mod-indent-outer {
-        padding-left: 24px;
-        display: block;
-      }
+        .mod-indent-outer {
+            padding-left: 24px;
+            display: block;
+        }
     }
 
     .filler {
@@ -858,8 +858,8 @@ span.editinstructions {
     .moodle-actionmenu[data-enhanced] {
         .menu {
             img {
-              width: 12px;
-              height: 12px;
+                width: 12px;
+                height: 12px;
             }
         }
     }
@@ -941,7 +941,7 @@ span.editinstructions {
             display:inline-block;
         }
         > .moodle-actionmenu .menu a {
-             padding-left:1rem;
+            padding-left:1rem;
         }
         .moodle-actionmenu:not([data-enhanced]) {
             li {line-height:normal;}
@@ -1092,7 +1092,7 @@ span.editinstructions {
         }
         > .firstpage .listitem:first-child > div .item-actions .action-moveup,
         > .lastpage .listitem:last-child > div .item-actions .action-movedown {
-          display: none;
+            display: none;
         }
         .bulk-action-checkbox {
             margin:-2px 6px 0 0;
@@ -1121,7 +1121,7 @@ span.editinstructions {
             }
             &:first-child > div .item-actions .action-moveup,
             &:last-child > div .item-actions .action-movedown {
-              display: none;
+                display: none;
             }
         }
         .course-count {
@@ -1247,7 +1247,7 @@ span.editinstructions {
                 margin-right:0.5em;
                 margin-left: 0;
                 > .ba-checkbox {
-                  margin:-1px 0 0 0.5em;
+                    margin:-1px 0 0 0.5em;
                 }
             }
 
@@ -1292,7 +1292,7 @@ span.editinstructions {
             margin:-2px 0 0 6px;
         }
     }
-  .detail-pair {
+    .detail-pair {
         > * {
             float: right;
             margin-right: 0;
@@ -1321,9 +1321,9 @@ span.editinstructions {
         float:right;
         line-height:40px;
         > div {
-          margin-left:1em;
-          margin: 10px 0;
-          display:inline-block;
+            margin-left:1em;
+            margin: 10px 0;
+            display:inline-block;
         }
     }
     select {
diff --git a/theme/bootstrapbase/less/moodle/expendable.less b/theme/bootstrapbase/less/moodle/expendable.less
index 82f22d24c1a..c8a0aeffdfa 100644
--- a/theme/bootstrapbase/less/moodle/expendable.less
+++ b/theme/bootstrapbase/less/moodle/expendable.less
@@ -75,27 +75,27 @@ table#permissions {
 // language editing progress bar
 // copied in because the styles are set on the HTML
 div[id^="bar_pbar_"] {
-  overflow: hidden !important;
-  height: @baseLineHeight !important;
-  margin-bottom: @baseLineHeight !important;
-  #gradient > .vertical(#f5f5f5, #f9f9f9) !important;
-  .box-shadow(inset 0 1px 2px rgba(0,0,0,.1)) !important;
-  .border-radius(@baseBorderRadius) !important;
-  border: none !important;
+    overflow: hidden !important;
+    height: @baseLineHeight !important;
+    margin-bottom: @baseLineHeight !important;
+    #gradient > .vertical(#f5f5f5, #f9f9f9) !important;
+    .box-shadow(inset 0 1px 2px rgba(0,0,0,.1)) !important;
+    .border-radius(@baseBorderRadius) !important;
+    border: none !important;
 }
 div[id^="progress_pbar_"] {
-  height: 100% !important;
-  color: @white !important;
-  float: left !important;
-  font-size: 12px !important;
-  text-align: center !important;
-  text-shadow: 0 -1px 0 rgba(0,0,0,.25) !important;
-  #gradient > .vertical(#149bdf, #0480be) !important;
-  .box-shadow(inset 0 -1px 0 rgba(0,0,0,.15)) !important;
-  .box-sizing(border-box) !important;
-  .transition(width .6s ease) !important;
-  padding-top: 0 !important;
-  border: none !important;
+    height: 100% !important;
+    color: @white !important;
+    float: left !important;
+    font-size: 12px !important;
+    text-align: center !important;
+    text-shadow: 0 -1px 0 rgba(0,0,0,.25) !important;
+    #gradient > .vertical(#149bdf, #0480be) !important;
+    .box-shadow(inset 0 -1px 0 rgba(0,0,0,.15)) !important;
+    .box-sizing(border-box) !important;
+    .transition(width .6s ease) !important;
+    padding-top: 0 !important;
+    border: none !important;
 }
 // colored buttons
 input.form-submit,
diff --git a/theme/bootstrapbase/less/moodle/filemanager.less b/theme/bootstrapbase/less/moodle/filemanager.less
index 619be44dc7d..38e4c76d9fc 100644
--- a/theme/bootstrapbase/less/moodle/filemanager.less
+++ b/theme/bootstrapbase/less/moodle/filemanager.less
@@ -1,4 +1,4 @@
- // File Picker and File Manager
+// File Picker and File Manager
 .filemanager,
 .filepicker,
 .file-picker {
@@ -75,7 +75,7 @@
     line-height: 20px;
 }
 
- .moodle-dialogue-base .filepicker .moodle-dialogue-wrap .moodle-dialogue-bd {
+.moodle-dialogue-base .filepicker .moodle-dialogue-wrap .moodle-dialogue-bd {
     padding: 0px;
 }
 
@@ -1234,7 +1234,7 @@ a.ygtvspacer:hover {
         line-height: inherit;
     }
 }
- .fp-forminset {
+.fp-forminset {
     max-width: 400px;
     padding: 0 10px;
     .control-group.control-radio {
@@ -1242,7 +1242,7 @@ a.ygtvspacer:hover {
     }
     .control-group {
         label.control-label {
-           width: 105px;
+            width: 105px;
         }
         label.control-radio {
             float: right;
@@ -1256,7 +1256,7 @@ a.ygtvspacer:hover {
             }
         }
         .controls.control-radio input {
-                margin-top: 3px;
+            margin-top: 3px;
         }
     }
     .fp-select-buttons {
diff --git a/theme/bootstrapbase/less/moodle/forms.less b/theme/bootstrapbase/less/moodle/forms.less
index abb8008ff7e..fbf70e40507 100644
--- a/theme/bootstrapbase/less/moodle/forms.less
+++ b/theme/bootstrapbase/less/moodle/forms.less
@@ -380,7 +380,7 @@ input[type="checkbox"] {
     margin-bottom: 0;
 }
 .dir-rtl .form-item .form-label label {
-     text-align:left;
+    text-align:left;
 }
 .felement.ffilepicker {
     margin-top: 5px;
@@ -482,7 +482,6 @@ fieldset.coursesearchbox label {
 }
 
 
-
 /**
  * Make forms vertical when the screen is less than 1474px AND both side-pre and side-post contain blocks.
  * This is an extra special media rule.
diff --git a/theme/bootstrapbase/less/moodle/grade.less b/theme/bootstrapbase/less/moodle/grade.less
index 3ec22c497e6..ccd6b6ceda0 100644
--- a/theme/bootstrapbase/less/moodle/grade.less
+++ b/theme/bootstrapbase/less/moodle/grade.less
@@ -451,7 +451,7 @@
             cursor: pointer;
         }
     }
- }
+}
 
 /**
  * User report.
diff --git a/theme/bootstrapbase/less/moodle/message.less b/theme/bootstrapbase/less/moodle/message.less
index 850ea93678d..de18fd7266d 100644
--- a/theme/bootstrapbase/less/moodle/message.less
+++ b/theme/bootstrapbase/less/moodle/message.less
@@ -274,7 +274,7 @@ table.message .searchresults td {
     margin-right: 20px;
 }
 .message .messagearea .messagehistory .messageactive {
-  background-color: @tableBackgroundHover;
+    background-color: @tableBackgroundHover;
 }
 .message .messagearea .messagehistory .messagecontent .deleteicon {
     width: 20px;
diff --git a/theme/bootstrapbase/less/moodle/modules.less b/theme/bootstrapbase/less/moodle/modules.less
index 8420e0dbc0f..8acd263c2d0 100644
--- a/theme/bootstrapbase/less/moodle/modules.less
+++ b/theme/bootstrapbase/less/moodle/modules.less
@@ -134,7 +134,7 @@ select {
 
 // Override hardcoded forum modules styling
 .forumsearch input[type=text] {
-     margin-bottom: 0 !important;
+    margin-bottom: 0 !important;
 }
 
 #page-mod-forum-discuss .discussioncontrols {
@@ -291,7 +291,7 @@ div#dock {
     }
 }
 .dir-rtl .dropdown-submenu > .dropdown-menu {
-  .border-radius(6px 0px 6px 6px);
+    .border-radius(6px 0px 6px 6px);
 }
 
 
@@ -299,8 +299,8 @@ div#dock {
 
 .path-mod-survey {
     .surveytable {
-      > tbody > tr:nth-of-type(odd) {background-color: @tableBackground;}
-      > tbody > tr:nth-of-type(even) {background-color: @tableBackgroundAccent;}
+        > tbody > tr:nth-of-type(odd) {background-color: @tableBackground;}
+        > tbody > tr:nth-of-type(even) {background-color: @tableBackgroundAccent;}
         .rblock label {text-align: center;}
     }
     .resultgraph, .reportsummary, .studentreport, .reportbuttons, .centerpara {
diff --git a/theme/bootstrapbase/less/moodle/question.less b/theme/bootstrapbase/less/moodle/question.less
index 42b00c1c57e..55f79349804 100644
--- a/theme/bootstrapbase/less/moodle/question.less
+++ b/theme/bootstrapbase/less/moodle/question.less
@@ -79,9 +79,9 @@
     overflow-y: auto;
     max-height: 400px;
     max-height: calc(100vh - 15em);
- /* The next line is a workaround because recess is crap. Delete ththe following line once
-  * https://github.com/twitter/recess/issues/59 / https://github.com/twitter/recess/issues/75
-  * is fixed. The previous line is the right one. */
+    /* The next line is a workaround because recess is crap. Delete ththe following line once
+    * https://github.com/twitter/recess/issues/59 / https://github.com/twitter/recess/issues/75
+    * is fixed. The previous line is the right one. */
     max-height: 60vh;
     width: 60%;
 }
@@ -293,9 +293,9 @@ body.path-question-type .fitem_fgroup .accesshide {
     border-color: @borderColor;
     .box-shadow(inset 0 1px 1px rgba(0,0,0,.075)); // Redeclare so transitions work
     &:focus {
-      border-color: darken(@borderColor, 10%);
-      @shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 6px lighten(@borderColor, 20%);
-      .box-shadow(@shadow);
+        border-color: darken(@borderColor, 10%);
+        @shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 6px lighten(@borderColor, 20%);
+        .box-shadow(@shadow);
     }
 }
 
@@ -310,15 +310,15 @@ body.path-question-type .fitem_fgroup .accesshide {
 }
 .formulation select.correct,
 .formulation input.correct {
-  .answerState(@successText, @successBackground);
+    .answerState(@successText, @successBackground);
 }
 .formulation select.partiallycorrect,
 .formulation input.partiallycorrect {
-  .answerState(@warningText, @warningBackground);
+    .answerState(@warningText, @warningBackground);
 }
 .formulation select.incorrect,
 .formulation input.incorrect {
-  .answerState(@errorText, @errorBackground);
+    .answerState(@errorText, @errorBackground);
 }
 
 .que .grading,
diff --git a/theme/bootstrapbase/less/moodle/responsive.less b/theme/bootstrapbase/less/moodle/responsive.less
index 8e2d8f9e5f6..570b0f3b4de 100644
--- a/theme/bootstrapbase/less/moodle/responsive.less
+++ b/theme/bootstrapbase/less/moodle/responsive.less
@@ -134,8 +134,8 @@
     .loginbox.twocolumns .loginpanel,
     .loginbox.twocolumns .signuppanel {
         width: 48.717948717948715%;
-       *width: 48.664757228587014%;
-   }
+        *width: 48.664757228587014%;
+    }
     // Wider form labels.
     .form-item .form-label,
     .mform .fitem div.fitemtitle,
@@ -207,14 +207,14 @@
     .loginbox.twocolumns .loginpanel,
     .loginbox.twocolumns .signuppanel {
         width: 48.617948717948715%;
-       *width: 48.664757228587014%;
-   }
+        *width: 48.664757228587014%;
+    }
 }
 
 @media (min-width: 768px) and (max-width: 979px) {
     // Login page.
     .loginbox.twocolumns .loginpanel {
-          margin-left: 0;
+        margin-left: 0;
     }
     .loginbox.twocolumns .loginpanel,
     .loginbox.twocolumns .signuppanel {
@@ -239,15 +239,15 @@
 }
 
 @media (max-width: 767px) {
-     .loginbox.twocolumns .loginpanel,
-     .loginbox.twocolumns .signuppanel {
-         display: block;
-         float: none;
-         width: 100%;
-         margin-left: 0;
-         .box-sizing(border-box);
-     }
-     #page-mod-quiz-edit div.quizcontents,
+    .loginbox.twocolumns .loginpanel,
+    .loginbox.twocolumns .signuppanel {
+        display: block;
+        float: none;
+        width: 100%;
+        margin-left: 0;
+        .box-sizing(border-box);
+    }
+    #page-mod-quiz-edit div.quizcontents,
     .questionbankwindow.block {
         width: 100%;
         float: none;
@@ -257,7 +257,7 @@
         clear: both;
     }
 
- }
+}
 
 @media (max-width: 480px) {
     // make tabs act like nav-stacked
@@ -342,28 +342,28 @@
 
 // Stuart's 2,1,3 layout
 @media (min-width : 768px) {
-  .row-fluid .desktop-first-column {
-      margin-left: 0;
-  }
-  #page-navbar .breadcrumb-button {
-      display: inline;
-  }
+    .row-fluid .desktop-first-column {
+        margin-left: 0;
+    }
+    #page-navbar .breadcrumb-button {
+        display: inline;
+    }
 }
 @media (max-width : 767px) {
-  .row-fluid .desktop-first-column {
-      clear: both;
-  }
+    .row-fluid .desktop-first-column {
+        clear: both;
+    }
 }
 // Forms
 @media (max-width: 767px) {
-  // Remove the horizontal form styles
+    // Remove the horizontal form styles
     .form-item .form-label,
     .mform .fitem div.fitemtitle {
-    // copied from .control-label {
-      float: none;
-      width: auto;
-      padding-top: 0;
-      text-align: left;
+        // copied from .control-label {
+        float: none;
+        width: auto;
+        padding-top: 0;
+        text-align: left;
     }
     .form-item .form-label label{
         display: inline-block;
@@ -380,7 +380,7 @@
     .path-backup .mform .fitem .felement,
     .mform .fdescription.required,
     .form-item .form-description {
-      margin-left: 0;
+        margin-left: 0;
     }
     table#form td.submit,
     .form-buttons,
@@ -389,8 +389,8 @@
     #fgroup_id_buttonar,
     .form-horizontal .form-actions,
     .fitem_fsubmit .felement.fsubmit {
-      padding-left: 10px;
-      padding-right: 10px;
+        padding-left: 10px;
+        padding-right: 10px;
     }
     #helppopupbox {
         width: auto !important;
@@ -436,7 +436,7 @@
 
 @media (max-width: 979px) {
     .nav-collapse {
-         height: 0;
+        height: 0;
         .nav > li > a {
             color: @grayDark;
         }
@@ -663,22 +663,22 @@
 }
 
 @media (max-width: 767px) {
-// Resize, reflow file-picker on small devices
-   #filesskin .yui3-panel,
-   #filesskin .file-picker.fp-generallayout {
+    // Resize, reflow file-picker on small devices
+    #filesskin .yui3-panel,
+    #filesskin .file-picker.fp-generallayout {
         width: 100%;
         left: 0;
     }
     .userprofile dl.list {
-    // copied from dl-horizontal in bootstrap/repsonsive.less
+        // copied from dl-horizontal in bootstrap/repsonsive.less
         dt {
-          float: none;
-          clear: none;
-          width: auto;
-          text-align: left;
+            float: none;
+            clear: none;
+            width: auto;
+            text-align: left;
         }
         dd {
-          margin-left: 0;
+            margin-left: 0;
         }
     }
     // Reset the alignment for required label to display inline on mobile devices
@@ -686,33 +686,33 @@
         float: left;
     }
 
-  // GRID & CONTAINERS
-  // -----------------
-  // Remove width from containers
-  .container {
-    width: auto;
-  }
-  // Fluid rows
-  .row-fluid {
-    width: 100%;
-  }
-  .row-fluid .span8.pull-right,
-  .row-fluid .span9.pull-right {
-    float: none;
-  }
-  // Undo negative margin on rows and thumbnails
-  .row {
-    margin-left: 0;
-  }
-  // Make all grid-sized elements block level again
-  [class*="span"],
-  .row-fluid [class*="span"] {
-    float: none;
-    display: block;
-    width: 100%;
-    margin-left: 0;
-    .box-sizing(border-box);
-  }
+    // GRID & CONTAINERS
+    // -----------------
+    // Remove width from containers
+    .container {
+        width: auto;
+    }
+    // Fluid rows
+    .row-fluid {
+        width: 100%;
+    }
+    .row-fluid .span8.pull-right,
+    .row-fluid .span9.pull-right {
+        float: none;
+    }
+    // Undo negative margin on rows and thumbnails
+    .row {
+        margin-left: 0;
+    }
+    // Make all grid-sized elements block level again
+    [class*="span"],
+    .row-fluid [class*="span"] {
+        float: none;
+        display: block;
+        width: 100%;
+        margin-left: 0;
+        .box-sizing(border-box);
+    }
 
     // We need to specify a more specific selector to reset the width for
     // cases when we have content in the side-pre blockregion but not in the
@@ -726,16 +726,16 @@
         }
     }
 
-  .row-fluid .span12 {
-    width: 100%;
-    .box-sizing(border-box);
-  }
-  .row-fluid [class*="offset"]:first-child {
-    margin-left: 0;
-  }
-  div[role=main] {
-      margin-bottom: 1em;
-  }
+    .row-fluid .span12 {
+        width: 100%;
+        .box-sizing(border-box);
+    }
+    .row-fluid [class*="offset"]:first-child {
+        margin-left: 0;
+    }
+    div[role=main] {
+        margin-bottom: 1em;
+    }
     .coursebox {
         .info {
             .name {
@@ -824,9 +824,9 @@
         }
     }
 
-   #page-mod-forum-discuss.dir-rtl .discussioncontrols {
-       text-align: left;
-   }
+    #page-mod-forum-discuss.dir-rtl .discussioncontrols {
+        text-align: left;
+    }
 }
 
 
diff --git a/theme/bootstrapbase/less/moodle/templates.less b/theme/bootstrapbase/less/moodle/templates.less
index a3829b12ca3..09a513bd836 100644
--- a/theme/bootstrapbase/less/moodle/templates.less
+++ b/theme/bootstrapbase/less/moodle/templates.less
@@ -2,48 +2,48 @@
 
 // RTL styles for column templates.
 #grid {
-  // A mixin to set styles for the fluid row when RTL language enabled.
-  .fluid-rtl(@fluidGridColumnWidth, @fluidGridGutterWidth) {
-    .dir-rtl {
-      .row-fluid.rtl-compatible {
-        [class*="span"] {
-          float: right;
-          margin-left: 0;
-          *margin-left: 0;
-          margin-right: @fluidGridGutterWidth;
-          *margin-right: @fluidGridGutterWidth - (.5 / @gridRowWidth * 100 * 1%);
+    // A mixin to set styles for the fluid row when RTL language enabled.
+    .fluid-rtl(@fluidGridColumnWidth, @fluidGridGutterWidth) {
+        .dir-rtl {
+            .row-fluid.rtl-compatible {
+                [class*="span"] {
+                    float: right;
+                    margin-left: 0;
+                    *margin-left: 0;
+                    margin-right: @fluidGridGutterWidth;
+                    *margin-right: @fluidGridGutterWidth - (.5 / @gridRowWidth * 100 * 1%);
+                }
+                [class*="span"]:first-child {
+                    margin-right: 0;
+                }
+            }
         }
-        [class*="span"]:first-child {
-          margin-right: 0;
-        }
-      }
     }
-  }
 }
 
 // Style for template 3 columns auto.
 .columns-autoflow-1to1to1 {
-  .content-columns(3);
+    .content-columns(3);
 }
 
 @media(max-width: 767px) {
-  // Change to a single column for smaller screens.
-  .columns-autoflow-1to1to1 {
-    .content-columns(1, 0);
-  }
+    // Change to a single column for smaller screens.
+    .columns-autoflow-1to1to1 {
+        .content-columns(1, 0);
+    }
 }
 
 @media (min-width: 768px) and (max-width: 979px) {
-  // Include fluid-rtl mixin from grid namespace.
-  #grid > .fluid-rtl(@fluidGridColumnWidth768, @fluidGridGutterWidth768);
+    // Include fluid-rtl mixin from grid namespace.
+    #grid > .fluid-rtl(@fluidGridColumnWidth768, @fluidGridGutterWidth768);
 }
 
 @media (min-width: 980px) and (max-width: 1199px) {
-  // Include fluid-rtl mixin from grid namespace.
-  #grid > .fluid-rtl(@fluidGridColumnWidth, @fluidGridGutterWidth);
+    // Include fluid-rtl mixin from grid namespace.
+    #grid > .fluid-rtl(@fluidGridColumnWidth, @fluidGridGutterWidth);
 }
 
 @media (min-width: 1200px) {
-  // Include fluid-rtl mixin from grid namespace.
-  #grid > .fluid-rtl(@fluidGridColumnWidth1200, @fluidGridGutterWidth1200);
+    // Include fluid-rtl mixin from grid namespace.
+    #grid > .fluid-rtl(@fluidGridColumnWidth1200, @fluidGridGutterWidth1200);
 }
diff --git a/theme/bootstrapbase/less/moodle/undo.less b/theme/bootstrapbase/less/moodle/undo.less
index 40e91eb0a82..18726b1988d 100644
--- a/theme/bootstrapbase/less/moodle/undo.less
+++ b/theme/bootstrapbase/less/moodle/undo.less
@@ -9,19 +9,19 @@
 
 li.activity.label,
 .file-picker td.label {
-  background: inherit;
-  color: inherit;
-  border: inherit;
-  text-shadow: none;
-  padding: 8px;
-  white-space: normal;
-  display: block;
-  font-size: inherit;
-  line-height: inherit;
+    background: inherit;
+    color: inherit;
+    border: inherit;
+    text-shadow: none;
+    padding: 8px;
+    white-space: normal;
+    display: block;
+    font-size: inherit;
+    line-height: inherit;
 }
 .file-picker td.label {
-  display: table-cell;
-  text-align: right;
+    display: table-cell;
+    text-align: right;
 }
 
 // Some of this dialog is sized in ems so a different font size
@@ -56,8 +56,8 @@ li.activity.label,
 li.section.hidden,
 .block.hidden,
 .block.invisible {
-  visibility: visible;
-  display: block;
+    visibility: visible;
+    display: block;
 }
 
 
@@ -72,14 +72,14 @@ li.section.hidden,
 
 #turnitintool_style .row,
 .forumpost .row {
-  margin-left: 0 !important;
-  // not sure if this needs !important
+    margin-left: 0 !important;
+    // not sure if this needs !important
 }
 #turnitintool_style .row:before,
 #turnitintool_style .row:after,
 .forumpost .row:before,
 .forumpost .row:after {
-  content: none;
+    content: none;
 }
 /* fieldset.hidden vs .hidden
  *
@@ -201,4 +201,4 @@ ol {
     ol {
         margin: 0 2.5em @baseLineHeight / 2 0;
     }
-}
\ No newline at end of file
+}