From ccf954f9d7cc6fa944beb1ad9bc4ffe64760071c Mon Sep 17 00:00:00 2001 From: Phil LaPier Date: Sat, 19 Apr 2014 18:47:35 -0400 Subject: [PATCH] Revert html5-input-types --- app/assets/stylesheets/_bourbon.scss | 1 - .../addons/_html5-input-types.scss | 54 +++++++++++++------ app/assets/stylesheets/functions/_assign.scss | 11 ---- 3 files changed, 39 insertions(+), 27 deletions(-) delete mode 100644 app/assets/stylesheets/functions/_assign.scss diff --git a/app/assets/stylesheets/_bourbon.scss b/app/assets/stylesheets/_bourbon.scss index 098567545..ef74cb96e 100644 --- a/app/assets/stylesheets/_bourbon.scss +++ b/app/assets/stylesheets/_bourbon.scss @@ -11,7 +11,6 @@ @import "helpers/shape-size-stripper"; // Custom Functions -@import "functions/assign"; @import "functions/color-lightness"; @import "functions/flex-grid"; @import "functions/golden-ratio"; diff --git a/app/assets/stylesheets/addons/_html5-input-types.scss b/app/assets/stylesheets/addons/_html5-input-types.scss index 9e9324ae0..8428e4e19 100644 --- a/app/assets/stylesheets/addons/_html5-input-types.scss +++ b/app/assets/stylesheets/addons/_html5-input-types.scss @@ -20,19 +20,29 @@ $inputs-list: 'input[type="email"]', 'input[type="time"]', 'input[type="week"]'; -// Bare inputs -//************************************************************************// -$all-text-inputs: assign-inputs($inputs-list); +$unquoted-inputs-list: (); +@each $input-type in $inputs-list { + $unquoted-inputs-list: append($unquoted-inputs-list, unquote($input-type), comma); +} + +$all-text-inputs: $unquoted-inputs-list; + // Hover Pseudo-class //************************************************************************// -$all-text-inputs-hover: assign-inputs($inputs-list, hover); +$all-text-inputs-hover: (); +@each $input-type in $unquoted-inputs-list { + $input-type-hover: $input-type + ":hover"; + $all-text-inputs-hover: append($all-text-inputs-hover, $input-type-hover, comma); +} // Focus Pseudo-class //************************************************************************// -$all-text-inputs-focus: assign-inputs($inputs-list, focus); - - +$all-text-inputs-focus: (); +@each $input-type in $unquoted-inputs-list { + $input-type-focus: $input-type + ":focus"; + $all-text-inputs-focus: append($all-text-inputs-focus, $input-type-focus, comma); +} // You must use interpolation on the variable: // #{$all-text-inputs} @@ -55,23 +65,37 @@ $inputs-button-list: 'input[type="button"]', 'input[type="reset"]', 'input[type="submit"]'; -// Bare inputs -//************************************************************************// -$all-button-inputs: assign-inputs($inputs-button-list); +$unquoted-inputs-button-list: (); +@each $input-type in $inputs-button-list { + $unquoted-inputs-button-list: append($unquoted-inputs-button-list, unquote($input-type), comma); +} + +$all-button-inputs: $unquoted-inputs-button-list; + // Hover Pseudo-class //************************************************************************// -$all-button-inputs-hover: assign-inputs($inputs-button-list, hover); +$all-button-inputs-hover: (); +@each $input-type in $unquoted-inputs-button-list { + $input-type-hover: $input-type + ":hover"; + $all-button-inputs-hover: append($all-button-inputs-hover, $input-type-hover, comma); +} // Focus Pseudo-class //************************************************************************// -$all-button-inputs-focus: assign-inputs($inputs-button-list, focus); +$all-button-inputs-focus: (); +@each $input-type in $unquoted-inputs-button-list { + $input-type-focus: $input-type + ":focus"; + $all-button-inputs-focus: append($all-button-inputs-focus, $input-type-focus, comma); +} // Active Pseudo-class //************************************************************************// -$all-button-inputs-active: assign-inputs($inputs-button-list, active); - - +$all-button-inputs-active: (); +@each $input-type in $unquoted-inputs-button-list { + $input-type-active: $input-type + ":active"; + $all-button-inputs-active: append($all-button-inputs-active, $input-type-active, comma); +} // You must use interpolation on the variable: // #{$all-button-inputs} diff --git a/app/assets/stylesheets/functions/_assign.scss b/app/assets/stylesheets/functions/_assign.scss deleted file mode 100644 index 9a1db93ef..000000000 --- a/app/assets/stylesheets/functions/_assign.scss +++ /dev/null @@ -1,11 +0,0 @@ -@function assign-inputs($inputs, $pseudo: null) { - $list : (); - - @each $input in $inputs { - $input: unquote($input); - $input: if($pseudo, $input + ":" + $pseudo, $input); - $list: append($list, $input, comma); - } - - @return $list; -} \ No newline at end of file