reverts feature/scaffolding-improvements branch merge into master

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>
 	&-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 <pre> 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 <code> 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>
 		& 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 <footer>
 		& footer {
 			@include position(absolute, null null 0 null);
 
-			background-color: $color-white;
-			border-top: 1px solid $color-alto;
-			border-bottom-left-radius: rem(4);
-			border-bottom-right-radius: rem(4);
+			background-color: white;
+			border-bottom-left-radius: rem(5);
+			border-bottom-right-radius: rem(5);
 			font-size: rem(12);
 			padding: rem(10);
 			width: 100%;

inc/scaffolding.php

@@ -38,7 +38,7 @@ function _s_display_scaffolding_section( $args = array() ) {
 
 		<?php if ( $args['title'] ) : ?>
 		<header class="scaffolding-document-header">
-			<h3 class="scaffolding-document-title"><?php echo esc_html( $args['title'] ); ?></h3>
+			<h2 class="scaffolding-document-title"><?php echo esc_html( $args['title'] ); ?></h2>
 			<button type="button" class="scaffolding-button"><?php esc_html_e( 'Details', '_s' ); ?></button>
 		</header><!-- .scaffolding-document-header -->
 		<?php endif; ?>
@@ -111,30 +111,10 @@ function _s_scaffolding_allowed_html() {
 			'id'          => true,
 			'role'        => true,
 			'title'       => true,
-			'fill'        => true,
-			'height'      => true,
-			'width'       => true,
-			'use'         => true,
-			'path'        => true,
 		),
 		'use'   => array(
 			'xlink:href' => true,
 		),
-		'title' => array(
-			'id' => true,
-		),
-		'desc'  => array(
-			'id' => true,
-		),
-		'select' => array(
-			'class'    => true,
-		),
-		'option' => array(
-			'option'   => true,
-			'value'    => true,
-			'selected' => true,
-			'disabled' => true,
-		),
 		'input' => array(
 			'type'        => true,
 			'name'        => true,
@@ -170,7 +150,7 @@ function _s_display_global_scaffolding_section( $args = array() ) {
 
 	<div class="scaffolding-document <?php echo esc_attr( $class ); ?>">
 		<header class="scaffolding-document-header">
-			<h3 class="scaffolding-document-title"><?php echo esc_html( $args['title'] ); ?></h3>
+			<h2 class="scaffolding-document-title"><?php echo esc_html( $args['title'] ); ?></h2>
 		</header>
 
 		<div class="scaffolding-document-content">

inc/template-tags.php

@@ -82,21 +82,6 @@ function _s_entry_footer() {
 	}
 endif;
 
-/**
- * Return Output Buffered SVG markup.
- *
- * @param array $args The parameters needed to get the SVG.
- * @return string
- */
-function _s_get_svg( $args = array() ) {
-
-	ob_start();
-
-	_s_display_svg( $args );
-
-	return ob_get_clean();
-}
-
 /**
  * Display SVG markup.
  *