@magicgol/polyjuice 0.20.0 → 0.21.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@magicgol/polyjuice",
-  "version": "0.20.0",
+  "version": "0.21.1",
   "scripts": {
     "serve": "vue-cli-service serve",
     "build": "vue-cli-service build",

package/src/components/box/selection-box/SelectionBox.stories.js

@@ -1,6 +1,7 @@
 import MgSelectionBox from './SelectionBox.vue';
 import MgPrimaryButton from "../../form/button/primary-button/PrimaryButton";
 import MgMagicCoinButton from "../../magic-coin/button/MagicCoinButton";
+import MgTertiaryButton from "../../form/button/tertiary-button/TertiaryButton";
 
 // More on default export: https://storybook.js.org/docs/vue/writing-stories/introduction#default-export
 export default {
@@ -26,10 +27,12 @@ export default {
 // More on component templates: https://storybook.js.org/docs/vue/writing-stories/introduction#using-args
 const Template = (args, { argTypes }) => ({
   props: Object.keys(argTypes),
-  components: { MgSelectionBox, MgPrimaryButton },
+  components: { MgSelectionBox, MgPrimaryButton, MgTertiaryButton },
   template: `<mg-selection-box v-bind="$props">
     <template v-if="${'default' in args}" v-slot>${args.default}</template>
-    <template v-slot:cancel>Annulla</template>
+    <template v-slot:cancel>
+      <mg-tertiary-button>Annulla</mg-tertiary-button>
+    </template> 
     <template v-slot:confirm>
       <mg-primary-button>Conferma</mg-primary-button>
     </template>
@@ -44,10 +47,12 @@ Default.args = {
 
 const PaymentTemplate = (args, { argTypes }) => ({
   props: Object.keys(argTypes),
-  components: { MgSelectionBox, MgMagicCoinButton },
+  components: { MgSelectionBox, MgMagicCoinButton, MgTertiaryButton },
   template: `<mg-selection-box v-bind="$props">
     <template v-if="${'default' in args}" v-slot>${args.default}</template>
-    <template v-slot:cancel>Annulla</template>
+    <template v-slot:cancel>
+      <mg-tertiary-button>Annulla</mg-tertiary-button>
+    </template>
     <template v-slot:confirm>
       <mg-magic-coin-button>Conferma</mg-magic-coin-button>
     </template>

package/src/components/box/selection-box/SelectionBox.vue

@@ -7,9 +7,7 @@
         <div class="text-center text-uppercase"><slot></slot></div>
         <div class="d-flex align-items-center mt-2">
           <div class="w-50 text-center">
-            <mg-tertiary-button
-              v-on:click="$emit('cancel')"
-            ><slot name="cancel"></slot></mg-tertiary-button>
+            <slot name="cancel"></slot>
           </div>
           <div class="w-50">
             <slot name="confirm"></slot>
@@ -22,8 +20,6 @@
 </template>
 
 <script>
-import MgTertiaryButton from "../../form/button/tertiary-button/TertiaryButton";
-
 export default {
   name: 'mg-selection-box',
 
@@ -34,10 +30,6 @@ export default {
       };
     },
   },
-
-  components: {
-    MgTertiaryButton
-  },
 };
 </script>
 

package/src/components/typography/h2/HeadingTwo.vue

@@ -20,7 +20,7 @@ export default {
   .mg-h2 {
     color: #343434;
     font-family: 'Ubuntu', sans-serif;
-    font-size: 1rem;
+    font-size: 1.125rem;
     font-weight: 500;
   }
 </style>

package/src/components/typography/h3/HeadingThree.vue

@@ -21,6 +21,7 @@ export default {
     color: #343434;
     font-family: 'Ubuntu', sans-serif;
     font-size: 1rem;
-    font-weight: 400;
+    font-weight: 500;
+    line-height: 1.17;
   }
 </style>

package/src/components/typography/h4/HeadingFour.stories.js

@@ -6,11 +6,6 @@ export default {
   component: MgHeadingFour,
   // More on argTypes: https://storybook.js.org/docs/vue/api/argtypes
   argTypes: {
-    level: {
-      control: { type: 'select' },
-      options: [null, 'club'],
-      defaultValue: null
-    },
     default: {
       description: "The default Vue slot",
       control: {
@@ -27,10 +22,9 @@ export default {
 };
 
 // More on component templates: https://storybook.js.org/docs/vue/writing-stories/introduction#using-args
-const Template = (args, { argTypes }) => ({
-  props: Object.keys(argTypes),
+const Template = args => ({
   components: { MgHeadingFour },
-  template: `<mg-heading-four v-bind="$props"><template v-if="${'default' in args}" v-slot>${args.default}</template></mg-heading-four>`,
+  template: `<mg-heading-four><template v-if="${'default' in args}" v-slot>${args.default}</template></mg-heading-four>`,
 });
 
 export const Default = Template.bind({});

package/src/components/typography/h4/HeadingFour.vue

@@ -6,21 +6,10 @@
 export default {
   name: 'mg-heading-four',
 
-  props: {
-    level: {
-      type: String,
-      default: null,
-      validator: function (value) {
-        return ['club'].indexOf(value) !== -1;
-      },
-    }
-  },
-
   computed: {
     classes() {
       return {
         'mg-h4': true,
-        'mg-h4--level-club': this.level === 'club',
       };
     }
   },
@@ -28,18 +17,10 @@ export default {
 </script>
 
 <style lang="scss">
-  @import '../../../assets/palette';
-
   .mg-h4 {
     color: #343434;
     font-family: 'Ubuntu', sans-serif;
-    font-size: 0.875rem;
-    font-weight: 700;
-
-    &--level {
-      &-club {
-        color: map-get($palette, 'expertClub') !important;
-      }
-    }
+    font-size: 1rem;
+    font-weight: 400;
   }
 </style>

package/src/components/typography/h5/HeadingFive.stories.js

@@ -0,0 +1,40 @@
+import MgHeadingFive from './HeadingFive.vue';
+
+// More on default export: https://storybook.js.org/docs/vue/writing-stories/introduction#default-export
+export default {
+  title: 'Typography/Heading/H5',
+  component: MgHeadingFive,
+  // More on argTypes: https://storybook.js.org/docs/vue/api/argtypes
+  argTypes: {
+    level: {
+      control: { type: 'select' },
+      options: [null, 'club'],
+      defaultValue: null
+    },
+    default: {
+      description: "The default Vue slot",
+      control: {
+        type: 'text',
+      },
+      table: {
+        category: 'Slots',
+        type: {
+          summary: 'html',
+        },
+      }
+    }
+  },
+};
+
+// More on component templates: https://storybook.js.org/docs/vue/writing-stories/introduction#using-args
+const Template = (args, { argTypes }) => ({
+  props: Object.keys(argTypes),
+  components: { MgHeadingFive },
+  template: `<mg-heading-five v-bind="$props"><template v-if="${'default' in args}" v-slot>${args.default}</template></mg-heading-five>`,
+});
+
+export const Default = Template.bind({});
+// More on args: https://storybook.js.org/docs/vue/writing-stories/args
+Default.args = {
+  default: 'heading 5'
+};

package/src/components/typography/h5/HeadingFive.vue

@@ -0,0 +1,45 @@
+<template>
+  <div v-bind:class="classes"><slot></slot></div>
+</template>
+
+<script>
+export default {
+  name: 'mg-heading-five',
+
+  props: {
+    level: {
+      type: String,
+      default: null,
+      validator: function (value) {
+        return ['club'].indexOf(value) !== -1;
+      },
+    }
+  },
+
+  computed: {
+    classes() {
+      return {
+        'mg-h5': true,
+        'mg-h5--level-club': this.level === 'club',
+      };
+    }
+  },
+};
+</script>
+
+<style lang="scss">
+  @import '../../../assets/palette';
+
+  .mg-h5 {
+    color: #343434;
+    font-family: 'Ubuntu', sans-serif;
+    font-size: 0.875rem;
+    font-weight: 700;
+
+    &--level {
+      &-club {
+        color: map-get($palette, 'expertClub') !important;
+      }
+    }
+  }
+</style>