Merge pull request #510 from greenpeace/stylelint

Fix stylelint recursive path
greenpeace · Feb 22, 2021 · 4afee26 · 4afee26
2 parents 8c125ce + b54ef7e
commit 4afee26
Show file tree

Hide file tree

Showing 8 changed files with 523 additions and 542 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -180,7 +180,7 @@ jobs:
       - run:
           name: Lint CSS
           when: always
-          command: stylelint assets/src/**/*.scss
+          command: stylelint "assets/src/styles/**/*.scss"
       - run:
           name: Lint JS
           when: always

diff --git a/assets/src/styles/blocks/Covers/TakeActionCovers.scss b/assets/src/styles/blocks/Covers/TakeActionCovers.scss
@@ -238,7 +238,6 @@
 }
 
 .cover-card-tag {
-
   --block-covers--card-tag-- {
     color: $yellow;
   }

diff --git a/assets/src/styles/campaigns/themes/_theme_oceans.scss b/assets/src/styles/campaigns/themes/_theme_oceans.scss
@@ -355,6 +355,11 @@ body.theme-oceans {
   }
 
   .columns-block.block-style-no_image {
+    @include campaign_columns_style_no_image($montserrat, $oceans-blue, 400);
+
+    font-size: 1.875rem;
+    line-height: 2.25rem;
+
     .column-wrap {
       .btn-primary {
         @extend .btn-primary;
@@ -388,13 +393,6 @@ body.theme-oceans {
     }
   }
 
-  .columns-block.block-style-no_image {
-    @include campaign_columns_style_no_image($montserrat, $oceans-blue, 400);
-
-    font-size: 1.875rem;
-    line-height: 2.25rem;
-  }
-
   .video-block {
     @include campaign_video($oceans-aqua);
   }

diff --git a/assets/src/styles/campaigns/themes/_theme_plastic.scss b/assets/src/styles/campaigns/themes/_theme_plastic.scss
@@ -1,7 +1,8 @@
 :root {
-  --link--color: #BD3DBD;
+  --link--color: #bd3dbd;
   --link-hover--color: #963196;
 }
+
 body.theme-plastic {
   $montserrat: "Montserrat", sans-serif;
 

diff --git a/assets/src/styles/vendors/photoswipe/_main-settings.scss b/assets/src/styles/vendors/photoswipe/_main-settings.scss
@@ -2,11 +2,11 @@
 
 $pswp__show-hide-transition-duration: 333ms !default;
 $pswp__controls-transition-duration: 333ms !default;
-$pswp__background-color: rgba(0 ,0 ,0 ,.85) !default;
+$pswp__background-color: rgba(0, 0, 0, .85) !default;
 $pswp__placeholder-color: #111 !default;
 $pswp__box-sizing-border-box: true !default; // disable .pswp * { box-sizing:border-box } (in case you already have it in your site css)
-$pswp__root-z-index: 150000 !default; 
-$pswp__assets-path: '../../public/images/vendors/photoswipe/' !default; // path to skin assets folder (preloader, PNG and SVG sprite)
+$pswp__root-z-index: 150000 !default;
+$pswp__assets-path: "../../public/images/vendors/photoswipe/" !default; // path to skin assets folder (preloader, PNG and SVG sprite)
 $pswp__error-text-color: #111 !default; // "Image not loaded" text color
 $pswp__include-minimal-style: true !default;
 

diff --git a/assets/src/styles/vendors/photoswipe/main.scss b/assets/src/styles/vendors/photoswipe/main.scss
@@ -2,200 +2,200 @@
 
 /* pswp = photoswipe */
 .pswp {
-	display: none;
-	position:absolute;
-	width: 100%;
-	height: 100%;
-	left:0;
-	top:0;
-	overflow: hidden;
-	-ms-touch-action: none;
-	touch-action: none;
-	z-index: $pswp__root-z-index;
-	-webkit-text-size-adjust: 100%;
-	/* create separate layer, to avoid paint on window.onscroll in webkit/blink */
-	-webkit-backface-visibility: hidden;
-	outline: none;
-
-	@if $pswp__box-sizing-border-box == true {
-		* {
-			box-sizing: border-box;
-		}
-	}
-
-	img {
-		max-width: none;
-	}
+  display: none;
+  position: absolute;
+  width: 100%;
+  height: 100%;
+  left: 0;
+  top: 0;
+  overflow: hidden;
+  -ms-touch-action: none;
+  touch-action: none;
+  z-index: $pswp__root-z-index;
+  -webkit-text-size-adjust: 100%;
+  /* create separate layer, to avoid paint on window.onscroll in webkit/blink */
+  -webkit-backface-visibility: hidden;
+  backface-visibility: hidden;
+  outline: none;
+
+  @if $pswp__box-sizing-border-box == true {
+    * {
+      box-sizing: border-box;
+    }
+  }
+
+  img {
+    max-width: none;
+  }
 }
 
 /* style is added when JS option showHideOpacity is set to true */
 .pswp--animate_opacity {
-	/* 0.001, because opacity:0 doesn't trigger Paint action, which causes lag at start of transition */
-	opacity: 0.001;
-	will-change:opacity;
-	/* for open/close transition */
-	transition: opacity $pswp__show-hide-transition-duration cubic-bezier(.4,0,.22,1);
+  /* 0.001, because opacity:0 doesn't trigger Paint action, which causes lag at start of transition */
+  opacity: 0.001;
+  will-change: opacity;
+  /* for open/close transition */
+  transition: opacity $pswp__show-hide-transition-duration cubic-bezier(.4, 0, .22, 1);
 }
 
 .pswp--open {
-	display: block;
+  display: block;
 }
 
 .pswp--zoom-allowed .pswp__img {
-	/* autoprefixer: off */
-	cursor: -webkit-zoom-in;
-	cursor: -moz-zoom-in;
-	cursor: zoom-in;
+  /* autoprefixer: off */
+  cursor: -webkit-zoom-in;
+  cursor: -moz-zoom-in;
+  cursor: zoom-in;
 }
 
 .pswp--zoomed-in .pswp__img {
-	/* autoprefixer: off */
-	cursor: -webkit-grab;
-	cursor: -moz-grab;
-	cursor: grab;
+  /* autoprefixer: off */
+  cursor: -webkit-grab;
+  cursor: -moz-grab;
+  cursor: grab;
 }
 
 .pswp--dragging  .pswp__img {
-	/* autoprefixer: off */
-	cursor: -webkit-grabbing;
-	cursor: -moz-grabbing;
-	cursor: grabbing;
+  /* autoprefixer: off */
+  cursor: -webkit-grabbing;
+  cursor: -moz-grabbing;
+  cursor: grabbing;
 }
 
 /*
-	Background is added as a separate element.
-	As animating opacity is much faster than animating rgba() background-color.
+  Background is added as a separate element.
+  As animating opacity is much faster than animating rgba() background-color.
 */
+
 .pswp__bg {
-	position: absolute;
-	left: 0;
-	top: 0;
-	width: 100%;
-	height: 100%;
-	background: $pswp__background-color;
-	opacity: 0;
-	transform: translateZ(0);
-	-webkit-backface-visibility: hidden;
-	will-change: opacity;
+  position: absolute;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  background: $pswp__background-color;
+  opacity: 0;
+  transform: translateZ(0);
+  -webkit-backface-visibility: hidden;
+  backface-visibility: hidden;
+  will-change: opacity;
+  /* for open/close transition */
+  transition: opacity $pswp__show-hide-transition-duration cubic-bezier(.4, 0, .22, 1);
 }
 
 .pswp__scroll-wrap {
-	position: absolute;
-	left: 0;
-	top: 0;
-	width: 100%;
-	height: 100%;
-	overflow:hidden;
+  position: absolute;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  overflow: hidden;
 }
 
 .pswp__container,
 .pswp__zoom-wrap {
-	-ms-touch-action: none;
-	touch-action: none;
-	position: absolute;
-	left: 0;
-	right: 0;
-	top: 0;
-	bottom: 0;
+  -ms-touch-action: none;
+  touch-action: none;
+  position: absolute;
+  left: 0;
+  right: 0;
+  top: 0;
+  bottom: 0;
+  -webkit-backface-visibility: hidden;
+  backface-visibility: hidden;
 }
 
 /* Prevent selection and tap highlights */
 .pswp__container,
 .pswp__img {
-	-webkit-user-select: none;
-	-moz-user-select: none;
-	user-select: none;
-	-webkit-tap-highlight-color: rgba(0,0,0,0);
-	-webkit-touch-callout: none;
+  -webkit-user-select: none;
+  -moz-user-select: none;
+  user-select: none;
+  -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
+  -webkit-touch-callout: none;
 }
 
 .pswp__zoom-wrap {
-	position: absolute;
-	width: 100%;
-	-webkit-transform-origin: left top;
-	-moz-transform-origin: left top;
-	-ms-transform-origin: left top;
-	transform-origin: left top;
-	/* for open/close transition */
-	transition: transform $pswp__show-hide-transition-duration cubic-bezier(.4,0,.22,1);
-}
-
-.pswp__bg {
-	will-change: opacity;
-	/* for open/close transition */
-	transition: opacity $pswp__show-hide-transition-duration cubic-bezier(.4,0,.22,1);
+  position: absolute;
+  width: 100%;
+  -webkit-transform-origin: left top;
+  -moz-transform-origin: left top;
+  -ms-transform-origin: left top;
+  transform-origin: left top;
+  /* for open/close transition */
+  transition: transform $pswp__show-hide-transition-duration cubic-bezier(.4, 0, .22, 1);
 }
 
 .pswp--animated-in {
-	.pswp__bg,
-	.pswp__zoom-wrap {
-		-webkit-transition: none;
-		transition: none;
-	}
-}
-
-.pswp__container,
-.pswp__zoom-wrap {
-	-webkit-backface-visibility: hidden;
+  .pswp__bg,
+  .pswp__zoom-wrap {
+    -webkit-transition: none;
+    transition: none;
+  }
 }
 
 .pswp__item {
-	position: absolute;
-	left: 0;
-	right: 0;
-	top: 0;
-	bottom: 0;
-	overflow: hidden;
+  position: absolute;
+  left: 0;
+  right: 0;
+  top: 0;
+  bottom: 0;
+  overflow: hidden;
 }
 
 .pswp__img {
-	position: absolute;
-	width: auto;
-	height: auto;
-	top: 0;
-	left: 0;
+  position: absolute;
+  width: auto;
+  height: auto;
+  top: 0;
+  left: 0;
 }
 
 /*
-	stretched thumbnail or div placeholder element (see below)
-	style is added to avoid flickering in webkit/blink when layers overlap
+  stretched thumbnail or div placeholder element (see below)
+  style is added to avoid flickering in webkit/blink when layers overlap
 */
+
 .pswp__img--placeholder {
-	-webkit-backface-visibility: hidden;
+  -webkit-backface-visibility: hidden;
+  backface-visibility: hidden;
 }
 
 /*
-	div element that matches size of large image
-	large image loads on top of it
+  div element that matches size of large image
+  large image loads on top of it
 */
+
 .pswp__img--placeholder--blank {
-	background: $pswp__placeholder-color;
+  background: $pswp__placeholder-color;
 }
 
 .pswp--ie .pswp__img {
-	width: 100% !important;
-	height: auto !important;
-	left: 0;
-	top: 0;
+  width: 100% !important;
+  height: auto !important;
+  left: 0;
+  top: 0;
 }
 
 /*
-	Error message appears when image is not loaded
-	(JS option errorMsg controls markup)
+  Error message appears when image is not loaded
+  (JS option errorMsg controls markup)
 */
+
 .pswp__error-msg {
-	position: absolute;
-	left: 0;
-	top: 50%;
-	width: 100%;
-	text-align: center;
-	font-size: 14px;
-	line-height: 16px;
-	margin-top: -8px;
-	color: $pswp__error-text-color;
+  position: absolute;
+  left: 0;
+  top: 50%;
+  width: 100%;
+  text-align: center;
+  font-size: 14px;
+  line-height: 16px;
+  margin-top: -8px;
+  color: $pswp__error-text-color;
 }
 
 .pswp__error-msg a {
-	color: $pswp__error-text-color;
-	text-decoration: underline;
+  color: $pswp__error-text-color;
+  text-decoration: underline;
 }