barbican-reset 1.4.0 → 1.4.1

package/components/card_display.vue

@@ -1,7 +1,10 @@
 <template>
   <div :class="styleComponent">
-    <div v-if="type === 'live'" :class="$style.icon">
-      <div class="btn btn-secondary">live</div>
+    <div v-if="type === 'concert'" :class="$style.icon">
+      <div :class="[`btn btn-secondary`, { hero }]">
+        <template v-if="hero">Live event</template>
+        <live-icon :class="$style.svg" />
+      </div>
     </div>
     <img :class="$style.image" :src="image">
     <div v-if="expired" :class="$style.title">
@@ -11,8 +14,10 @@
 </template>
 
 <script>
+import { LiveIcon } from 'barbican-reset/icons/stream'
 export default {
   name: "CardDisplay",
+  components: { LiveIcon },
   props: {
     image: {
       type: String,
@@ -28,7 +33,7 @@ export default {
     },
     type: {
       type: String,
-      default: 'live',
+      default: 'concert',
     },
   },
   computed: {
@@ -38,12 +43,40 @@ export default {
       if (this.hero) { output.push(style.hero); }
       return output;
     },
+    styleButton() {
+      const style = this.$style;
+      let output = [style.button];
+      if (this.hero) { output.push(style.hero); }
+      return output;
+    }
   }
 }
 </script>
 
+<style lang="scss" scoped>
+
+.btn.btn-secondary {
+  &:not(.hero) {
+    border-radius: 50%;
+    padding: 0.5rem;
+  }
+
+  &.hero {
+    align-items: center;
+    padding: 0.75rem;
+    display: flex;
+    gap: 0.5rem;
+  }
+}
+
+</style>
+
 <style lang="scss" module>
 
+.svg {
+  fill: white;
+}
+
 .component {
   padding-top: 56.25%;
   position: relative;

package/components/video_content.vue

@@ -2,27 +2,63 @@
 
   <div>
 
-    <fluid-iframe v-if="type === 'jwplayer'" :src="url" />
+    <fluid-iframe v-if="data.type === 'jwplayer'" :src="data.url" />
 
-    <div v-if="type === 'brightcove'" v-html="markup" :class="$style.brightcove"></div>
+    <template v-if="data.type === 'brightcove'">
 
-    <h2 v-html="title" class="margin-bottom-1"></h2>
+      <div v-html="data.markup" :class="$style.brightcove"></div>
 
-    <p v-html="lead_description"></p>
+      <alert v-if="data.isExpired" error center inline>Event has passed.</alert>
 
-    <p v-html="long_description"></p>
+    </template>
 
-    <p>Until {{ formatDateTime(expires) }}</p>
+    <h2 v-html="data.title" class="margin-bottom-1"></h2>
+
+    <p v-html="data.lead_description"></p>
+
+    <template v-if="data.long_description">
+
+      <p v-html="data.long_description"></p>
+
+    </template>
+
+    <template v-if="data.expires">
+
+      <p>Until {{ formatDateTime(data.expires) }}</p>
+
+    </template>
+
+    <template v-if="data.programme">
+
+      <p>Read tonight's <a :href="data.programme" target="_blank">Digital Programme</a></p>
+
+    </template>
 
   </div>  
 
 </template>
 
 <script>
-import { FluidIframe } from 'barbican-reset'
+import { FluidIframe, Alert } from 'barbican-reset'
 export default {
-  props: ['type','url','markup','title','lead_description','long_description','expires'],
-  components: { FluidIframe },
+  props: {
+    data: {
+      type: Object
+    },
+    concert: {
+      type: Boolean,
+      default: false,
+    }
+  },
+  created() {
+    if (this.concert) {
+      this.data.expires = this.data.brightcove.expires;
+      this.data.markup = this.data.brightcove.markup;
+      this.data.script = this.data.brightcove.script;
+      this.data.isExpired = this.data.brightcove.isExpired;
+    }
+  },
+  components: { FluidIframe, Alert },
   methods: {
     formatDateTime(date) {
       return this.$moment(date).format("LT ddd D MMM YYYY");

package/icons/stream/live.vue

@@ -1,106 +1,11 @@
 <template>
-  <div class="live-icon__container">
-    <div class="live-icon__title">Live event</div>
-    <svg
-      class="live-icon__svg"
-      :class="{ animate: animate }"
-      xmlns="http://www.w3.org/2000/svg"
-      viewBox="0 0 14 15"
-    >
-      <path
-        class="big-echo"
-        d="M14,7.5c0-2.8-1.1-5.3-2.9-7.1l-1,1.1c1.5,1.5,2.5,3.7,2.5,6s-1,4.5-2.5,6l1.1,1.1 C12.9,12.8,14,10.3,14,7.5z"
-      />
-      <path
-        class="small-echo"
-        d="M8.6,7.5C8.6,9,8,10.4,7,11.4l1,1.1c1.3-1.3,2-3,2-5S9.2,3.8,8,2.6l-1.1,1C7.9,4.6,8.6,6,8.6,7.5z"
-      />
-      <path
-        class="echo-ball"
-        d="M6,7.5c0,1.7-1.3,3-3,3s-3-1.3-3-3s1.3-3,3-3S6,5.8,6,7.5z"
-      />
-    </svg>
-  </div>
+  <svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 0 24 24" width="24">
+    <path d="M7.76,16.24C6.67,15.16,6,13.66,6,12s0.67-3.16,1.76-4.24l1.42,1.42C8.45,9.9,8,10.9,8,12c0,1.1,0.45,2.1,1.17,2.83 L7.76,16.24z M16.24,16.24C17.33,15.16,18,13.66,18,12s-0.67-3.16-1.76-4.24l-1.42,1.42C15.55,9.9,16,10.9,16,12 c0,1.1-0.45,2.1-1.17,2.83L16.24,16.24z M12,10c-1.1,0-2,0.9-2,2s0.9,2,2,2s2-0.9,2-2S13.1,10,12,10z M20,12 c0,2.21-0.9,4.21-2.35,5.65l1.42,1.42C20.88,17.26,22,14.76,22,12s-1.12-5.26-2.93-7.07l-1.42,1.42C19.1,7.79,20,9.79,20,12z M6.35,6.35L4.93,4.93C3.12,6.74,2,9.24,2,12s1.12,5.26,2.93,7.07l1.42-1.42C4.9,16.21,4,14.21,4,12S4.9,7.79,6.35,6.35z"/>
+  </svg>
 </template>
 
 <script>
-import { gsap } from "gsap";
 export default {
-  name: "LiveIcon",
-  props: {
-    animate: {
-      type: Boolean,
-    },
-  },
-  methods: {
-    doAnimate(input) {
-      if (input) {
-        let tl = gsap.timeline({ repeat: -1, repeatDelay: 0.5 });
-        let parent = ".live-icon__svg.animate";
-        let all = [
-          `${parent} .echo-ball`,
-          `${parent} .small-echo`,
-          `${parent} .big-echo`,
-        ];
-        tl.set(all, {
-          opacity: 0.1,
-        }).to(all, {
-          opacity: 1,
-          stagger: 0.3,
-          duration: 1,
-        });
-      }
-    },
-  },
-  mounted() {
-    this.doAnimate(this.animate);
-  },
+  name: "LiveIcon"
 };
 </script>
-
-<style lang="scss" scoped>
-
-.live-icon {
-  &__container {
-    background-color: $c-grey-midnight;
-    border-radius: $border-radius;
-    font-size: $font-size-sm;
-    padding: 0.6rem 0.8rem;
-    border-color: white;
-    position: absolute;
-    font-weight: bold;
-    border: 1px solid;
-    color: white;
-    right: 1rem;
-    top: 1rem;
-
-    @include media-breakpoint-up(sm) {
-      font-size: $font-size-base;
-      padding: 0.8rem 1rem;
-    }
-
-    @include media-breakpoint-up(md) {
-      right: 2rem;
-      top: 2rem;
-    }
-  }
-
-  &__title {
-    vertical-align: middle;
-    display: inline-block;
-    margin-right: 0.5rem;
-  }
-
-  &__svg {
-    vertical-align: middle;
-    display: inline-block;
-    height: 1.5rem;
-    fill: white;
-
-    @include media-breakpoint-up(sm) {
-      height: 1.75rem;
-    }
-  }
-}
-
-</style>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "barbican-reset",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "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

@@ -1,11 +1,11 @@
 
-$margins: "margin-top", "margin-bottom", "min-height";
+$gaps: "margin-top", "margin-bottom", "min-height", "padding-left", "padding-right";
 $aligns: "left", "center", "right";
 
-@each $margin in $margins {
+@each $gap in $gaps {
   @for $i from 1 to 5 {
-    .#{$margin}-#{$i} {
-      #{$margin}: 1rem * $i;
+    .#{$gap}-#{$i} {
+      #{$gap}: 1rem * $i;
     }    
   }
 }