barbican-reset 1.5.1 → 1.5.2

package/helpers/mixins/_buttons.scss

@@ -74,6 +74,7 @@
     border: $border solid $color;
     background-color: $color;
     color: $background;
+    outline: none;
 
     svg {
       fill: $background;

package/helpers/mixins/_focus.scss

@@ -1,32 +1,39 @@
 @mixin focus {
-  &:focus {
-    box-shadow: none; 
-    outline: none; 
-  }
-  &:hover, &[data-focus-visible-added] {
+  // &:focus { <-- better remove this, but could cause bugs
+  //   box-shadow: none; 
+  //   outline: none; 
+  // }
+  &:hover, &:focus-visible, &[data-focus-visible-added] {
     @content;
-  }  
+  }
 }
 
-@mixin double-box($bg: $white, $col: $black, $bg_size: 0.25rem, $col_size: 0.15rem) {
-  box-shadow: 0 0 0 $bg_size $bg, 0 0 0 ($bg_size + $col_size) $col;
+@mixin box-setup {
   position: relative;
+  outline: none;
   z-index: 2;
 }
 
+@mixin double-box($bg: $white, $col: $black, $bg_size: 0.25rem, $col_size: 0.15rem) {
+  @include box-setup;
+  box-shadow: 0 0 0 $bg_size $bg, 0 0 0 ($bg_size + $col_size) $col;
+}
+
 @mixin single-box($bg: $white, $size: 0.25rem) {
+  @include box-setup;
   box-shadow: 0 0 0 $size $bg;
-  position: relative;
-  z-index: 2;
 }
 
 @mixin link-focus($color: $c-grey-midnight, $border: $white) {
   @include focus {
     @include double-box($color, $border);
     background-color: $color;
-    position: relative;
     color: $border;
-    outline: none;
-    z-index: 2;
   }
 }
+
+@mixin input-focus {
+  @include single-box($c-grey-steel, 0.0625rem);
+  border: 1px solid $c-grey-steel;
+  background-color: $c-grey-alpine;
+}

package/helpers/mixins/_font.scss

@@ -10,9 +10,3 @@
   }
 }
 
-@mixin all-text-inputs {
-  border: solid $border-width $c-border-strong;
-  padding: 0.875rem 0.875rem 0.75rem;
-  background-color: $c-grey-alpine;
-  border-radius: $border-radius-lg;  
-}

package/helpers/mixins/_input.scss

@@ -0,0 +1,78 @@
+
+@mixin all-text-inputs {
+  border: solid $border-width $c-border-strong;
+  padding: 0.875rem 0.875rem 0.75rem;
+  background-color: $c-grey-alpine;
+  border-radius: $border-radius-lg;  
+}
+
+@mixin input-dropdown {
+  background-color: $c-grey-alpine;
+  border-radius: $border-radius-lg;
+  border-color: $c-grey-concrete;
+  padding: 0.875rem 0.5rem;
+  color: $c-grey-night;
+  width: 100%;
+}
+
+@mixin focus_colors {
+  background-color: $c-status-neutral-fade;
+  border: 1px solid $c-status-neutral;
+  color: $c-status-neutral;
+}
+
+@mixin input-radio($state:neutral) {
+  display: inline-block;
+  position: relative;
+  margin: 0.25rem;
+  padding: 0;
+
+  input[type=radio] {
+    $size: 0.875rem;
+    position: absolute;
+    height: $size;
+    margin: auto;
+    width: $size;
+    right: auto;
+    z-index: 3;
+    left: 1rem;
+    bottom: 0;
+    top: 0;
+
+    @if $state != disabled {
+      cursor: pointer;
+
+      @include focus {
+        outline: none;
+        
+        ~ label {
+          @include single-box($c-grey-steel, 0.0625rem);
+          border: 1px solid $c-grey-steel;
+          background-color: $c-grey-alpine;
+        }
+        
+        &:checked ~ label {
+          @include focus_colors;
+          @include single-box($c-status-neutral, 0.0625rem);
+        }
+      }
+  
+      &:checked ~ label {
+        @include focus_colors;
+      }
+    }
+  }
+
+  label {
+    padding: 0.75rem 0.75rem 0.625rem 2.75rem;
+    border: 1px solid $c-grey-concrete;
+    border-radius: $border-radius-lg;
+    background-color: $white;  
+    color: $c-grey-night;
+    font-weight: 400;
+
+    @if $state != disabled {
+      cursor: pointer;
+    }
+  }
+}

package/helpers/mixins/index.scss

@@ -1,5 +1,5 @@
-// paths more explicit for gulp-sass
-@import "~bourbon/core/bourbon.scss";
+// paths more explicit for gulp-sass + iframe overrides
+@import "../../node_modules/bourbon/core/bourbon";
 
 @mixin inset($val: 0) {
   bottom: $val;
@@ -18,6 +18,7 @@
 @import "focus.scss";
 @import "font.scss";
 @import "loading.scss";
+@import "input.scss";
 
 @mixin table_link {
   @include focus {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "barbican-reset",
-  "version": "1.5.1",
+  "version": "1.5.2",
   "description": "A collection of useful scss imports and js scripts, that provide consistent styling and functionality across barbican projects.",
   "main": "index.js",
   "scripts": {

package/scss/_custom-select.scss

@@ -1,8 +1,3 @@
 .custom-select {
-  background-color: $c-grey-alpine;
-  border-color: $c-grey-concrete;
-  border-radius: $border-radius;
-  padding: 0.75rem 0.5rem;
-  color: $c-grey-night;
-  width: 100%;
+  @include input-dropdown;
 }

package/scss/_input.scss

@@ -1,10 +1,4 @@
 
-@mixin input-focus {
-  @include single-box($c-grey-steel, 0.0625rem);
-  border: 1px solid $c-grey-steel;
-  background-color: $c-grey-alpine;
-}
-
 .form-control {
   @include focus {
     @include input-focus;

package/scss/_radio-group.scss

@@ -1,62 +1,10 @@
 
-$margin-radio: 0.25rem;
-
 .radio-group {
-  margin: -$margin-radio;
+  margin: -0.25rem;
 }
 
 .custom-radio {
-  display: inline-block;
-  margin: $margin-radio;
-  position: relative;
-  padding: 0;
-
-  input[type=radio] {
-    $size: 0.875rem;
-    position: absolute;
-    cursor: pointer;
-    height: $size;
-    margin: auto;
-    width: $size;
-    right: auto;
-    z-index: 3;
-    left: 1rem;
-    bottom: 0;
-    top: 0;
-
-    @mixin focus_colors {
-      background-color: $c-status-neutral-fade;
-      border: 1px solid $c-status-neutral;
-      color: $c-status-neutral;
-    }
-
-    @include focus {
-      ~ label {
-        @include single-box($c-grey-steel, 0.0625rem);
-        border: 1px solid $c-grey-steel;
-        background-color: $c-grey-alpine;
-      }
-      
-      &:checked ~ label {
-        @include focus_colors;
-        @include single-box($c-status-neutral, 0.0625rem);
-      }
-    }
-
-    &:checked ~ label {
-      @include focus_colors;
-    }
-  }
-
-  label {
-    padding: 0.75rem 0.75rem 0.625rem 2.75rem;
-    border: 1px solid $c-grey-concrete;
-    border-radius: $border-radius-lg;
-    background-color: $white;  
-    color: $c-grey-night;
-    font-weight: 400;
-    cursor: pointer;
-  }
+  @include input-radio;  
 }
 
 @each $status, $color in $statees {