From bf16b8db64869c16756846e613adf447170de082 Mon Sep 17 00:00:00 2001 From: Randall Morey Date: Wed, 5 Aug 2020 11:57:01 -0400 Subject: [PATCH] =?UTF-8?q?refactor:=20=F0=9F=92=A1=20extract=20form=20lab?= =?UTF-8?q?el=20styles?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- addons/rose/addon/styles/rose/components/form/_index.scss | 5 +++-- addons/rose/addon/styles/rose/components/form/_input.scss | 6 ------ addons/rose/addon/styles/rose/components/form/_label.scss | 8 ++++++++ .../rose/addon/styles/rose/components/form/_select.scss | 6 ------ .../rose/addon/templates/components/rose/form/input.hbs | 2 +- .../rose/addon/templates/components/rose/form/select.hbs | 2 +- .../addon/templates/components/rose/form/textarea.hbs | 2 +- 7 files changed, 14 insertions(+), 17 deletions(-) create mode 100644 addons/rose/addon/styles/rose/components/form/_label.scss diff --git a/addons/rose/addon/styles/rose/components/form/_index.scss b/addons/rose/addon/styles/rose/components/form/_index.scss index 8d29b2d3d..815a1aaf5 100644 --- a/addons/rose/addon/styles/rose/components/form/_index.scss +++ b/addons/rose/addon/styles/rose/components/form/_index.scss @@ -1,6 +1,7 @@ +@import 'label'; +@import 'errors'; +@import 'helper-text'; @import 'input'; @import 'checkbox'; @import 'select'; @import 'radio'; -@import 'errors'; -@import 'helper-text'; diff --git a/addons/rose/addon/styles/rose/components/form/_input.scss b/addons/rose/addon/styles/rose/components/form/_input.scss index 2a20fe1a1..08e7cc167 100644 --- a/addons/rose/addon/styles/rose/components/form/_input.scss +++ b/addons/rose/addon/styles/rose/components/form/_input.scss @@ -4,12 +4,6 @@ .rose-form-input { margin-bottom: sizing.rems(m); - .rose-form-input-label { - @include type.type(s, semibold); - display: block; - margin-bottom: sizing.rems(xxs); - } - .rose-form-input-field { @include type.type(m); box-sizing: border-box; diff --git a/addons/rose/addon/styles/rose/components/form/_label.scss b/addons/rose/addon/styles/rose/components/form/_label.scss new file mode 100644 index 000000000..e3ffdc68e --- /dev/null +++ b/addons/rose/addon/styles/rose/components/form/_label.scss @@ -0,0 +1,8 @@ +@use '../../variables/sizing'; +@use '../../utilities/type'; + +.rose-form-label { + @include type.type(s, semibold); + display: block; + margin-bottom: sizing.rems(xxs); +} diff --git a/addons/rose/addon/styles/rose/components/form/_select.scss b/addons/rose/addon/styles/rose/components/form/_select.scss index 16c58e9b2..e937ba80c 100644 --- a/addons/rose/addon/styles/rose/components/form/_select.scss +++ b/addons/rose/addon/styles/rose/components/form/_select.scss @@ -4,12 +4,6 @@ .rose-form-select { margin-bottom: sizing.rems(m); - .rose-form-select-label { - @include type.type(s, semibold); - display: block; - margin-bottom: sizing.rems(xxs); - } - .rose-form-select-field { @include type.type(s); -webkit-appearance: none; diff --git a/addons/rose/addon/templates/components/rose/form/input.hbs b/addons/rose/addon/templates/components/rose/form/input.hbs index 810064254..b1d7e4183 100644 --- a/addons/rose/addon/templates/components/rose/form/input.hbs +++ b/addons/rose/addon/templates/components/rose/form/input.hbs @@ -1,6 +1,6 @@
-