Added classes to hide bg-ext classes at breakpoints. Removed redundan…

…t custom settings file.
samwilliscreative · Jun 12, 2017 · 836c689 · 836c689
1 parent 856d910
commit 836c689
Show file tree

Hide file tree

Showing 8 changed files with 135 additions and 143 deletions.
diff --git a/dist/css/zebra.css b/dist/css/zebra.css
diff --git a/dist/css/zebra.css.map b/dist/css/zebra.css.map
diff --git a/dist/css/zebra.min.css b/dist/css/zebra.min.css
diff --git a/dist/css/zebra.min.css.map b/dist/css/zebra.min.css.map
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "zebra-scss",
-  "version": "6.0.3",
+  "version": "6.1.0",
   "description": "A customizable CSS grid system based on the BEM methodology",
   "author": "Sam Willis",
   "scripts": {

diff --git a/src/sass/_zebra-custom.scss b/src/sass/_zebra-custom.scss
diff --git a/src/sass/_zebra-settings.scss b/src/sass/_zebra-settings.scss
@@ -4,7 +4,7 @@
 
     // NOTES:
     // Do not make changes to this file, as they will be overwritten if you were to update Zebra.
-    // Any custom settings should be set in "_zebra-custom.scss"
+    // Any custom settings should be set in your projects own "_zebra-custom.scss"
 
 /* NOTES END */
 

diff --git a/src/sass/_zebra.scss b/src/sass/_zebra.scss
@@ -2,10 +2,6 @@
 /* IMPORT SETTINGS */
 /*******************/
 
-    // Import custom user settings
-    // This needs to be before the defaults are imported  so that any undeclared custom settings will use the Zebra defaults instead
-    @import "zebra-custom";
-
     // Import the default Zebra settings
     @import "zebra-settings";
 
@@ -474,10 +470,6 @@
                                 &--l, &--r {
                                     position: relative;
                                 }
-                            }
-                        }
-                        &-ext {
-                            &__#{nth($zeb-media-width-names, $i)} {
                                 &--l {
                                     position: relative;
                                     background-position: left top;
@@ -492,10 +484,6 @@
                                         background-position: right top;
                                     }
                                 }
-                            }
-                        }
-                        &-ext {
-                            &__#{nth($zeb-media-width-names, $i)} {
                                 &--r {
                                     position: relative;
                                     background-position: right top;
@@ -510,6 +498,11 @@
                                         background-position: left top;
                                     }
                                 }
+                                &--none {
+                                    &:before, &:after {
+                                        display: none;
+                                    }
+                                }
                             }
                         }
                     }