barbican-reset 1.2.6 → 1.3.0

package/helpers/mixins/_buttons.scss

@@ -148,17 +148,29 @@
   }
 }
 
+@mixin btn-video-help {
+  @include button-link(
+    $padding: 1.25rem,
+    $background: $c-grey-alpine) {
+    background-color: $c-grey-steel;
+    color: $white;
+  }
+  font-weight: 700;
+  text-align: left;
+  width: 100%;
+}
+
 @mixin btn-exit {
   @include button-link {
     @include single-box($c-grey-night);
     background-color: $white;
     border-radius: 50%;
 
-    path.outline, path.cross {
+    [data-outline], [data-cross] {
       fill: $white;
     }
 
-    path.fill {
+    [data-fill] {
       fill: $c-grey-night;
     }
   }
@@ -188,6 +200,20 @@
   );
 }
 
+@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/icons/account/index.js

@@ -1,9 +1,9 @@
-import PersonalIcon from './PersonalIcon'
-import MembershipIcon from './MembershipIcon'
-import VideoIcon from './VideoIcon'
-import PaymentIcon from './PaymentIcon'
-import OrdersIcon from './OrdersIcon'
-import SupportIcon from './SupportIcon'
+import PersonalIcon from './personal'
+import MembershipIcon from './membership'
+import VideoIcon from './video'
+import PaymentIcon from './payment'
+import OrdersIcon from './orders'
+import SupportIcon from './support'
 
 export {
   PersonalIcon,

package/icons/{barbican/index.vue → barbican.vue}

@@ -10,4 +10,11 @@
   </svg>
 </template>
 
-<style src="./index.scss" lang="scss" module></style>
+<style lang="scss" module>
+
+.logo {
+  height: auto;
+  width: 10rem;
+}
+
+</style>

package/icons/city_of_london_lockup.vue

@@ -0,0 +1,30 @@
+<template>
+  <div :class="$style.lockup">
+    <a href="//www.cityoflondon.gov.uk" target="_blank">
+      <city-of-london-logo />
+    </a>
+    <small>
+      The City of London<br />Corporation is the founder<br />and principal funder of<br />the Barbican Centre
+    </small>
+  </div>
+</template>
+
+<script>
+import CityOfLondonLogo from './city_of_london'
+export default { 
+  name: 'CityOfLondonLockup',
+  components: {
+    CityOfLondonLogo
+  }
+}
+</script>
+
+<style lang="scss" module>
+
+.lockup {
+  display: inline-flex;
+  align-items: center;
+  gap: 0.625rem;  
+}
+
+</style>

package/icons/index.js

@@ -1,12 +1,14 @@
 import BarbicanLogo from './barbican'
 import CityOfLondonLogo from './city_of_london'
-import ArrowIcon from './arrow_icon'
+import CityOfLondonLockup from './city_of_london_lockup'
+import ArrowIcon from './arrow'
 import BackArrow from './back_arrow'
 import CartIcon from './cart'
 
 export {
   BarbicanLogo,
   CityOfLondonLogo,
+  CityOfLondonLockup,
   ArrowIcon,
   BackArrow,
   CartIcon

package/icons/password/index.js

@@ -1,5 +1,5 @@
-import RequestIcon from './RequestIcon'
-import ResetIcon from './ResetIcon'
+import RequestIcon from './request'
+import ResetIcon from './reset'
 
 export {
   RequestIcon,

package/icons/power/alleyne.vue

@@ -0,0 +1,3 @@
+<template>
+  <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0" y="0" width="325" height="181" viewBox="0 0 325 181" xml:space="preserve" enable-background="new 0 0 325 181"><path d="M25.2,16.6L11.9,57.3h26.6L25.2,16.6z M50.5,0.8l28.3,86.8H48.4l-9.3-28.5H11.4l9.3,28.5H0.2l24.1-73.9L20,0.8H50.5z M80.6,87.6V0.8h30.3v85h11.3l29.4-29.4v31.2H80.6z M156.4,87.6V0.8h30.3v85h9.8l29.4-29.4v31.2H156.4z M230.9,87.6V0.8h69.5v28.1	L273,2.6h-11.8v40.7h6L284.7,26v28.7v7.8l-17.5-17.3h-6v40.7H273l27.4-26.2v28.1h-34.8H230.9z M23.7,180.2v-40.1L0,93.4h31.8	l22.4,44.3L67,112l-8.6-18.6h20.3l-23.3,46.7v40.1H23.7z M138.7,180l-56.5-47.1V180h-1.6V93.4h1.6l67.8,56.5v-29.1l-29.8-27.4h31.4	v57.9V180H138.7z M156.4,180.1V93.3h69.5v28.1l-27.4-26.2h-11.8v40.7h6l17.5-17.3v28.7v7.8l-17.5-17.3h-6v40.7h11.8l27.4-26.2v28.1	h-34.8H156.4z M261.1,125.4c-2,1.7-2.8,4.5-2.3,8.3c0.5,3.9,1.8,8.1,4,12.8c2.2,4.7,4.8,9,7.9,13.1c3.1,4.1,6.2,7.2,9.4,9.3	c3.2,2.1,6,2.5,8.5,1.3L261.1,125.4z M269.8,93.4h30.6v22.1l-30.7-20.3c-1.1,0-2.1,0.5-2.9,1.5c-0.8,0.9-1.3,2.1-1.2,3.4	c0,1.3,0.8,2.5,2.3,3.5L287,116l19,32.1l19-23.9v25.4h-18.1l18.1,30.5h-30.3l-5.3-8.5c-8.6,5.8-16.4,8.7-23.3,8.6	c-7-0.1-12.7-2.1-17.1-6.2c-4.5-4.1-7.2-9.1-8.4-15.3c-1.1-6.1-0.2-12.4,2.9-18.6c3-6.3,8.6-11.7,16.6-16.3l-3.9-6.3	c-2.5-4.3-3.5-8.3-2.9-11.9c0.6-3.6,2.4-6.6,5.4-8.8C261.6,94.6,265.4,93.5,269.8,93.4L269.8,93.4z"/></svg>
+</template>

package/icons/power/banff.vue

@@ -0,0 +1,3 @@
+<template>
+    <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0" y="0" width="680" height="382" viewBox="0 0 680 382" xml:space="preserve" enable-background="new 0 0 680 382"><path d="M90.3,111.3c16.1-4.1,26.6-14.3,26.6-32.5c0-25.7-17.5-40.7-61.3-40.7H0.4v159h64.1c42.9,0,61.1-19.3,61.1-45.7	C125.5,130.1,113.9,115.8,90.3,111.3z M30.3,62.9h27.5c18.4,0,28.2,5,28.2,19.3c0,14.5-10.4,20.2-24.1,20.2H30.3V62.9z M65.5,172.4	H30.3v-47.5H65c13.6,0,28.8,4.1,28.8,24.5C93.9,165.1,82.1,172.4,65.5,172.4z M405.5,152L339.6,38.2h-33.4v159h27.7V86.3l65.5,110.9	h34v-159h-27.9V152z M458.2,197.2h30.2v-64.8h65.2v-25h-65.2V63.6h70.5V38.2H458.2V197.2z M679.5,63.6V38.2H578.9v159h30.2v-64.8	h65.2v-25h-65.2V63.6H679.5z M125.1,197.2h34.4L208.9,76l49.4,121.2h34.4L208.9,0.8L125.1,197.2z M129.1,233.7l-9.2,2.4	c-1.9-4.7-4.9-7.2-9.9-7.2c-6.9,0-11.3,5.3-11.3,14.7c0,9.3,3.9,15,11.4,15c5.7,0,8.9-2.9,10.8-8.2l9,2.8	c-3.4,8.9-11.1,13.3-20.3,13.3c-10,0-20.7-6.2-20.7-22.9c0-16.2,10.3-22.8,21-22.8C117.8,221,125.5,224.1,129.1,233.7z M164.7,229.9	h-19.6v9.7h18.3v7.6h-18.3v10.6h20.2v7.8h-29.6V222h29.1v7.9H164.7z M208.9,265.6H198l-16.4-29v29H173V222h10.9l16.4,29.7V222h8.6	V265.6z M248.9,229.9h-12.3v35.6h-9.5v-35.6h-12.3V222h34.1V229.9z M272.2,222c12.1,0,17.2,6,17.2,13.5c0,5.8-3,10-9,12.1l11.4,18	h-11.1l-9.6-16.5h-6v16.5h-9.5V222H272.2z M265.1,229.7v12h7.5c4,0,7.1-1.4,7.1-6.2c0-3.9-2.5-5.8-6.8-5.8H265.1z M325.8,229.9	h-19.6v9.7h18.3v7.6h-18.3v10.6h20.2v7.8h-29.6V222h29.1v7.9H325.8z M30,286.6H11.1v10.8h17.5v7.7H11.1v17.2H1.6v-43.5H30V286.6z M77.2,300.6c0,15.9-10.5,22.8-21.6,22.8c-10.1,0-21.6-6-21.6-22.9c0-16.2,10.5-22.8,21.6-22.8C65.8,277.7,77.2,283.4,77.2,300.6z M43.8,300.4c0,9.3,4.1,15.1,11.8,15.1c6.8,0,11.8-5.3,11.8-14.8c0-9.2-4-15.1-11.8-15.1C48.5,285.6,43.8,291,43.8,300.4z M99,278.8	c12.1,0,17.2,6,17.2,13.5c0,5.8-3,10-9,12.1l11.4,18h-11.1l-9.6-16.5h-6v16.5h-9.5v-43.5H99V278.8z M91.9,286.5v12h7.5	c4,0,7.1-1.4,7.1-6.2c0-3.9-2.5-5.8-6.8-5.8H91.9z M164.5,315.5h-16.4l-2,6.8h-9.7l14.1-43.5h11.9l14.1,43.5h-10.1L164.5,315.5z M150.2,307.9h12.2l-6.1-21.8L150.2,307.9z M198.1,278.8c12.1,0,17.2,6,17.2,13.5c0,5.8-3,10-9,12.1l11.4,18h-11.1l-9.6-16.5h-6	v16.5h-9.5v-43.5h16.6V278.8z M191,286.5v12h7.5c4,0,7.1-1.4,7.1-6.2c0-3.9-2.5-5.8-6.8-5.8H191z M253,286.7h-12.3v35.6h-9.5v-35.6	H219v-7.9h34V286.7z M254,315.3l6.2-5.7c3.5,3.6,7.6,5.8,13.6,5.8c5,0,8.5-1.9,8.5-5.2c0-3.2-1.6-4.9-10.8-6.5	c-10.3-1.9-15.2-5.6-15.2-13.3c0-7.8,6.8-12.8,17-12.8c8.6,0,14.5,3.4,18.3,7.7l-6.5,5.2c-2.2-2.5-5.6-5.1-11.8-5.1	c-4.7,0-7.3,1.7-7.3,4.7c0,2.9,1.7,4.2,10.5,5.8c10.9,1.9,15.7,5.7,15.7,13.6c0,8.6-7.1,13.7-18.5,13.7	C265.6,323.4,258.6,320.6,254,315.3z M337.9,315.5h-16.4l-2,6.8h-9.7l14.1-43.5h11.9l14.1,43.5h-10.1L337.9,315.5z M323.6,307.9	h12.2l-6.1-21.8L323.6,307.9z M389.9,322.3H379l-16.4-29v29H354v-43.5h10.9l16.4,29.7v-29.7h8.6V322.3z M410.7,278.8	c12.2,0,23,5.8,23,21.2c0,17.1-11,22.4-21.2,22.4h-16.1v-43.5h14.3V278.8z M406.1,286.5v28h6.5c5.5,0,11.4-2.7,11.4-14.6	c0-8.1-3.7-13.4-13-13.4H406.1z M79.7,349.2l-9.2,2.4c-1.9-4.7-4.9-7.2-9.9-7.2c-6.9,0-11.3,5.3-11.3,14.7c0,9.3,3.9,15,11.4,15	c5.7,0,8.9-2.9,10.8-8.2l9,2.8c-3.4,8.9-11.1,13.3-20.3,13.3c-10,0-20.7-6.2-20.7-22.9c0-16.2,10.3-22.8,21-22.8	C68.4,336.5,76.1,339.6,79.7,349.2z M101.7,337.5c12.1,0,17.2,6,17.2,13.5c0,5.8-3,10-9,12.1l11.4,18h-11.1l-9.6-16.5h-6v16.5h-9.5	v-43.5h16.6V337.5z M94.6,345.2v12h7.5c4,0,7.1-1.4,7.1-6.2c0-3.9-2.5-5.8-6.8-5.8H94.6z M154.6,345.4H135v9.7h18.3v7.6H135v10.6	h20.2v7.8h-29.6v-43.5h29.1L154.6,345.4L154.6,345.4z M188.5,374.2h-16.4l-2,6.8h-9.7l14.1-43.5h11.9l14.1,43.5h-10.1L188.5,374.2z M174.2,366.6h12.2l-6.1-21.8L174.2,366.6z M230.7,345.4h-12.3V381h-9.5v-35.6h-12.3v-7.9h34.1V345.4z M244.9,381.1h-9.5v-43.5h9.5	V381.1z M275.7,381.1h-11.9l-13.1-43.5h10.1l9.1,35.8l9-35.8h9.9L275.7,381.1z M303.9,381.1h-9.5v-43.5h9.5V381.1z M343.7,345.4	h-12.3V381h-9.5v-35.6h-12.3v-7.9h34.1V345.4z M371.5,363.8v17.3H362v-17.2l-14.9-26.4h10.8l9,18.6l9.1-18.6h10.4L371.5,363.8z"/></svg>
+</template>

package/icons/power/council.vue

@@ -0,0 +1,13 @@
+<template>
+    <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0" y="0" width="246" height="58" viewBox="0 0 246 58" xml:space="preserve" enable-background="new 0 0 246 58"><path d="M95.2,17.9h3.6l6.3,16.1h-3.6l-1.4-3.7h-6.5L92.3,34H89L95.2,17.9z M97,21.1L97,21.1l-2.4,6.7h4.7L97,21.1L97,21.1z M106.9,17.9h3.5c3.5,0,7.6-0.1,7.6,4.4c0,1.9-1.3,3.5-3.3,3.7l0,0c0.9,0.1,1.4,1,1.7,1.7L119,34h-3.6l-1.9-5	c-0.5-1.2-0.9-1.7-2.2-1.7h-1V34h-3.2V17.9H106.9z M110.1,24.7h1.1c1.6,0,3.4-0.2,3.4-2.2c0-1.9-1.8-2.1-3.4-2.1h-1.1V24.7	L110.1,24.7z M124.1,20.4h-4.6v-2.5H132v2.5h-4.6V34h-3.2V20.4 M142.7,20.8c-1-0.4-2.1-0.7-3.3-0.7c-1.1,0-2.5,0.5-2.5,2.2	c0,2.8,7.1,1.6,7.1,7c0,3.5-2.8,4.9-6.1,4.9c-1.8,0-2.5-0.2-4.1-0.6l0.3-2.9c1.1,0.6,2.4,1,3.7,1c1.2,0,2.9-0.6,2.9-2.1	c0-3.1-7.1-1.8-7.1-7.1c0-3.6,2.8-4.9,5.6-4.9c1.4,0,2.7,0.2,3.9,0.6L142.7,20.8 M164.5,33.8c-1.2,0.3-2.4,0.5-3.7,0.5	c-5.2,0-8.8-2.6-8.8-8.1s3.4-8.6,8.8-8.6c1.1,0,2.5,0.2,3.6,0.7l-0.2,2.7c-1.2-0.7-2.3-0.9-3.5-0.9c-3.3,0-5.4,2.5-5.4,5.8	s2,5.8,5.5,5.8c1.3,0,2.8-0.3,3.5-0.7L164.5,33.8 M173.9,17.6c5.1,0,7.9,3.4,7.9,8.3s-2.8,8.4-7.9,8.4c-5.2,0-7.9-3.4-7.9-8.4	S168.8,17.6,173.9,17.6 M173.9,31.7c3.3,0,4.5-2.9,4.5-5.8c0-2.8-1.3-5.8-4.5-5.8s-4.5,2.9-4.5,5.8S170.6,31.7,173.9,31.7 M184,17.9	h3.2v9.3c0,2.7,0.9,4.5,3.4,4.5s3.3-1.8,3.3-4.5v-9.3h3.2v10.3c0,4.3-2.4,6.1-6.6,6.1c-4.1,0-6.6-1.8-6.6-6.1V17.9 M199.6,17.9h4	l6.1,12.1l0,0V17.9h3.1V34h-3.9l-6.2-12.1l0,0V34h-3.1L199.6,17.9 M227.4,33.8c-1.2,0.3-2.4,0.5-3.7,0.5c-5.2,0-8.8-2.6-8.8-8.1	s3.4-8.6,8.8-8.6c1.1,0,2.5,0.2,3.6,0.7l-0.2,2.7c-1.2-0.7-2.3-0.9-3.5-0.9c-3.3,0-5.4,2.5-5.4,5.8s2,5.8,5.5,5.8	c1.3,0,2.8-0.3,3.5-0.7L227.4,33.8 M229.9,34h3.2V17.9h-3.2V34z M235.7,17.9h3.2v13.6h6.3V34h-9.5V17.9 M89,41h9.5v2.5h-6.3v4H98V50	h-5.8v4.5h6.3V57H89V41 M101.2,41h4l6.1,12.1l0,0V41h3.1v16.1h-3.9L104.3,45l0,0v12.1h-3.1L101.2,41 M130,44.1	c-1.2-0.6-2.9-0.9-4.2-0.9c-3.8,0-5.8,2.5-5.8,5.8s2,5.7,5.5,5.7c0.9,0,1.6-0.1,2.1-0.2v-4.2h-3.4v-2.5h6.5v8.7	c-1.7,0.5-3.5,0.8-5.2,0.8c-5.2,0-8.8-2.6-8.8-8.1s3.4-8.6,8.8-8.6c1.9,0,3.3,0.3,4.7,0.7L130,44.1 M133.3,41h3.2v13.6h6.3v2.5h-9.5	V41 M150.5,41h3.6l6.3,16.1h-3.6l-1.4-3.7H149l-1.4,3.7h-3.4L150.5,41z M152.3,44.2L152.3,44.2l-2.4,6.7h4.7L152.3,44.2L152.3,44.2z M162.1,41h4l6.1,12.1l0,0V41h3.1v16.1h-3.9L165.2,45l0,0v12.1h-3.1L162.1,41 M177.9,41h4.4c4.9,0,9.3,1.7,9.3,8.1s-4.4,8.1-9.3,8.1	h-4.4V41z M181.2,54.5h1.8c2.7,0,5.3-2,5.3-5.5s-2.6-5.5-5.3-5.5h-1.8V54.5L181.2,54.5z M89.1,8.5c0.4,0.2,0.9,0.3,1.6,0.3	c1.1,0,2.3-0.6,2.3-2c0-2.1-3.3-2.1-3.3-3.5c0-0.9,0.8-1.2,1.5-1.2c0.5,0,1,0.1,1.3,0.3l0.1-0.6c-0.5-0.2-1-0.2-1.4-0.2	C90,1.6,89,2.3,89,3.4c0,1.9,3.2,2,3.2,3.4c0,1-0.7,1.5-1.6,1.5c-0.7,0-1.1-0.2-1.6-0.4L89.1,8.5z M98.5,3.5h-0.6v2.9	c0,0.9-0.4,1.9-1.5,1.9c-0.9,0-1.2-0.6-1.2-1.6V3.5h-0.6v3.3c0,1.1,0.5,2,1.8,2c1.1,0,1.5-0.6,1.7-1l0,0v0.9h0.6c0-0.4,0-0.8,0-1.2	v-4H98.5z M100.2,10.8h0.6v-3l0,0c0.3,0.7,0.8,1,1.6,1c1.4,0,2.1-1.2,2.1-2.7c0-1.6-0.6-2.7-2.1-2.7c-1.1,0-1.5,0.8-1.7,1.1l0,0V3.6	h-0.6L100.2,10.8L100.2,10.8z M103.9,6.1c0,1-0.3,2.2-1.5,2.2c-1.1,0-1.5-1.2-1.5-2.2c0-0.9,0.4-2.2,1.5-2.2	C103.6,3.9,103.9,5.1,103.9,6.1L103.9,6.1z M106,10.8h0.6v-3l0,0c0.3,0.7,0.8,1,1.6,1c1.4,0,2.1-1.2,2.1-2.7c0-1.6-0.6-2.7-2.1-2.7	c-1.1,0-1.5,0.8-1.7,1.1l0,0V3.6H106V10.8z M109.7,6.1c0,1-0.3,2.2-1.5,2.2c-1.1,0-1.5-1.2-1.5-2.2c0-0.9,0.4-2.2,1.5-2.2	C109.4,3.9,109.7,5.1,109.7,6.1L109.7,6.1z M111.6,6.1c0,1.4,0.7,2.7,2.4,2.7c1.7,0,2.4-1.3,2.4-2.7s-0.7-2.7-2.4-2.7	C112.3,3.4,111.6,4.7,111.6,6.1L111.6,6.1z M112.3,6.1c0-1.2,0.6-2.2,1.7-2.2s1.7,1,1.7,2.2s-0.6,2.2-1.7,2.2	C112.9,8.2,112.3,7.3,112.3,6.1L112.3,6.1z M117.8,8.7h0.6V6.1c0-0.9,0.3-2.1,1.3-2.1c0.2,0,0.3,0,0.5,0.1V3.4	c-0.1,0-0.3-0.1-0.4-0.1c-0.7,0-1.1,0.5-1.3,1.1l0,0v-1h-0.6c0,0.4,0,0.6,0,1.2L117.8,8.7L117.8,8.7z M123.8,3.5h-1.2V2L122,2.2v1.2	h-1V4h1v3c0,0.9,0,1.7,1.2,1.7c0.3,0,0.6-0.1,0.8-0.1V8.1c-0.2,0.1-0.3,0.1-0.6,0.1c-0.5,0-0.7-0.4-0.7-0.9V4h1.2L123.8,3.5	L123.8,3.5z M128.5,7.8c-0.3,0.2-1,0.4-1.5,0.4c-1.1,0-1.7-0.9-1.7-2h3.5V5.9c0-1.4-0.6-2.6-2.1-2.6c-1.3,0-2.2,1.1-2.2,2.7	s0.6,2.7,2.4,2.7c0.5,0,1.1-0.1,1.5-0.3L128.5,7.8L128.5,7.8z M125.4,5.7c0-0.9,0.6-1.8,1.5-1.8c1,0,1.3,0.9,1.3,1.8H125.4z M134.5,1h-0.6v3.3l0,0c-0.1-0.3-0.6-1-1.6-1c-1.5,0-2.1,1.1-2.1,2.7c0,1.5,0.7,2.7,2.1,2.7c0.7,0,1.3-0.3,1.6-0.9l0,0v0.8h0.6V1z M130.7,6.1c0-1,0.3-2.2,1.5-2.2c1.1,0,1.5,1.2,1.5,2.2c0,0.9-0.4,2.2-1.5,2.2C131.1,8.2,130.7,7.1,130.7,6.1L130.7,6.1z M142,3.5	h-0.6v2.9c0,0.9-0.4,1.9-1.5,1.9c-0.9,0-1.2-0.6-1.2-1.6V3.5H138v3.3c0,1.1,0.5,2,1.8,2c1.1,0,1.5-0.6,1.7-1l0,0v0.9h0.6	c0-0.4,0-0.8,0-1.2v-4H142z M143.3,8.5c0.5,0.2,1,0.2,1.5,0.2c0.8,0,1.8-0.4,1.8-1.5c0-1.7-2.6-1.6-2.6-2.5c0-0.7,0.5-0.9,1.1-0.9	c0.4,0,0.8,0.1,1.1,0.2l0.1-0.6c-0.5-0.2-1-0.2-1.3-0.2c-0.9,0-1.7,0.4-1.7,1.4c0,1.5,2.5,1.3,2.5,2.5c0,0.6-0.5,0.9-1.1,0.9	c-0.5,0-1-0.1-1.4-0.3L143.3,8.5z M147.8,8.7h0.6V3.5h-0.6V8.7z M147.8,2.1h0.6V1.2h-0.6V2.1z M150.2,8.7h0.6V5.8	c0-0.9,0.4-1.9,1.5-1.9c0.9,0,1.2,0.6,1.2,1.6v3.1h0.6V5.3c0-1.1-0.5-2-1.8-2c-1.1,0-1.5,0.6-1.7,1l0,0V3.5H150c0,0.4,0,0.8,0,1.2v4	H150.2z M156.3,6.1c0-1,0.3-2.2,1.5-2.2s1.5,0.9,1.5,2.2c0,0.9-0.4,2-1.6,2C156.7,8.1,156.3,7.1,156.3,6.1L156.3,6.1z M160,3.5h-0.6	v0.6l0,0c-0.5-0.6-0.9-0.7-1.6-0.7c-1.5,0-2.1,1.1-2.1,2.7c0,1.1,0.5,2.6,2.2,2.6c0.7,0,1.2-0.3,1.6-1l0,0c0,1.5-0.1,2.7-1.8,2.7	c-0.6,0-1.1-0.2-1.5-0.4l-0.1,0.6c0.3,0.1,0.9,0.3,1.6,0.3c1.8,0,2.4-1.2,2.4-2.6L160,3.5L160,3.5z M163.5,10.8h0.6v-3l0,0	c0.3,0.7,0.8,1,1.6,1c1.4,0,2.1-1.2,2.1-2.7c0-1.6-0.6-2.7-2.1-2.7c-1.1,0-1.5,0.8-1.7,1.1l0,0V3.6h-0.6L163.5,10.8L163.5,10.8z M167.2,6.1c0,1-0.3,2.2-1.5,2.2c-1.1,0-1.5-1.2-1.5-2.2c0-0.9,0.4-2.2,1.5-2.2C166.9,3.9,167.2,5.1,167.2,6.1L167.2,6.1z M173.4,3.5h-0.6v2.9c0,0.9-0.4,1.9-1.5,1.9c-0.9,0-1.2-0.6-1.2-1.6V3.5h-0.6v3.3c0,1.1,0.5,2,1.8,2c1.1,0,1.5-0.6,1.7-1l0,0v0.9	h0.6c0-0.4,0-0.8,0-1.2v-4H173.4z M175.1,8.7h0.6V7.8l0,0c0.3,0.7,0.9,0.9,1.6,0.9c1.4,0,2.1-1.2,2.1-2.7c0-1.6-0.6-2.7-2.1-2.7	c-1,0-1.5,0.7-1.6,1l0,0V1h-0.6V8.7z M178.8,6.1c0,1-0.3,2.2-1.5,2.2c-1.1,0-1.5-1.2-1.5-2.2c0-0.9,0.4-2.2,1.5-2.2	C178.5,3.9,178.8,5.1,178.8,6.1L178.8,6.1z M180.9,8.7h0.6V1h-0.6V8.7z M183.3,8.7h0.6V3.5h-0.6V8.7z M183.3,2.1h0.6V1.2h-0.6V2.1z M189.1,3.6c-0.2-0.1-0.6-0.2-1.3-0.2c-1.5,0-2.6,1.1-2.6,2.7c0,1.4,0.8,2.7,2.5,2.7c0.5,0,0.9,0,1.3-0.2l0.1-0.6	c-0.4,0.1-0.8,0.2-1.2,0.2c-1.2,0-1.9-1-1.9-2.2c0-1.3,0.7-2.2,1.9-2.2c0.3,0,0.8,0.1,1.1,0.3L189.1,3.6z M192.6,8.7h0.6V4h1.2V3.5	h-1.2V3c0-0.6-0.1-1.6,0.8-1.6c0.2,0,0.4,0,0.5,0.1V0.9c-0.1-0.1-0.4-0.1-0.6-0.1c-1.3,0-1.4,1.1-1.4,2.2v0.4h-1V4h1L192.6,8.7	L192.6,8.7z M199.7,3.5h-0.6v2.9c0,0.9-0.4,1.9-1.5,1.9c-0.9,0-1.2-0.6-1.2-1.6V3.5h-0.6v3.3c0,1.1,0.5,2,1.8,2c1.1,0,1.5-0.6,1.7-1	l0,0v0.9h0.6c0-0.4,0-0.8,0-1.2v-4H199.7z M201.4,8.7h0.6V5.8c0-0.9,0.4-1.9,1.5-1.9c0.9,0,1.2,0.6,1.2,1.6v3.1h0.6V5.3	c0-1.1-0.5-2-1.8-2c-1.1,0-1.5,0.6-1.7,1l0,0V3.5h-0.6c0,0.4,0,0.8,0,1.2v4H201.4z M211.3,1h-0.6v3.3l0,0c-0.1-0.3-0.6-1-1.6-1	c-1.5,0-2.1,1.1-2.1,2.7c0,1.5,0.7,2.7,2.1,2.7c0.7,0,1.3-0.3,1.6-0.9l0,0v0.8h0.6V1z M207.6,6.1c0-1,0.3-2.2,1.5-2.2	c1.1,0,1.5,1.2,1.5,2.2c0,0.9-0.4,2.2-1.5,2.2C207.9,8.2,207.6,7.1,207.6,6.1L207.6,6.1z M213,8.7h0.6V3.5H213V8.7z M213,2.1h0.6	V1.2H213V2.1z M215.4,8.7h0.6V5.8c0-0.9,0.4-1.9,1.5-1.9c0.9,0,1.2,0.6,1.2,1.6v3.1h0.6V5.3c0-1.1-0.5-2-1.8-2c-1.1,0-1.5,0.6-1.7,1	l0,0V3.5h-0.6c0,0.4,0,0.8,0,1.2v4H215.4z M221.5,6.1c0-1,0.3-2.2,1.5-2.2s1.5,0.9,1.5,2.2c0,0.9-0.4,2-1.6,2	C221.9,8.1,221.5,7.1,221.5,6.1L221.5,6.1z M225.2,3.5h-0.6v0.6l0,0c-0.5-0.6-0.9-0.7-1.6-0.7c-1.5,0-2.1,1.1-2.1,2.7	c0,1.1,0.5,2.6,2.2,2.6c0.7,0,1.2-0.3,1.6-1l0,0c0,1.5-0.1,2.7-1.8,2.7c-0.6,0-1.1-0.2-1.5-0.4l-0.1,0.6c0.3,0.1,0.9,0.3,1.6,0.3	c1.8,0,2.4-1.2,2.4-2.6L225.2,3.5L225.2,3.5z M228.7,8.7h0.6V7.8l0,0c0.3,0.7,0.9,0.9,1.6,0.9c1.4,0,2.1-1.2,2.1-2.7	c0-1.6-0.6-2.7-2.1-2.7c-1,0-1.5,0.7-1.6,1l0,0V1h-0.6V8.7z M232.4,6.1c0,1-0.3,2.2-1.5,2.2c-1.1,0-1.5-1.2-1.5-2.2	c0-0.9,0.4-2.2,1.5-2.2C232.1,3.9,232.4,5.1,232.4,6.1L232.4,6.1z M234.5,3.5h-0.7l1.8,5.2l-0.1,0.5c-0.2,0.7-0.4,1.1-0.9,1.1	c-0.2,0-0.4,0-0.5-0.1l-0.1,0.5c0.2,0.1,0.5,0.1,0.7,0.1c0.7,0,1.1-0.7,1.3-1.4l2.1-6h-0.7l-1.5,4.3l0,0L234.5,3.5L234.5,3.5z M5.2,29.1l0.1,1.7l-3-0.8l0,0L5.2,29.1z M8,28.3v-1.8l-7.1,2.6l0,1.9l7.3,2.2l-0.1-1.6L6.5,31l-0.1-2.3L8,28.3L8,28.3z M3.1,21.1	l0.2-0.5c0.3-0.9,0.9-0.8,1.2-0.7c0.5,0.2,0.8,0.6,0.6,1.2l-0.2,0.5L3.1,21.1z M8.4,24.5l0.5-1.6L6.1,22c0.2-0.6,0.3-0.8,1.3-0.8	l2,0.1l0.5-1.7H7.4c-0.9,0-1.2,0.1-1.5,0.6l0,0c0.2-1.4-1-1.8-1.2-1.9c-1.3-0.4-2.1,0.4-2.4,1.5l-0.8,2.5L8.4,24.5L8.4,24.5z M11.4,17.4l1-1.4l-4.8-3.4l0.9-1.3l-1.1-0.7l-2.8,4l1.1,0.7L6.5,14L11.4,17.4 M12.8,5.7c-0.6,0.3-1,0.5-1.5,0.9	c-1.9,1.6-0.7,3-0.6,3.2c1.7,2,3.4-0.4,4.3,0.7c0.4,0.5,0.2,1-0.3,1.3c-0.5,0.4-1,0.5-1.5,0.7l0.8,1.1c0.3-0.1,1-0.5,1.7-1	c1.1-0.9,1.4-2.3,0.5-3.3c-1.6-2-3.4,0.3-4.3-0.7c-0.3-0.4-0.2-0.9,0.2-1.2c0.3-0.3,0.9-0.5,1.3-0.6L12.8,5.7 M25.8,0.5	c-0.3-0.1-0.9-0.2-1.9,0.1c-1.4,0.3-2.9,1.8-2.3,4.3c0.5,2.2,2.2,3.4,4.1,2.9c0.9-0.2,1.4-0.5,1.7-0.7L27,5.7	c-0.1,0.1-0.5,0.5-1.4,0.7c-1.1,0.2-2.1-0.5-2.4-1.9s0.2-2.5,1.3-2.7c0.8-0.2,1.2,0,1.5,0.1L25.8,0.5 M31.4,3.7	C31.5,2.4,32,1.3,33,1.4s1.2,1.3,1,2.7s-0.7,2.5-1.6,2.3C31.4,6.3,31.2,5.1,31.4,3.7 M29.6,3.5c-0.3,2.1,0.5,3.8,2.6,4.1	c2.1,0.3,3.2-1.2,3.5-3.3s-0.5-3.8-2.6-4.1C31.1-0.1,29.9,1.4,29.6,3.5 M38.2,6.1c-0.8,1.6-0.3,2.9,1.1,3.6c1.5,0.7,2.8,0.4,3.6-1.2	L45,4.4l-1.5-0.8l-2.2,4.3c-0.3,0.6-0.8,0.9-1.4,0.6c-0.6-0.3-0.7-0.8-0.3-1.5l2.2-4.3l-1.5-0.8L38.2,6.1 M43.4,12l1,1.1l3.8-3.6	l0,0l-2.3,5.1l1.4,1.4l5.2-5l-1-1.1l-3.6,3.5l0,0l2.1-5L48.6,7L43.4,12 M56.8,19c0-0.3,0-0.9-0.5-1.9c-0.6-1.3-2.4-2.5-4.8-1.3	c-2.1,1-2.8,2.9-1.9,4.7c0.4,0.8,0.8,1.3,1,1.5l1.3-0.7c-0.1-0.1-0.6-0.4-1-1.2c-0.5-1,0-2.1,1.3-2.7s2.5-0.4,3,0.6	c0.3,0.7,0.3,1.2,0.3,1.5L56.8,19 M51,24.5l0.3,1.7l7.1-1.3l-0.3-1.7L51,24.5 M51.5,28.8l-0.3,4.1l1.3,0.1l0.2-2.4l5.9,0.4l0.1-1.7	L51.5,28.8 M7.3,45.6l2,2.4l0.5-0.4l-1.6-1.9l2.2-1.8l1.5,1.8l0.5-0.4l-1.5-1.8l2-1.7l1.6,1.9l0.5-0.4L13,41L7.3,45.6 M12.4,51	l0.5,0.3l3.6-5.3l0,0l-1,7l0.7,0.5l4-6l-0.5-0.3l-3.6,5.3l0,0l1.1-7L16.5,45L12.4,51 M23.6,52.9l1.2,0.4l-0.7,2.4	c-0.4,0.1-0.7,0-1-0.1c-1.8-0.5-1.9-2.4-1.6-3.7c0.6-2.2,2.2-2.6,3.2-2.3c0.5,0.2,1.1,0.6,1.3,0.8l0.2-0.7c-0.2-0.2-0.8-0.6-1.4-0.8	c-1.9-0.6-3.5,0.8-4,2.6c-0.4,1.3-0.4,3.8,2,4.5c0.6,0.2,1.1,0.2,1.7,0.1l1-3.4l-1.9-0.5L23.6,52.9 M28.9,56.9h3v-0.6h-2.4v-6.6	h-0.6V56.9 M35.6,49.6L35.6,49.6l2.3,3.4l-2.4,0.7L35.6,49.6z M34.8,56.6l0.6-0.2l0.1-2.1l2.8-0.8l1.2,1.7l0.7-0.2l-4.3-6.3L35.1,49	L34.8,56.6L34.8,56.6z M43.2,53.5l0.5-0.3l-3.5-5.3l0,0l6,3.7l0.7-0.4L43,45l-0.5,0.3l3.5,5.4l0,0L40,47l-0.7,0.4L43.2,53.5 M45.7,43.1l0.3-0.4c1.5-1.9,3.1-0.9,4-0.2c1.4,1.1,1.8,2.5,0.8,3.8l-0.4,0.5L45.7,43.1z M50.5,47.7l0.7-0.9c1.4-1.8,0.8-3.7-0.9-5	c-1.8-1.4-3.5-1.3-4.9,0.6l-0.6,0.7L50.5,47.7L50.5,47.7z M73.4,57.1h0.7v-57h-0.7V57.1z"/></svg>
+</template>
+
+<script>
+export default {
+
+}
+</script>
+
+<style>
+
+</style>

package/icons/power/index.js

@@ -1,6 +1,6 @@
-import AlleyneIcon from './AlleyneIcon'
-import BanffIcon from './BanffIcon'
-import CouncilIcon from './CouncilIcon'
+import AlleyneIcon from './alleyne'
+import BanffIcon from './banff'
+import CouncilIcon from './council'
 
 export {
   AlleyneIcon,

package/icons/snippets/index.js

@@ -1,7 +1,7 @@
-import BarbicanIcon from './BarbicanIcon'
-import ContributorIcon from './ContributorIcon'
-import OtherIcon from './OtherIcon'
-import PinIcon from './PinIcon'
+import BarbicanIcon from './barbican'
+import ContributorIcon from './contributor'
+import OtherIcon from './other'
+import PinIcon from './pin'
 
 export {
   BarbicanIcon,

package/icons/stream/close.vue

@@ -0,0 +1,7 @@
+<template>
+  <svg width="28" viewBox="0 0 20 20">
+    <path data-fill fill="#fefbfa" d="M10,0C4.5,0,0,4.5,0,10s4.5,10,10,10s10-4.5,10-10S15.5,0,10,0z" />
+    <path data-outline fill="#353535" d="M10,0C4.5,0,0,4.5,0,10s4.5,10,10,10s10-4.5,10-10S15.5,0,10,0z M10,18c-4.4,0-8-3.6-8-8s3.6-8,8-8s8,3.6,8,8	S14.4,18,10,18z" />
+    <path data-cross fill="#353535" d="M12.6,6L10,8.6L7.4,6L6,7.4L8.6,10L6,12.6L7.4,14l2.6-2.6l2.6,2.6l1.4-1.4L11.4,10L14,7.4L12.6,6z" />
+  </svg>
+</template>

package/icons/stream/index.js

@@ -1,10 +1,10 @@
-import AirplayIcon from './AirplayIcon'
-import CastIcon from './CastIcon'
-import ChatIcon from './ChatIcon'
-import CogIcon from './CogIcon'
-import VolumeIcon from './VolumeIcon'
-import LiveIcon from './LiveIcon'
-import CloseIcon from './close_icon'
+import AirplayIcon from './airplay'
+import CastIcon from './cast'
+import ChatIcon from './chat'
+import CogIcon from './cog'
+import VolumeIcon from './volume'
+import LiveIcon from './live'
+import CloseIcon from './close'
 
 export {
   AirplayIcon,

package/icons/stream/{LiveIcon/index.vue → live.vue}

@@ -58,4 +58,49 @@ export default {
 };
 </script>
 
-<style src="./live_icon.scss" lang="scss"></style>
+<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/index.js

@@ -3,7 +3,6 @@ import Card from './components/card'
 import Container from './components/container'
 import Block from './components/block'
 import EventSummary from './components/event_summary'
-import AccountCard from './components/account_card'
 import AccountTitle from './components/account_title'
 import Wrap from './components/wrap'
 import TableRow from './components/table_row'
@@ -11,32 +10,53 @@ import Banner from './components/banner'
 import Alert from './components/alert'
 import LoadingAnimation from './components/loading_animation'
 import RelatedTitle from './components/related_title'
+import RelatedCard from './components/related_card'
+import RelatedRow from './components/related_row'
 import TypeText from './components/type_text'
 import Placeholder from './components/placeholder'
 import Carousel from './components/carousel'
+import NewCarousel from './components/new_carousel'
 import CardDeck from './components/card_deck'
 import FormSection from './components/form_section'
 import FormUpdate from './components/form_update'
 import FormGroup from './components/form_group'
+import RadioGroup from './components/radio_group'
+import FooterUpper from './components/footer_upper'
+import FooterLogos from './components/footer_logos'
+import FooterLower from './components/footer_lower'
+import FluidIframe from './components/fluid_iframe'
+import HelpRow from './components/help_row'
+import DisplayStream from './components/display_stream'
+import VideosRow from './components/videos_row'
 
 export { 
   LoadingAnimation, 
   Alert,
   RelatedTitle,
+  RelatedCard,
+  RelatedRow,
   TypeText,
   Container,
   Wrap,
   Card,
   Carousel,
+  NewCarousel,
   Banner,
-  AccountCard,
   AccountTitle,
   Placeholder,
   FormSection,
   FormUpdate,
   FormGroup,
+  RadioGroup,
   TableRow,
   Block,
   EventSummary,
-  CardDeck
+  CardDeck,
+  FooterUpper,
+  FooterLogos,
+  FooterLower,
+  FluidIframe,
+  HelpRow,
+  DisplayStream,
+  VideosRow
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "barbican-reset",
-  "version": "1.2.6",
+  "version": "1.3.0",
   "description": "A collection of useful scss imports and js scripts, that provide consistent styling and functionality across barbican projects.",
   "main": "index.js",
   "scripts": {
@@ -39,6 +39,7 @@
     "node-sass-tilde-importer": "^1.0.2",
     "placeholder-loading": "^0.4.0",
     "sass": "^1.41.0",
+    "vue-moment": "^4.1.0",
     "vue-slick-carousel": "^1.0.6"
   }
 }

package/scss/_btn.scss

@@ -40,6 +40,10 @@
     @include btn-link;
   }
 
+  &.btn-video-help {
+    @include btn-video-help;
+  }
+
   &.btn-exit {
     @include btn-exit;
   }
@@ -56,6 +60,10 @@
     @include btn-video-login;
   }
 
+  &.btn-invisible {
+    @include btn-invisible;
+  }
+
   // modifyers
   &.expand {
     @include btn-expand;

package/scss/_radio-group.scss

@@ -29,13 +29,8 @@ $margin-radio: 0.25rem;
       border: 1px solid $c-status-neutral;
       color: $c-status-neutral;
     }
-    
-    &:hover, &[data-focus-visible-added] {
-      &:focus {
-        box-shadow: none; 
-        outline: none; 
-      }
-      
+
+    @include focus {
       ~ label {
         @include single-box($c-grey-steel, 0.0625rem);
         border: 1px solid $c-grey-steel;
@@ -59,6 +54,7 @@ $margin-radio: 0.25rem;
     border-radius: $border-radius-lg;
     background-color: $white;  
     color: $c-grey-night;
+    font-weight: 400;
     cursor: pointer;
   }
 }
@@ -67,7 +63,7 @@ $margin-radio: 0.25rem;
   @if $status != 'neutral' {
     .radio-group.#{$status} {
       input[type=radio] {
-        &:hover, &[data-focus-visible-added] {
+        @include focus {
           &:checked ~ label {
             @include single-box(map-get($color, base), 0.0625rem);
             border: 1px solid map-get($color, base);

package/scss/card/_account.scss

@@ -0,0 +1,16 @@
+
+.card[account] {
+  margin-top: $gap-account;
+  margin-bottom: 0;
+
+  .card-body {
+    padding: $gap-account;
+  }
+
+  iframe {
+    min-height: 590px;
+    @include media-breakpoint-up(sm) {
+      min-height: 440px;
+    }
+  }
+}

package/scss/card/_related.scss

@@ -0,0 +1,9 @@
+
+.card[related] {
+  border: 1px solid $c-grey-pearl;
+  overflow: hidden;
+
+  .card-title {
+    font-size: $font-size-lg;
+  }
+}

package/scss/card/_video-help.scss

@@ -0,0 +1,31 @@
+
+$border: 1px solid $c-grey-pearl;
+
+.card[video-help] {
+  margin-bottom: 0;
+  overflow: hidden;
+  border: $border;
+
+  &:not(:first-of-type) {
+    border-top-right-radius: 0;
+    border-top-left-radius: 0;
+  }
+
+  &:not(:last-of-type) {
+    border-bottom-right-radius: 0;
+    border-bottom-left-radius: 0;
+    border-bottom: 0;
+  }
+
+  .card-header {
+    border-radius: 0;
+    border-bottom: 0;
+    overflow: hidden;
+    padding: 0;
+  }
+
+  .card-body {
+    border-top: $border;
+    padding: 1.25rem;
+  }
+}

package/scss/card/index.scss

@@ -2,6 +2,9 @@
 @import "confirm.scss";
 @import "login.scss";
 @import "password.scss";
+@import "account.scss";
+@import "video-help.scss";
+@import "related.scss";
 
 .card {
   border: 1px solid $c-grey-pearl;

package/scss/index.scss

@@ -7,7 +7,6 @@
 @import "klaro.scss";
 @import "fonts.scss";
 @import "loading-animation.scss";
-@import "type-text.scss";
 @import "close-icon.scss";
 @import "table/index.scss";
 
@@ -20,7 +19,6 @@
 @import "list.scss";
 @import "input.scss";
 @import "radio-group.scss";
-@import "radio.scss";
 
 // atomic helper styles
 @import "atomic.scss";
@@ -39,6 +37,14 @@ a, a:hover {
   color: inherit;
 }
 
-p:last-of-type {
+p:last-of-type:not([class^=margin]) {
   margin-bottom: 0;
+}
+
+footer {
+  color: $white;
+
+  &:not(.splash) {
+    background-color: $c-grey-midnight;
+  }
 }

package/scss/table/_details.scss

@@ -0,0 +1,66 @@
+table.details {
+
+  $mq: md;
+
+  thead {
+    background-color: $c-grey-alpine;
+    font-weight: 700;
+    display: block;
+
+    @include media-breakpoint-down($mq) {
+      display: none;
+    }
+  }
+
+  thead tr {
+    border: 1px solid $c-grey-pearl;
+  }
+
+  tr {
+    display: grid;
+
+    @include media-breakpoint-up($mq) {
+      grid-template-columns: auto 10rem 8rem;
+    }
+
+    @include media-breakpoint-down($mq) {
+      border-radius: $border-radius-lg;
+    }
+  }
+
+  tbody tr {
+    border-bottom: 1px solid $c-grey-pearl;
+    border-right: 1px solid $c-grey-pearl;
+    border-left: 1px solid $c-grey-pearl;
+
+    @include media-breakpoint-down($mq) {
+      border-top: 1px solid $c-grey-pearl;
+
+      &:not(:last-of-type) {
+        margin-bottom: 1rem;
+      }    
+    }
+  }
+
+  th, td {
+    padding: 0.75rem;
+
+    @include media-breakpoint-up($mq) {
+      &:not(:last-of-type) {
+        border-right: 1px solid $c-grey-pearl;
+      }
+  
+      &:last-of-type {
+        text-align: right;
+      }
+    }
+  }
+
+  label {
+    font-size: $font-size-lg;
+
+    @include media-breakpoint-up($mq) {
+      display: none;
+    }
+  }
+}