barbican-reset 1.5.4 → 1.5.8

package/components/br_button/components.js

@@ -1,5 +1,7 @@
 import RemoveTicket from './remove_ticket'
+import DotTyping from './dot_typing'
 
 export {
-  RemoveTicket
+  RemoveTicket,
+  DotTyping
 };

package/components/br_button/dot_typing.vue

@@ -0,0 +1,43 @@
+<template>
+  
+  <!-- https://codepen.io/nzbin/pen/GGrXbp -->
+
+  <div>
+
+    <svg ref="a" version="1.1" xmlns="http://www.w3.org/2000/svg" width="14" height="14" viewBox="0 0 14 14">
+      <path d="M12,7c0,2.8-2.2,5-5,5S2,9.8,2,7s2.2-5,5-5S12,4.2,12,7z"/>
+    </svg>
+
+    <svg ref="b" version="1.1" xmlns="http://www.w3.org/2000/svg" width="14" height="14" viewBox="0 0 14 14">
+      <path d="M12,7c0,2.8-2.2,5-5,5S2,9.8,2,7s2.2-5,5-5S12,4.2,12,7z"/>
+    </svg>
+
+    <svg ref="c" version="1.1" xmlns="http://www.w3.org/2000/svg" width="14" height="14" viewBox="0 0 14 14">
+      <path d="M12,7c0,2.8-2.2,5-5,5S2,9.8,2,7s2.2-5,5-5S12,4.2,12,7z"/>
+    </svg>
+
+  </div>
+
+</template>
+
+<script>
+import { gsap } from 'gsap'
+export default {
+  name: 'DotTyping',
+  mounted() {
+    const tl = gsap.timeline({ repeat: 9 });
+    const a = this.$refs.a;
+    const b = this.$refs.b;
+    const c = this.$refs.c;
+    const dots = [a,b,c];
+    const speed = 0.3;
+
+    tl.to(dots,{
+      stagger: speed, 
+      keyframes: [
+      { y: -8, duration: speed },
+      { y: 0, duration: speed }
+    ]});
+  }
+}
+</script>

package/components/br_button/remove_ticket.vue

@@ -33,7 +33,7 @@
         <slot name="error" />
       </template>
       <template v-else>
-        {{ state }}
+        {{ state.toUpperCase() }}
       </template>
     </template>
 

package/components/br_button.vue

@@ -17,7 +17,7 @@
           <slot name="default" />
         </template>
         <template v-else>
-          {{ state }}
+          {{ titleCase(state) }}
         </template>
       </template>
 
@@ -25,9 +25,7 @@
         <template v-if="$slots.loading">
           <slot name="loading" />
         </template>
-        <template v-else>
-          {{ state }}
-        </template>
+        <dot-typing v-else />
       </template>
 
       <template v-else-if="state === 'loaded'">
@@ -35,7 +33,7 @@
           <slot name="loaded" />
         </template>
         <template v-else>
-          {{ state }}
+          {{ titleCase(state) }}
         </template>
       </template>
 
@@ -44,7 +42,7 @@
           <slot name="error" />
         </template>
         <template v-else>
-          {{ state }}
+          {{ titleCase(state) }}
         </template>
       </template>
 
@@ -55,7 +53,7 @@
 
 <script>
 import { BButton } from 'bootstrap-vue'
-import { RemoveTicket } from './br_button/components'
+import { RemoveTicket, DotTyping } from './br_button/components'
 
 export default {
   name: "BrButton",
@@ -72,6 +70,11 @@ export default {
       default: "button"
     }
   },
+  methods: {
+    titleCase(str) {
+      return str.toLowerCase().split(' ').map(word => word.charAt(0).toUpperCase() + word.slice(1)).join(' ');
+    }
+  },
   computed: {
     loading() {
       return this.state === "loading" ? "true" : "false";
@@ -79,7 +82,8 @@ export default {
   },
   components: {
     BButton,
-    RemoveTicket
+    RemoveTicket,
+    DotTyping
   }
 }
 </script>

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/mixins/_buttons.scss

@@ -43,6 +43,10 @@
   @if $display { @include button-display($display, $padding * 0.625); }
   @if $line { line-height: $line; }
 
+  path {
+    fill: $color;    
+  }
+
   @include focus {
     @include double-box($color, $background);
     border: $border solid $background;
@@ -70,13 +74,18 @@
   @if $display { @include button-display($display, $padding * 0.625); }
   @if $line { line-height: $line; }
 
+  path {
+    fill: $color;    
+  }
+
   @include focus {
     border: $border solid $color;
     background-color: $color;
     color: $background;
+    box-shadow: none;
     outline: none;
 
-    svg {
+    path {
       fill: $background;
     }
   }
@@ -95,10 +104,6 @@
   color: $color;
   
   @if $line { line-height: $line; }
-
-  @include focus {
-    @content;
-  }
 }
 
 @mixin btn-outline-header {
@@ -162,7 +167,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;
@@ -172,17 +178,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%;
@@ -269,20 +278,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,7 +1,8 @@
 @mixin focus {
   &:not([disabled=disabled]) {
-    &[data-focus-visible-added], 
+    &[data-focus-visible-added],
     &:focus-visible,
+    &:focus,
     &:hover {
       @content;
     }

package/helpers/mixins/input/_status.scss

@@ -1,18 +1,16 @@
-@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);
-      }
-    }
-
+@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/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.4",
+  "version": "1.5.8",
   "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,19 +1,17 @@
 
-.checkbox-group {
-  
-  .custom-control {
-    @include checkbox-input;
+.custom-checkbox {
+  @include checkbox-input;
 
-    &:not(:last-of-type) {
-      margin-bottom: 0.5rem;
-    }    
-  }
+  &:not(:last-of-type) {
+    margin-bottom: 0.5rem;
+  }    
 }
 
 @each $status, $color in $statees {
   @if $status != 'neutral' {
-    .checkbox-group.#{$status} {
-      @include status-input(checkbox,$color);
-    }    
+    [#{$status}] input[type=radio],
+    input[type=radio][#{$status}] {
+      @include status-input($color);
+    }
   }
-}
+}

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,5 +1,5 @@
 
-.radio-group {
+[role=radiogroup] {
   @include radio-group;
 }
 
@@ -9,8 +9,9 @@
 
 @each $status, $color in $statees {
   @if $status != 'neutral' {
-    .radio-group.#{$status} {
-      @include status-input(radio,$color);
+    [#{$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

@@ -7,6 +7,7 @@
 @import "related";
 @import "block";
 @import "membership";
+@import "slim";
 
 .card {
   border: 1px solid $c-grey-pearl;