From ce979d1012bd812a37ddd87de0734097ae5e4c4d Mon Sep 17 00:00:00 2001 From: jomurgel Date: Fri, 4 May 2018 14:44:51 -0600 Subject: [PATCH] reverts `feature/scaffolding-improvements` branch merge into master --- assets/sass/base/_scaffolding.scss | 48 +- assets/scripts/admin-acf.min.js | 2 +- assets/scripts/project.js | 42 +- assets/scripts/project.min.js | 2 +- inc/scaffolding.php | 24 +- inc/template-tags.php | 15 - package-lock.json | 4890 ++++++++--------- .../scaffolding/scaffolding-forms.php | 20 - .../scaffolding/scaffolding-icons.php | 18 +- .../scaffolding/scaffolding-typography.php | 8 - 10 files changed, 2499 insertions(+), 2570 deletions(-) diff --git a/assets/sass/base/_scaffolding.scss b/assets/sass/base/_scaffolding.scss index bb9f9255f..01d0e069d 100644 --- a/assets/sass/base/_scaffolding.scss +++ b/assets/sass/base/_scaffolding.scss @@ -2,14 +2,6 @@ // Scaffolding Library //-------------------------------------------------------------- -//----------------------------------------- -// IE11 Tweak -//----------------------------------------- -.page-template-template-scaffolding .primary { - float: none; - width: 100%; -} - //----------------------------------------- // Scaffolding defaults //----------------------------------------- @@ -18,7 +10,7 @@ // The section
&-header { - border-bottom: rem(1) solid $color-alto; + border-bottom: rem(1) solid gray; display: flex; justify-content: space-between; margin-bottom: $gutter; @@ -48,16 +40,16 @@ // The
 container.
 		pre {
-			background-color: $color-white;
-			border: rem(1) solid $color-alto;
-			color: $color-silver-chalice;
+			background-color: white;
+			border: rem(1) solid lightgray;
+			color: gray;
 			margin: 0 0 $gutter;
 			padding: $gutter;
 		} // pre
 
 		// The  container.
 		code {
-			background-color: $color-alto;
+			background-color: lightgray;
 			font-size: rem(13);
 			padding: rem(5);
 		} // code
@@ -80,44 +72,32 @@
 .swatch-container {
 	@include clearfix;
 
-	display: flex;
-	flex-direction: row;
-	flex-wrap: wrap;
 	position: relative;
 
 	// Each swatch.
 	.swatch {
-		border: 1px solid $color-alto;
+		@include size(100% rem(125));
+		@include span-columns(3);
+
+		border: 1px solid black;
 		border-radius: rem(5);
-		flex: 0 1 23.875%;
-		height: rem(125);
 		margin-bottom: $gutter;
-		margin-right: 1.5%;
 		position: relative;
 		text-align: center;
 
-		&:nth-child(4n) {
-			margin-right: 0;
-		}
-
 		// The swatch 
& header { - align-content: center; - color: $color-alto; - display: flex; - flex-direction: column; - height: calc(100% - 39px); - justify-content: center; + color: black; + padding-top: rem(25); } // header // The swatch