diff --git a/.scss-lint.yml b/.scss-lint.yml index 180d377d6f86a18d7f8d8e9c3ed559dd0d3e4abc..3df66033fa8de23d5223a07d88e538932ebb1ce8 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 6d497b571c0ff8be3a5253a23dd510609a9c1f91..e4d766ead9fe9689bbb53145d9cc49d000d3338e 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 138e506e428cd569636da2daa3937fd459b32498..437621299e037b46e51b9c26ca580a8d7bb6e5fd 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 e08912e72abafecbe265e2cf2a8e2243f8604991..6f09d949a5177f43d6afa453c249bcbd08fbff68 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 998c37cd455d65ef721b802bb93522981059a216..1937c250e0b77f10a647c8947ad18deec8d36ab9 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; }