barbican-reset 1.5.3 → 1.5.4

package/helpers/mixins/_buttons.scss

@@ -112,6 +112,11 @@
 @mixin btn-primary {
   @include button-solid;
   min-width: 8rem;
+
+  &[disabled=disabled] {
+    @include button-solid($c-grey-night);
+    cursor: not-allowed;
+  }
 }
 
 @mixin btn-outline-primary {

package/helpers/mixins/_focus.scss

@@ -1,11 +1,11 @@
 @mixin focus {
-  // &:focus { <-- better remove this, but could cause bugs
-  //   box-shadow: none; 
-  //   outline: none; 
-  // }
-  &:hover, &:focus-visible, &[data-focus-visible-added] {
-    @content;
-  }
+  &:not([disabled=disabled]) {
+    &[data-focus-visible-added], 
+    &:focus-visible,
+    &:hover {
+      @content;
+    }
+  }  
 }
 
 @mixin box-setup {

package/helpers/mixins/_input.scss

@@ -1,19 +1,7 @@
 
+@import "input/generic";
+@import "input/status";
 @import "input/checkbox";
+@import "input/dropdown";
 @import "input/radio";
-
-@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%;
-}
+@import "input/text";

package/helpers/mixins/input/_checkbox.scss

@@ -1,46 +1,6 @@
-@mixin checkbox-input {
-  position: relative;
-  display: grid;
-
-  input[type=checkbox] {
-    $size: 0.875rem;
-    position: absolute;
-    cursor: pointer;
-    height: $size;
-    margin: auto;
-    width: $size;
-    right: auto;
-    z-index: 3;
-    left: 1rem;
-    bottom: 0;
-    top: 0;
-
-    @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.875rem 0.75rem 0.625rem 2.5rem;
-    border: 1px solid $c-grey-concrete;
-    border-radius: $border-radius-lg;
-    background-color: $white;  
-    color: $c-grey-night;
-    font-weight: normal;
-    cursor: pointer;
-  }
+@mixin checkbox-input(
+  $state: neutral,
+  $type: checkbox) {
+  @include generic-input($state,$type);
+  display: block;
 }

package/helpers/mixins/input/_dropdown.scss

@@ -0,0 +1,9 @@
+
+@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%;
+}

package/helpers/mixins/input/_generic.scss

@@ -0,0 +1,62 @@
+@mixin generic-input($state,$type) {
+  position: relative;
+  padding: 0;
+
+  input[type=#{$type}] {
+    $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;
+    font-weight: 400;
+
+    @if $state != disabled {
+      color: $c-grey-night;
+      cursor: pointer;
+    }
+
+    @if $state == disabled {
+      color: $c-grey-steel;
+      cursor: not-allowed;
+
+      &.spx-label-field__checkout, .spx-data-delivery-type {
+        text-decoration: line-through;
+      }
+    }
+  }
+}

package/helpers/mixins/input/_radio.scss

@@ -3,77 +3,17 @@
   margin: -0.25rem;
 }
 
-@mixin radio-input($state:neutral,$display:inline-block) {
-  position: relative;
-  display: $display;
-  padding: 0;
-
-  @if $display != flex {
-    margin: 0.25rem;
-  } @else {
-    margin: 0;
-    gap: 1rem;
-
-    &:not(:first-of-type) {
-      margin-top: 1rem;
-    }
-  }
-
-  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;
-    font-weight: 400;
-
-    @if $state != disabled {
-      color: $c-grey-night;
-      cursor: pointer;
-    }
+@mixin radio-input(
+  $state: neutral,
+  $type: radio) {
+  @include generic-input($state,$type);
+  display: inline-block;
+  margin: 0.25rem;
+}
 
-    @if $state == disabled {
-      color: $c-grey-steel;
-      cursor: not-allowed;
+// margin: 0;
+// gap: 1rem;
 
-      .spx-data-delivery-type {
-        text-decoration: line-through;
-      }
-    }
-  }
-}
+// &:not(:first-of-type) {
+//   margin-top: 1rem;
+// }

package/helpers/mixins/input/_status.scss

@@ -0,0 +1,18 @@
+@mixin status-input($type,$color) {
+  input[type=#{$type}] {
+    @include focus {
+      &:checked ~ label {
+        @include single-box(map-get($color, base), 0.0625rem);
+        border: 1px solid map-get($color, base);
+        background-color: map-get($color, fade);
+        color: map-get($color, base);
+      }
+    }
+
+    &:checked ~ label {
+      border: 1px solid map-get($color, base);
+      background-color: map-get($color, fade);
+      color: map-get($color, base);
+    }
+  }
+}

package/helpers/mixins/input/_text.scss

@@ -0,0 +1,7 @@
+
+@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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "barbican-reset",
-  "version": "1.5.3",
+  "version": "1.5.4",
   "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/_checkbox-group.scss

@@ -2,84 +2,18 @@
 .checkbox-group {
   
   .custom-control {
-    position: relative;
+    @include checkbox-input;
 
     &:not(:last-of-type) {
       margin-bottom: 0.5rem;
-    }
-  
-    input[type=checkbox] {
-      $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;
-      }
-
-      &:hover, &[data-focus-visible-added] {
-        &:focus {
-          box-shadow: none; 
-          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.875rem 0.75rem 0.625rem 2.5rem;
-      border: 1px solid $c-grey-concrete;
-      border-radius: $border-radius-lg;
-      background-color: $white;  
-      color: $c-grey-night;
-      cursor: pointer;
-    }
+    }    
   }
 }
 
 @each $status, $color in $statees {
   @if $status != 'neutral' {
     .checkbox-group.#{$status} {
-      input[type=checkbox] {
-        &:hover, &[data-focus-visible-added] {
-          &:checked ~ label {
-            @include single-box(map-get($color, base), 0.0625rem);
-            border: 1px solid map-get($color, base);
-            background-color: map-get($color, fade);
-            color: map-get($color, base);
-          }
-        }
-  
-        &:checked ~ label {
-          border: 1px solid map-get($color, base);
-          background-color: map-get($color, fade);
-          color: map-get($color, base);
-        }
-      }
+      @include status-input(checkbox,$color);
     }    
   }
 }

package/scss/_input.scss

@@ -1,6 +1,4 @@
 
-@import "input/radio";
-
 .form-control {
   @include focus {
     @include input-focus;

package/scss/_radio-group.scss

@@ -0,0 +1,16 @@
+
+.radio-group {
+  @include radio-group;
+}
+
+.custom-radio {
+  @include radio-input;
+}
+
+@each $status, $color in $statees {
+  @if $status != 'neutral' {
+    .radio-group.#{$status} {
+      @include status-input(radio,$color);
+    }
+  }
+}

package/scss/index.scss

@@ -18,7 +18,7 @@
 // bootstrap component styles
 @import "btn";
 @import "card/index";
-@import "card-group";
+@import "card-deck";
 @import "checkbox";
 @import "checkbox-group";
 @import "custom-select";

package/scss/input/_radio.scss

@@ -1,31 +0,0 @@
-
-.radio-group {
-  @include radio-group;
-}
-
-.custom-radio {
-  @include radio-input;
-}
-
-@each $status, $color in $statees {
-  @if $status != 'neutral' {
-    .radio-group.#{$status} {
-      input[type=radio] {
-        @include focus {
-          &:checked ~ label {
-            @include single-box(map-get($color, base), 0.0625rem);
-            border: 1px solid map-get($color, base);
-            background-color: map-get($color, fade);
-            color: map-get($color, base);
-          }
-        }
-  
-        &:checked ~ label {
-          border: 1px solid map-get($color, base);
-          background-color: map-get($color, fade);
-          color: map-get($color, base);
-        }
-      }
-    }
-  }
-}