barbican-reset 1.5.7 → 1.5.8

package/components/br_button/components.js

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

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

@@ -10,12 +10,6 @@
       </template>
     </remove-ticket>
 
-    <outline-primary v-else-if="variant === 'outline-primary'" :state="state">
-      <template v-for="(index, name) in $slots" v-slot:[name]>
-        <slot :name="name" />
-      </template>
-    </outline-primary>
-
     <template v-else>
 
       <template v-if="state === 'default'">
@@ -23,7 +17,7 @@
           <slot name="default" />
         </template>
         <template v-else>
-          {{ state }}
+          {{ titleCase(state) }}
         </template>
       </template>
 
@@ -31,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'">
@@ -41,7 +33,7 @@
           <slot name="loaded" />
         </template>
         <template v-else>
-          {{ state }}
+          {{ titleCase(state) }}
         </template>
       </template>
 
@@ -50,7 +42,7 @@
           <slot name="error" />
         </template>
         <template v-else>
-          {{ state }}
+          {{ titleCase(state) }}
         </template>
       </template>
 
@@ -61,7 +53,7 @@
 
 <script>
 import { BButton } from 'bootstrap-vue'
-import { RemoveTicket, OutlinePrimary } from './br_button/components'
+import { RemoveTicket, DotTyping } from './br_button/components'
 
 export default {
   name: "BrButton",
@@ -78,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";
@@ -86,7 +83,7 @@ export default {
   components: {
     BButton,
     RemoveTicket,
-    OutlinePrimary
+    DotTyping
   }
 }
 </script>

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;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "barbican-reset",
-  "version": "1.5.7",
+  "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/components/br_button/outline_primary.vue

@@ -1,60 +0,0 @@
-<template>
-  <div>
-
-    <template v-if="state === 'default'">
-      <template v-if="$slots.default">
-        <slot name="default" />
-      </template>
-      <template v-else>
-        {{ state }}
-      </template>
-    </template>
-
-    <template v-else-if="state === 'loading'">
-      <template v-if="$slots.loading">
-        <slot name="loading" />
-      </template>
-      <dot-typing v-else />
-    </template>
-
-    <template v-else-if="state === 'loaded'">
-      <template v-if="$slots.loaded">
-        <slot name="loaded" />
-      </template>
-      <template v-else>
-        {{ state }}
-      </template>
-    </template>
-
-    <template v-else-if="state === 'error'">
-      <template v-if="$slots.error">
-        <slot name="error" />
-      </template>
-      <template v-else>
-        {{ state }}
-      </template>
-    </template>
-
-  </div>  
-</template>
-
-<script>
-import { DotTyping } from './components'
-
-export default {
-  name: 'OutlinePrimary',
-  components: {
-    DotTyping
-  },
-  props: {
-    state: {
-      type: String,
-      default: "default"
-    }
-  },
-}
-</script>
-
-<style>
-
-</style>