Fix scss_lint

5 files changed, 13 insertions, 9 deletions

diff --git a/.scss-lint.yml b/.scss-lint.yml
index 180d377d6f8..3df66033fa8 100644
--- a/.scss-lint.yml
+++ b/.scss-lint.yml
@@ -46,8 +46,9 @@ linters:
   # - properties
   # - @include declarations with inner @content
   # - nested rule sets.
+  # Disabled to minimize Bootstrap migration footprint
   DeclarationOrder:
-    enabled: true
+    enabled: false
 
   # `scss-lint:disable` control comments should be preceded by a comment
   # explaining why these linters are being disabled for this file.
diff --git a/app/assets/stylesheets/bootstrap_migration.scss b/app/assets/stylesheets/bootstrap_migration.scss
index 6d497b571c0..e4d766ead9f 100644
--- a/app/assets/stylesheets/bootstrap_migration.scss
+++ b/app/assets/stylesheets/bootstrap_migration.scss
@@ -24,7 +24,10 @@ html {
   font-size: 14px;
 }
 
-button, html [type="button"], [type="reset"], [type="submit"] {
+button,
+html [type="button"],
+[type="reset"],
+[type="submit"] {
   // Override bootstrap reboot
   -webkit-appearance: inherit;
 }
diff --git a/app/assets/stylesheets/pages/editor.scss b/app/assets/stylesheets/pages/editor.scss
index 138e506e428..437621299e0 100644
--- a/app/assets/stylesheets/pages/editor.scss
+++ b/app/assets/stylesheets/pages/editor.scss
@@ -111,7 +111,7 @@
 }
 
 
-@include media-breakpoint-down(xs){
+@include media-breakpoint-down(xs) {
   .file-editor {
     .file-title {
       .float-right {
diff --git a/app/assets/stylesheets/pages/note_form.scss b/app/assets/stylesheets/pages/note_form.scss
index e08912e72ab..6f09d949a51 100644
--- a/app/assets/stylesheets/pages/note_form.scss
+++ b/app/assets/stylesheets/pages/note_form.scss
@@ -185,12 +185,12 @@
 }
 
 .notes.notes-form > li.timeline-entry {
-  @include notes-media('max', map-get($grid-breakpoints, md)-1) {
+  @include notes-media('max', map-get($grid-breakpoints, md) - 1) {
     padding: 0;
   }
 
   .timeline-content {
-    @include notes-media('max', map-get($grid-breakpoints, md)-1) {
+    @include notes-media('max', map-get($grid-breakpoints, md) - 1) {
       margin: 0;
     }
   }
diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss
index 998c37cd455..1937c250e0b 100644
--- a/app/assets/stylesheets/pages/notes.scss
+++ b/app/assets/stylesheets/pages/notes.scss
@@ -408,7 +408,7 @@ ul.notes {
   display: flex;
   justify-content: space-between;
 
-  @include notes-media('max', map-get($grid-breakpoints, sm)-1) {
+  @include notes-media('max', map-get($grid-breakpoints, sm) - 1) {
     flex-flow: row wrap;
   }
 }
@@ -427,7 +427,7 @@ ul.notes {
 }
 
 .note-header-author-name {
-  @include notes-media('max', map-get($grid-breakpoints, sm)-1) {
+  @include notes-media('max', map-get($grid-breakpoints, sm) - 1) {
     display: none;
   }
 }
@@ -473,7 +473,7 @@ ul.notes {
   margin-left: 10px;
   color: $gray-darkest;
 
-  @include notes-media('max', map-get($grid-breakpoints, lg)-1) {
+  @include notes-media('max', map-get($grid-breakpoints, lg) - 1) {
     float: none;
     margin-left: 0;
   }
@@ -491,7 +491,7 @@ ul.notes {
   margin-left: 10px;
   color: $gray-darkest;
 
-  @include notes-media('max', map-get($grid-breakpoints, sm)-1) {
+  @include notes-media('max', map-get($grid-breakpoints, sm) - 1) {
     float: none;
     margin-left: 0;
   }