barbican-reset 1.5.2 → 1.5.6

package/components/related_card.vue

@@ -2,11 +2,12 @@
   <b-card related no-body>
     <b-img v-if="content.image" :src="content.image" />
     <b-card-body>
-      <b-link :href="content.link" target="_blank">
-        <b-card-title v-html="content.title" />
-        <b-card-sub-title v-if="content.start_date" v-html="handleDate(content.start_date)" />
-        <b-card-text v-html="limitLength(content.description)" />
-      </b-link>
+      <b-card-title>
+        <b-link v-if="content.title" v-html="content.title" :href="content.link" target="_blank" />
+        <b-link v-else :href="content.link" target="_blank">More Info</b-link>
+      </b-card-title>
+      <b-card-sub-title v-if="content.start_date" v-html="handleDate(content.start_date)" />
+      <b-card-text v-html="limitLength(content.description)" />
     </b-card-body>
   </b-card>
 </template>

package/components/skip_link.vue

@@ -29,6 +29,7 @@ export default {
   opacity: 0;
   
   @include focus {
+    outline: none;
     opacity: 1;
     z-index: 2;
   }

package/helpers/index.scss

@@ -1,3 +1,3 @@
 // paths more explicit for gulp-sass
-@import "variables/index.scss";
-@import "mixins/index.scss";
+@import "variables/index";
+@import "mixins/index";

package/helpers/mixins/_buttons.scss

@@ -74,6 +74,7 @@
     border: $border solid $color;
     background-color: $color;
     color: $background;
+    box-shadow: none;
     outline: none;
 
     svg {
@@ -95,10 +96,6 @@
   color: $color;
   
   @if $line { line-height: $line; }
-
-  @include focus {
-    @content;
-  }
 }
 
 @mixin btn-outline-header {
@@ -112,6 +109,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 {
@@ -157,7 +159,8 @@
 }
 
 @mixin btn-link {
-  @include button-link {
+  @include button-link;
+  @include focus {
     @include single-box($c-grey-night);
     background-color: $c-grey-night;
     color: $white;
@@ -167,17 +170,20 @@
 @mixin btn-video-help {
   @include button-link(
     $padding: 1.25rem,
-    $background: $c-grey-alpine) {
-    background-color: $c-grey-steel;
-    color: $white;
-  }
+    $background: $c-grey-alpine);
   font-weight: 700;
   text-align: left;
   width: 100%;
+
+  @include focus {
+    background-color: $c-grey-steel;
+    color: $white;
+  }
 }
 
 @mixin btn-exit {
-  @include button-link {
+  @include button-link;
+  @include focus {
     @include single-box($c-grey-night);
     background-color: $white;
     border-radius: 50%;
@@ -264,20 +270,6 @@
   }
 }
 
-@mixin btn-invisible {
-  &, &:focus {
-    background: transparent;
-    line-height: 1;
-    padding: 0;
-
-    @include focus {
-      background: transparent;
-      line-height: 1;
-      padding: 0;
-    }
-  }
-}
-
 @mixin btn-expand {
   display: block;
 }

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 {
@@ -36,4 +36,10 @@
   @include single-box($c-grey-steel, 0.0625rem);
   border: 1px solid $c-grey-steel;
   background-color: $c-grey-alpine;
+}
+
+@mixin focus_colors {
+  background-color: $c-status-neutral-fade;
+  border: 1px solid $c-status-neutral;
+  color: $c-status-neutral;
 }

package/helpers/mixins/_input.scss

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

package/helpers/mixins/index.scss

@@ -8,17 +8,17 @@
   top: $val;
 }
 
-@import "account/orders.scss";
-@import "basket.scss";
-@import "buttons.scss";
-@import "card.scss";
-@import "content.scss";
-@import "core.scss";
-@import "festival.scss";
-@import "focus.scss";
-@import "font.scss";
-@import "loading.scss";
-@import "input.scss";
+@import "account/orders";
+@import "basket";
+@import "buttons";
+@import "card";
+@import "content";
+@import "core";
+@import "festival";
+@import "focus";
+@import "font";
+@import "loading";
+@import "input";
 
 @mixin table_link {
   @include focus {

package/helpers/mixins/input/_checkbox.scss

@@ -0,0 +1,6 @@
+@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

@@ -0,0 +1,19 @@
+
+@mixin radio-group {
+  margin: -0.25rem;
+}
+
+@mixin radio-input(
+  $state: neutral,
+  $type: radio) {
+  @include generic-input($state,$type);
+  display: inline-block;
+  margin: 0.25rem;
+}
+
+// margin: 0;
+// gap: 1rem;
+
+// &:not(:first-of-type) {
+//   margin-top: 1rem;
+// }

package/helpers/mixins/input/_status.scss

@@ -0,0 +1,16 @@
+@mixin status-input($color) {
+  @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/helpers/variables/colors/index.scss

@@ -1,9 +1,9 @@
-@import "grey.scss";
-@import "brand.scss";
-@import "docs.scss";
-@import "status.scss";
-@import "wgp.scss";
-@import "power.scss";
-@import "llf.scss";
+@import "grey";
+@import "brand";
+@import "docs";
+@import "status";
+@import "wgp";
+@import "power";
+@import "llf";
 
-@import "layout.scss";
+@import "layout";

package/helpers/variables/index.scss

@@ -1,5 +1,5 @@
 // paths more explicit for gulp-sass
-@import "colors/index.scss";
-@import "layout.scss";
-@import "breakpoints.scss";
-@import "typography.scss";
+@import "colors/index";
+@import "layout";
+@import "breakpoints";
+@import "typography";

package/icons/city_of_london_lockup.vue

@@ -29,6 +29,7 @@ export default {
 
   @include focus {
     text-decoration: underline;
+    outline: none;
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "barbican-reset",
-  "version": "1.5.2",
+  "version": "1.5.6",
   "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/_atomic.scss

@@ -64,4 +64,8 @@ $aligns: "left", "center", "right";
 
 .width-100 {
   width: 100%;
+}
+
+.background-color-alt {
+  background-color: $c-page-global-content-bg-alt;
 }

package/scss/_btn.scss

@@ -76,10 +76,6 @@
     @include btn-carousel;
   }
 
-  &.btn-invisible {
-    @include btn-invisible;
-  }
-
   // modifyers
   &.expand {
     @include btn-expand;

package/scss/_checkbox-group.scss

@@ -1,85 +1,17 @@
 
-.checkbox-group {
-  
-  .custom-control {
-    position: relative;
+.custom-checkbox {
+  @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;
-    }
-  }
+  &:not(:last-of-type) {
+    margin-bottom: 0.5rem;
+  }    
 }
 
 @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);
-        }
-      }
-    }    
+    [#{$status}] input[type=radio],
+    input[type=radio][#{$status}] {
+      @include status-input($color);
+    }
   }
-}
+}

package/scss/_checkbox.scss

@@ -1,57 +1,6 @@
 
 .checkbox {
-  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;
-
-    @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;
-  }
+  @include checkbox-input;
 }
 
 @each $status, $color in $statees {

package/scss/_input.scss

@@ -9,12 +9,6 @@ input::placeholder {
   color: $c-grey-concrete;
 }
 
-input[type=number], input[type=text] {
-  @include focus {
-    @include input-focus;
-  }
-}
-
 input[type=checkbox],
 input[type=radio] {
   margin-bottom: 0.5rem;
@@ -27,6 +21,15 @@ input[type=submit] {
   appearance: none;
 }
 
+input[type=number] {
+  @include focus {
+    @include input-focus;
+  }
+}
+
 #{$all-text-inputs} {
   @include all-text-inputs;
+  @include focus {
+    @include input-focus;
+  }
 }

package/scss/_radio-group.scss

@@ -1,31 +1,17 @@
 
-.radio-group {
-  margin: -0.25rem;
+[role=radiogroup] {
+  @include radio-group;
 }
 
 .custom-radio {
-  @include input-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);
-        }
-      }
+    [#{$status}] input[type=radio],
+    input[type=radio][#{$status}] {
+      @include status-input($color);
     }
   }
 }

package/scss/card/_related.scss

@@ -13,11 +13,21 @@
 
   .card-title {
     font-size: $font-size-lg;
+    margin-bottom: 0.75rem;
+
+    a {
+      @include btn-link;
+    }
   }
 
+  .card-subtitle[date],
   .card-text:not(:last-child) {
     margin-bottom: 0.5rem;
   }
+
+  * + .card-text[date] {
+    margin-top: 0.75rem;
+  }
 }
 
 .card[related][hero=true] {

package/scss/card/_slim.scss

@@ -0,0 +1,11 @@
+
+.card[slim] {
+
+  .card-header {
+    padding: 1.5rem 1.25rem 1rem;
+  }
+
+  .card-body {
+    padding: 1.5rem 1.25rem;
+  }
+}

package/scss/card/index.scss

@@ -1,12 +1,13 @@
 
-@import "confirm.scss";
-@import "login.scss";
-@import "password.scss";
-@import "account.scss";
-@import "video-help.scss";
-@import "related.scss";
-@import "block.scss";
-@import "membership.scss";
+@import "confirm";
+@import "login";
+@import "password";
+@import "account";
+@import "video-help";
+@import "related";
+@import "block";
+@import "membership";
+@import "slim";
 
 .card {
   border: 1px solid $c-grey-pearl;

package/scss/index.scss

@@ -2,33 +2,33 @@
 @import "node_modules/bootstrap/scss/functions";
 @import "node_modules/bootstrap/scss/variables";
 @import "node_modules/bootstrap/scss/mixins";
-@import "../helpers/index.scss";
-
-@import "app.scss";
-@import "header.scss";
-@import "main.scss";
-@import "footer.scss";
-@import "klaro.scss";
-@import "fonts.scss";
-@import "loading-animation.scss";
-@import "close-icon.scss";
-@import "table/index.scss";
-@import "promo.scss";
+@import "../helpers/index";
+
+@import "app";
+@import "header";
+@import "main";
+@import "footer";
+@import "klaro";
+@import "fonts";
+@import "loading-animation";
+@import "close-icon";
+@import "table/index";
+@import "promo";
 
 // bootstrap component styles
-@import "btn.scss";
-@import "card/index.scss";
-@import "card-group.scss";
-@import "checkbox.scss";
-@import "checkbox-group.scss";
-@import "custom-select.scss";
-@import "form.scss";
-@import "list.scss";
-@import "input.scss";
-@import "radio-group.scss";
+@import "btn";
+@import "card/index";
+@import "card-deck";
+@import "checkbox";
+@import "checkbox-group";
+@import "custom-select";
+@import "form";
+@import "list";
+@import "input";
+@import "radio-group";
 
 // atomic helper styles
-@import "atomic.scss";
+@import "atomic";
 
 body {
   line-height: $line-height-md;

package/scss/table/index.scss

@@ -1,13 +1,13 @@
 
-@import "tickets.scss";
-@import "basket.scss";
-@import "section.scss";
-@import "orders.scss";
-@import "details.scss";
-@import "preferences.scss";
-@import "etickets.scss";
-@import "membership.scss";
-@import "gifts.scss";
+@import "tickets";
+@import "basket";
+@import "section";
+@import "orders";
+@import "details";
+@import "preferences";
+@import "etickets";
+@import "membership";
+@import "gifts";
 
 table {
   border-spacing: 0;