From 09d84052a571466f8d92f006b6163188daf32a72 Mon Sep 17 00:00:00 2001 From: Troy Morehouse Date: Thu, 27 Apr 2017 12:29:50 -0300 Subject: [PATCH 1/5] Resync with master (#9) * Create form-input-static.vue New form-static input * Added form-input-static compoinent * Refactored static input Refactored to use the new `` component * Switch to bFormInputStatic Updated child component var to bFormInputStatic to follow proper naming conventions * Removed lazyFormatter from static-input * Added trailing semi-colon To make CircleCI happy * Added missing 'this' * [nav-item] add dropdown class * Added for robustness * new b-form-input-static component (#292) * Create form-input-static.vue New form-static input * Added form-input-static compoinent * Refactored static input Refactored to use the new `` component * Switch to bFormInputStatic Updated child component var to bFormInputStatic to follow proper naming conventions * Removed lazyFormatter from static-input * Added trailing semi-colon To make CircleCI happy * Added missing 'this' * Added for robustness * fixed missing `.vue` extension on import * Added missing extension on component import (#293) * Optimized import order in form-input.vue (#294) * Added missing extension on component import * Optimized import order --- lib/components/form-input-static.vue | 31 ++++++++++++++++++++++++++++ lib/components/form-input.vue | 14 ++++++------- lib/components/index.js | 2 ++ lib/components/nav-item-dropdown.vue | 2 +- lib/mixins/generate-id.js | 2 +- 5 files changed, 42 insertions(+), 9 deletions(-) create mode 100644 lib/components/form-input-static.vue diff --git a/lib/components/form-input-static.vue b/lib/components/form-input-static.vue new file mode 100644 index 00000000000..4958e67e6d6 --- /dev/null +++ b/lib/components/form-input-static.vue @@ -0,0 +1,31 @@ + + + diff --git a/lib/components/form-input.vue b/lib/components/form-input.vue index f0305e93d76..17c3e24afaa 100755 --- a/lib/components/form-input.vue +++ b/lib/components/form-input.vue @@ -19,24 +19,24 @@ @focus="$emit('focus')" @blur="$emit('blur')" /> -

+