feature/sd-20: applied pr changes.

silverstripe · Mar 26, 2019 · 51951fc · 51951fc
1 parent 394599a
commit 51951fc
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 25 deletions.
diff --git a/dist/css/main.css b/dist/css/main.css
@@ -13845,18 +13845,6 @@ body > header .open > a:focus {
   color: #fff;
 }
 
-.element-holder {
-  margin: 3rem 0;
-}
-
-.element-holder:first-child {
-  margin-top: 0;
-}
-
-.element-holder:last-child {
-  margin-bottom: 0;
-}
-
 body.theme-font-nunito {
   font-family: "Nunito Sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
 }
@@ -18761,3 +18749,7 @@ body.theme-accent-white .main .pagination .active a {
 .content-block__title {
   font-size: 1.8rem;
 }
+
+.element-holder {
+  margin: 0 0 3rem;
+}
diff --git a/src/scss/components/elemental.scss b/src/scss/components/elemental.scss
@@ -0,0 +1,3 @@
+.element-holder {
+  margin: 0 0 3rem;
+}
diff --git a/src/scss/main.scss b/src/scss/main.scss
@@ -75,7 +75,6 @@
 
 // Watea theme mixins
 @import "./utils/mixins";
-@import "./utils/elemental";
 
 // Watea theme styles
 @import "./typography";
@@ -86,3 +85,4 @@
 @import "./components/nav";
 @import "./components/pages";
 @import "./components/content-block";
+@import "./components/elemental";
diff --git a/src/scss/utils/elemental.scss b/src/scss/utils/elemental.scss
diff --git a/webpack.mix.js b/webpack.mix.js
@@ -3,7 +3,7 @@ const mix = require('laravel-mix').mix;
 mix
   .js('src/js/main.js', 'dist/js/main.js')
   .sass('src/scss/main.scss', 'dist/css/main.css')
-  .sass("src/scss/editor.scss", "dist/css/editor.css")
+  .sass('src/scss/editor.scss', 'dist/css/editor.css')
   .options({ processCssUrls: false });
 
 mix.webpackConfig({