Run prettier against all of our stylesheetsprettify-stylesheets

1 files changed, 76 insertions, 101 deletions

diff --git a/app/assets/stylesheets/pages/merge_conflicts.scss b/app/assets/stylesheets/pages/merge_conflicts.scss
index d26659701e1..603c97d85ed 100644
--- a/app/assets/stylesheets/pages/merge_conflicts.scss
+++ b/app/assets/stylesheets/pages/merge_conflicts.scss
@@ -1,100 +1,76 @@
 // Disabled to use the color map for creating color schemes
 // scss-lint:disable ColorVariable
 $colors: (
-  white-header-head-neutral   : #e1fad7,
-  white-line-head-neutral     : #effdec,
-  white-button-head-neutral   : #9adb84,
-
-  white-header-head-chosen    : #baf0a8,
-  white-line-head-chosen      : #e1fad7,
-  white-button-head-chosen    : #52c22d,
-
-  white-header-origin-neutral : #e0f0ff,
-  white-line-origin-neutral   : #f2f9ff,
-  white-button-origin-neutral : #87c2fa,
-
-  white-header-origin-chosen  : #add8ff,
-  white-line-origin-chosen    : #e0f0ff,
-  white-button-origin-chosen  : #268ced,
-
-  white-header-not-chosen     : #f0f0f0,
-  white-line-not-chosen       : $gray-light,
-
-  dark-header-head-neutral   : rgba(#3f3, .2),
-  dark-line-head-neutral     : rgba(#3f3, .1),
-  dark-button-head-neutral   : #40874f,
-
-  dark-header-head-chosen    : rgba(#3f3, .33),
-  dark-line-head-chosen      : rgba(#3f3, .2),
-  dark-button-head-chosen    : #258537,
-
-  dark-header-origin-neutral : rgba(#2878c9, .4),
-  dark-line-origin-neutral   : rgba(#2878c9, .3),
-  dark-button-origin-neutral : #2a5c8c,
-
-  dark-header-origin-chosen  : rgba(#2878c9, .6),
-  dark-line-origin-chosen    : rgba(#2878c9, .4),
-  dark-button-origin-chosen  : #1d6cbf,
-
-  dark-header-not-chosen     : rgba(#fff, .25),
-  dark-line-not-chosen       : rgba(#fff, .1),
-
-  monokai-header-head-neutral   : rgba(#a6e22e, .25),
-  monokai-line-head-neutral     : rgba(#a6e22e, .1),
-  monokai-button-head-neutral   : #376b20,
-
-  monokai-header-head-chosen    : rgba(#a6e22e, .4),
-  monokai-line-head-chosen      : rgba(#a6e22e, .25),
-  monokai-button-head-chosen    : #39800d,
-
-  monokai-header-origin-neutral : rgba(#60d9f1, .35),
-  monokai-line-origin-neutral   : rgba(#60d9f1, .15),
-  monokai-button-origin-neutral : #38848c,
-
-  monokai-header-origin-chosen  : rgba(#60d9f1, .5),
-  monokai-line-origin-chosen    : rgba(#60d9f1, .35),
-  monokai-button-origin-chosen  : #3ea4b2,
-
-  monokai-header-not-chosen     : rgba(#76715d, .24),
-  monokai-line-not-chosen       : rgba(#76715d, .1),
-
-  solarized-light-header-head-neutral   : rgba(#859900, .37),
-  solarized-light-line-head-neutral     : rgba(#859900, .2),
-  solarized-light-button-head-neutral   : #afb262,
-
-  solarized-light-header-head-chosen    : rgba(#859900, .5),
-  solarized-light-line-head-chosen      : rgba(#859900, .37),
-  solarized-light-button-head-chosen    : #94993d,
-
-  solarized-light-header-origin-neutral : rgba(#2878c9, .37),
-  solarized-light-line-origin-neutral   : rgba(#2878c9, .15),
-  solarized-light-button-origin-neutral : #60a1bf,
-
-  solarized-light-header-origin-chosen  : rgba(#2878c9, .6),
-  solarized-light-line-origin-chosen    : rgba(#2878c9, .37),
-  solarized-light-button-origin-chosen  : #2482b2,
-
-  solarized-light-header-not-chosen     : rgba(#839496, .37),
-  solarized-light-line-not-chosen       : rgba(#839496, .2),
-
-  solarized-dark-header-head-neutral   : rgba(#859900, .35),
-  solarized-dark-line-head-neutral     : rgba(#859900, .15),
-  solarized-dark-button-head-neutral   : #376b20,
-
-  solarized-dark-header-head-chosen    : rgba(#859900, .5),
-  solarized-dark-line-head-chosen      : rgba(#859900, .35),
-  solarized-dark-button-head-chosen    : #39800d,
-
-  solarized-dark-header-origin-neutral : rgba(#2878c9, .35),
-  solarized-dark-line-origin-neutral   : rgba(#2878c9, .15),
-  solarized-dark-button-origin-neutral : #086799,
-
-  solarized-dark-header-origin-chosen  : rgba(#2878c9, .6),
-  solarized-dark-line-origin-chosen    : rgba(#2878c9, .35),
-  solarized-dark-button-origin-chosen  : #0082cc,
-
-  solarized-dark-header-not-chosen     : rgba(#839496, .25),
-  solarized-dark-line-not-chosen       : rgba(#839496, .15)
+  white-header-head-neutral: #e1fad7,
+  white-line-head-neutral: #effdec,
+  white-button-head-neutral: #9adb84,
+  white-header-head-chosen: #baf0a8,
+  white-line-head-chosen: #e1fad7,
+  white-button-head-chosen: #52c22d,
+  white-header-origin-neutral: #e0f0ff,
+  white-line-origin-neutral: #f2f9ff,
+  white-button-origin-neutral: #87c2fa,
+  white-header-origin-chosen: #add8ff,
+  white-line-origin-chosen: #e0f0ff,
+  white-button-origin-chosen: #268ced,
+  white-header-not-chosen: #f0f0f0,
+  white-line-not-chosen: $gray-light,
+  dark-header-head-neutral: rgba(#3f3, 0.2),
+  dark-line-head-neutral: rgba(#3f3, 0.1),
+  dark-button-head-neutral: #40874f,
+  dark-header-head-chosen: rgba(#3f3, 0.33),
+  dark-line-head-chosen: rgba(#3f3, 0.2),
+  dark-button-head-chosen: #258537,
+  dark-header-origin-neutral: rgba(#2878c9, 0.4),
+  dark-line-origin-neutral: rgba(#2878c9, 0.3),
+  dark-button-origin-neutral: #2a5c8c,
+  dark-header-origin-chosen: rgba(#2878c9, 0.6),
+  dark-line-origin-chosen: rgba(#2878c9, 0.4),
+  dark-button-origin-chosen: #1d6cbf,
+  dark-header-not-chosen: rgba(#fff, 0.25),
+  dark-line-not-chosen: rgba(#fff, 0.1),
+  monokai-header-head-neutral: rgba(#a6e22e, 0.25),
+  monokai-line-head-neutral: rgba(#a6e22e, 0.1),
+  monokai-button-head-neutral: #376b20,
+  monokai-header-head-chosen: rgba(#a6e22e, 0.4),
+  monokai-line-head-chosen: rgba(#a6e22e, 0.25),
+  monokai-button-head-chosen: #39800d,
+  monokai-header-origin-neutral: rgba(#60d9f1, 0.35),
+  monokai-line-origin-neutral: rgba(#60d9f1, 0.15),
+  monokai-button-origin-neutral: #38848c,
+  monokai-header-origin-chosen: rgba(#60d9f1, 0.5),
+  monokai-line-origin-chosen: rgba(#60d9f1, 0.35),
+  monokai-button-origin-chosen: #3ea4b2,
+  monokai-header-not-chosen: rgba(#76715d, 0.24),
+  monokai-line-not-chosen: rgba(#76715d, 0.1),
+  solarized-light-header-head-neutral: rgba(#859900, 0.37),
+  solarized-light-line-head-neutral: rgba(#859900, 0.2),
+  solarized-light-button-head-neutral: #afb262,
+  solarized-light-header-head-chosen: rgba(#859900, 0.5),
+  solarized-light-line-head-chosen: rgba(#859900, 0.37),
+  solarized-light-button-head-chosen: #94993d,
+  solarized-light-header-origin-neutral: rgba(#2878c9, 0.37),
+  solarized-light-line-origin-neutral: rgba(#2878c9, 0.15),
+  solarized-light-button-origin-neutral: #60a1bf,
+  solarized-light-header-origin-chosen: rgba(#2878c9, 0.6),
+  solarized-light-line-origin-chosen: rgba(#2878c9, 0.37),
+  solarized-light-button-origin-chosen: #2482b2,
+  solarized-light-header-not-chosen: rgba(#839496, 0.37),
+  solarized-light-line-not-chosen: rgba(#839496, 0.2),
+  solarized-dark-header-head-neutral: rgba(#859900, 0.35),
+  solarized-dark-line-head-neutral: rgba(#859900, 0.15),
+  solarized-dark-button-head-neutral: #376b20,
+  solarized-dark-header-head-chosen: rgba(#859900, 0.5),
+  solarized-dark-line-head-chosen: rgba(#859900, 0.35),
+  solarized-dark-button-head-chosen: #39800d,
+  solarized-dark-header-origin-neutral: rgba(#2878c9, 0.35),
+  solarized-dark-line-origin-neutral: rgba(#2878c9, 0.15),
+  solarized-dark-button-origin-neutral: #086799,
+  solarized-dark-header-origin-chosen: rgba(#2878c9, 0.6),
+  solarized-dark-line-origin-chosen: rgba(#2878c9, 0.35),
+  solarized-dark-button-origin-chosen: #0082cc,
+  solarized-dark-header-not-chosen: rgba(#839496, 0.25),
+  solarized-dark-line-not-chosen: rgba(#839496, 0.15),
 );
 // scss-lint:enable ColorVariable
 
@@ -190,25 +166,24 @@ $colors: (
 }
 
 #conflicts {
-
   .white {
-    @include color-scheme('white')
+    @include color-scheme('white');
   }
 
   .dark {
-    @include color-scheme('dark')
+    @include color-scheme('dark');
   }
 
   .monokai {
-    @include color-scheme('monokai')
+    @include color-scheme('monokai');
   }
 
   .solarized-light {
-    @include color-scheme('solarized-light')
+    @include color-scheme('solarized-light');
   }
 
   .solarized-dark {
-    @include color-scheme('solarized-dark')
+    @include color-scheme('solarized-dark');
   }
 
   .diff-wrap-lines .line_content {
@@ -285,7 +260,7 @@ $colors: (
     }
 
     .resolve-info {
-      @media(max-width: map-get($grid-breakpoints, lg)-1) {
+      @media (max-width: map-get($grid-breakpoints, lg)-1) {
         margin-bottom: $gl-padding;
       }
     }