Revert "Develop to Master"

govau · May 20, 2021 · 880f7de · 880f7de
1 parent f952b8c
commit 880f7de
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 43 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -147,4 +147,4 @@ workflows:
             branches:
               only: master                                # and only on the `master` branch
           requires:
-            - build-and-test-auds
+            - build-and-test-auds
diff --git a/packages/core/src/sass/_globals.scss b/packages/core/src/sass/_globals.scss
@@ -588,8 +588,8 @@ $dependencies: (
 		@error "Captain I’m giving it all she’s got but; the AU-media mixin only takes a string!";
 	}
 
-	@if $breakpoint != 'xs' and $breakpoint != 'sm' and $breakpoint != 'md' and $breakpoint != 'lg' and $breakpoint != 'xl' {
-		@error "There’s no crying in baseball; the AU-media mixin only takes the following breakpoint strings: xs, sm, md, lg, xl";
+	@if $breakpoint != 'xs' and $breakpoint != 'sm' and $breakpoint != 'md' and $breakpoint != 'lg' {
+		@error "There’s no crying in baseball; the AU-media mixin only takes the following breakpoint strings: xs, sm, md, lg";
 	}
 
 	@if( $breakpoint == "xs" ) {
@@ -615,13 +615,6 @@ $dependencies: (
 			@content;
 		}
 	}
-
-	@if( $breakpoint == "xl" ) {
-		@media (min-width: $AU-media-xl) {
-			@content;
-		}
-	}
-
 }
 
 
@@ -727,12 +720,11 @@ $AU-pixelfallback: true !default;
 /**
  * AU-media Breakpoints
  */
+$AU-media-xs: 576px !default; // media query breakpoints
+$AU-media-sm: 768px !default;
+$AU-media-md: 992px !default;
+$AU-media-lg: 1200px !default;
 
- $AU-media-xs: 0;
- $AU-media-sm: 576px; // media query breakpoints
- $AU-media-md: 768px;
- $AU-media-lg: 992px;
- $AU-media-xl: 1200px;
 
 /**
  * AU-rem value used for REM calculation
@@ -876,4 +868,4 @@ $AU-color-info:    #00bfe9 !default;
 /**
  * AU-border-radius styles
  */
-$AU-border-radius: $AU-unit + 0px !default;
+$AU-border-radius: $AU-unit + 0px !default;
diff --git a/packages/core/tests/site/test.scss b/packages/core/tests/site/test.scss
@@ -16,7 +16,6 @@ html {
 //--------------------------------------------------------------------------------------------------------------------------------------------------------------
 // BREAKPOINT TEST
 //--------------------------------------------------------------------------------------------------------------------------------------------------------------
-.xs-only,
 .sm-only,
 .md-only,
 .lg-only,
@@ -25,13 +24,6 @@ html {
 }
 
 @include AU-media( xs ) {
-	.xs-only {
-		display: block;
-	}
-}
-
-@include AU-media( sm ) {
-
 	.xs-only {
 		display: none;
 	}
@@ -41,8 +33,7 @@ html {
 	}
 }
 
-@include AU-media( md ) {
-
+@include AU-media( sm ) {
 	.sm-only {
 		display: none;
 	}
@@ -52,8 +43,7 @@ html {
 	}
 }
 
-@include AU-media( lg ) {
-
+@include AU-media( md ) {
 	.md-only {
 		display: none;
 	}
@@ -63,8 +53,7 @@ html {
 	}
 }
 
-@include AU-media( xl ) {
-
+@include AU-media( lg ) {
 	.lg-only {
 		display: none;
 	}
@@ -74,6 +63,7 @@ html {
 	}
 }
 
+
 //--------------------------------------------------------------------------------------------------------------------------------------------------------------
 // font families
 //--------------------------------------------------------------------------------------------------------------------------------------------------------------

diff --git a/packages/grid-12/src/sass/_dependencies.scss b/packages/grid-12/src/sass/_dependencies.scss
@@ -1,4 +1,4 @@
-
+//dependencies
 @import '../../../core/src/sass/_module.scss';
 
 //this module

diff --git a/packages/grid-12/src/sass/_globals.scss b/packages/grid-12/src/sass/_globals.scss
@@ -25,6 +25,7 @@ $dependencies: (
 $AU-grid-12-columns: 12 !default;        //column amounts
 $AU-grid-12-gutter-width: 24px !default; //gutter space
 
+
 //--------------------------------------------------------------------------------------------------------------------------------------------------------------
 // Mixins and grid class generation
 //--------------------------------------------------------------------------------------------------------------------------------------------------------------

diff --git a/packages/grid-12/src/sass/_module.scss b/packages/grid-12/src/sass/_module.scss
@@ -19,10 +19,6 @@
 	.container {
 		box-sizing: border-box;
 
-		@include AU-media( xs ) {
-			width: ( $AU-media-xs - $AU-grid-12-gutter-width );
-		}
-
 		@include AU-media( sm ) {
 			width: ( $AU-media-sm - $AU-grid-12-gutter-width );
 		}
@@ -34,10 +30,6 @@
 		@include AU-media( lg ) {
 			width: ( $AU-media-lg - $AU-grid-12-gutter-width );
 		}
-
-		@include AU-media( xl ) {
-			width: ( $AU-media-xl - $AU-grid-12-gutter-width );
-		}
 	}
 
 	//create both containers
@@ -82,8 +74,4 @@
 	@include AU-media( lg ) {
 		@include AU-grid-12-make-grid( lg );
 	}
-
-	@include AU-media( xl ) {
-		@include AU-grid-12-make-grid( xl );
-	}
 }