From 03b8e2875ff18fba8de15788d2c1fa53c396a382 Mon Sep 17 00:00:00 2001 From: dharini Date: Wed, 12 Jan 2022 15:44:07 -0800 Subject: [PATCH 01/25] =?UTF-8?q?feat:=20=F0=9F=8E=B8=20merge=20recent=20m?= =?UTF-8?q?ain?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ui/admin/app/templates/scopes/scope/auth-methods/index.hbs | 1 - 1 file changed, 1 deletion(-) diff --git a/ui/admin/app/templates/scopes/scope/auth-methods/index.hbs b/ui/admin/app/templates/scopes/scope/auth-methods/index.hbs index ea12808c3..b2380e0fb 100644 --- a/ui/admin/app/templates/scopes/scope/auth-methods/index.hbs +++ b/ui/admin/app/templates/scopes/scope/auth-methods/index.hbs @@ -35,7 +35,6 @@ - {{#if (or @model From af9bb1c618f2dc5f033b8fe283ff90803e96c48b Mon Sep 17 00:00:00 2001 From: dharini Date: Thu, 13 Jan 2022 09:06:09 -0800 Subject: [PATCH 02/25] updates to card style --- .../rose/form/radio/radio-card/index.js | 7 +++++++ .../styles/rose/components/form/_index.scss | 1 + .../styles/rose/components/form/_radioCard.scss | 17 +++++++++++++++++ .../components/rose/form/radio/radio-card.js | 1 + .../scopes/scope/auth-methods/index.hbs | 6 ++++++ 5 files changed, 32 insertions(+) create mode 100644 addons/rose/addon/components/rose/form/radio/radio-card/index.js create mode 100644 addons/rose/addon/styles/rose/components/form/_radioCard.scss create mode 100644 addons/rose/app/components/rose/form/radio/radio-card.js diff --git a/addons/rose/addon/components/rose/form/radio/radio-card/index.js b/addons/rose/addon/components/rose/form/radio/radio-card/index.js new file mode 100644 index 000000000..235f017f6 --- /dev/null +++ b/addons/rose/addon/components/rose/form/radio/radio-card/index.js @@ -0,0 +1,7 @@ +import RoseFormRadioRadioComponent from '../radio'; + +export default class RoseFormRadioRadioCardComponent extends RoseFormRadioRadioComponent { + // =attributes + + className = 'rose-form-radio-card'; +} \ No newline at end of file diff --git a/addons/rose/addon/styles/rose/components/form/_index.scss b/addons/rose/addon/styles/rose/components/form/_index.scss index 73137ac8d..677cee98c 100644 --- a/addons/rose/addon/styles/rose/components/form/_index.scss +++ b/addons/rose/addon/styles/rose/components/form/_index.scss @@ -6,3 +6,4 @@ @import 'select'; @import 'radio'; @import 'fieldset'; +@import 'radioCard'; \ No newline at end of file diff --git a/addons/rose/addon/styles/rose/components/form/_radioCard.scss b/addons/rose/addon/styles/rose/components/form/_radioCard.scss new file mode 100644 index 000000000..20210ff15 --- /dev/null +++ b/addons/rose/addon/styles/rose/components/form/_radioCard.scss @@ -0,0 +1,17 @@ +.rose-form-radio-card { + position: relative; + width: 370px; + height: 115px; + background: #FFFFFF; + border: 1px solid #BAC1CC; + box-shadow: 0px 4px 4px rgba(0, 0, 0, 0.25); + border-radius: 2px; + .rose-form-radio-field { + top: 89px; + right: 176px; + position: absolute; + } + .rose-form-radio-label { + color: #000; + } +} \ No newline at end of file diff --git a/addons/rose/app/components/rose/form/radio/radio-card.js b/addons/rose/app/components/rose/form/radio/radio-card.js new file mode 100644 index 000000000..42acc95ea --- /dev/null +++ b/addons/rose/app/components/rose/form/radio/radio-card.js @@ -0,0 +1 @@ +export { default } from 'rose/components/rose/form/radio/radio-card'; diff --git a/ui/admin/app/templates/scopes/scope/auth-methods/index.hbs b/ui/admin/app/templates/scopes/scope/auth-methods/index.hbs index b2380e0fb..646098f1c 100644 --- a/ui/admin/app/templates/scopes/scope/auth-methods/index.hbs +++ b/ui/admin/app/templates/scopes/scope/auth-methods/index.hbs @@ -35,6 +35,12 @@ + + {{#if (or @model From c807af02f496660284848284c1c0e769f17014d9 Mon Sep 17 00:00:00 2001 From: dharini Date: Thu, 13 Jan 2022 14:19:43 -0800 Subject: [PATCH 03/25] add padding to label and align it --- .../rose/addon/styles/rose/components/form/_radioCard.scss | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/addons/rose/addon/styles/rose/components/form/_radioCard.scss b/addons/rose/addon/styles/rose/components/form/_radioCard.scss index 20210ff15..1bfff39e5 100644 --- a/addons/rose/addon/styles/rose/components/form/_radioCard.scss +++ b/addons/rose/addon/styles/rose/components/form/_radioCard.scss @@ -6,6 +6,8 @@ border: 1px solid #BAC1CC; box-shadow: 0px 4px 4px rgba(0, 0, 0, 0.25); border-radius: 2px; + font-size: 14px; + font-weight: bold; .rose-form-radio-field { top: 89px; right: 176px; @@ -13,5 +15,8 @@ } .rose-form-radio-label { color: #000; + margin-top: 16px; + display: block; + margin-left: 48px; } } \ No newline at end of file From bf09c9b0b83834a2456901f6e95b724eff4e2ee2 Mon Sep 17 00:00:00 2001 From: dharini Date: Sun, 16 Jan 2022 16:37:55 -0800 Subject: [PATCH 04/25] more updates --- .../rose/form/radio/radio-card/index.js | 2 +- .../form/radio/radio-card/index.stories.mdx | 120 ++++++++++++++++++ .../rose/form/radio/radio/index.hbs | 4 +- .../styles/rose/components/form/_index.scss | 2 +- .../rose/components/form/_radioCard.scss | 87 ++++++++++--- .../scopes/scope/auth-methods/index.hbs | 1 + 6 files changed, 194 insertions(+), 22 deletions(-) create mode 100644 addons/rose/addon/components/rose/form/radio/radio-card/index.stories.mdx diff --git a/addons/rose/addon/components/rose/form/radio/radio-card/index.js b/addons/rose/addon/components/rose/form/radio/radio-card/index.js index 235f017f6..67337301e 100644 --- a/addons/rose/addon/components/rose/form/radio/radio-card/index.js +++ b/addons/rose/addon/components/rose/form/radio/radio-card/index.js @@ -4,4 +4,4 @@ export default class RoseFormRadioRadioCardComponent extends RoseFormRadioRadioC // =attributes className = 'rose-form-radio-card'; -} \ No newline at end of file +} diff --git a/addons/rose/addon/components/rose/form/radio/radio-card/index.stories.mdx b/addons/rose/addon/components/rose/form/radio/radio-card/index.stories.mdx new file mode 100644 index 000000000..35a81b942 --- /dev/null +++ b/addons/rose/addon/components/rose/form/radio/radio-card/index.stories.mdx @@ -0,0 +1,120 @@ +import { Meta, Story, Preview } from '@storybook/addon-docs/blocks'; +import { hbs } from 'ember-cli-htmlbars'; +import { text, boolean, select } from '@storybook/addon-knobs'; + + + +# Form Radiofield + +Renders a form radiofield. + +```htmlbars + +``` + + + {{ + template: hbs` + + `, + context: { + label: text('text', 'Radiofield'), + error: boolean('error', false), + value: text('value', 'value and selectedValue must match to select radiofield'), + selectedValue: text( + 'selectedValue', + 'value and selectedValue must match to select radiofield' + ), + disabled: boolean('disabled', false), + icon: select( + 'icon', + { + 'none': null, + 'flight-icons/svg/org-16': 'flight-icons/svg/org-16', + 'flight-icons/svg/clipboard-copy-16': 'flight-icons/svg/clipboard-copy-16', + }, + null + ), + } + }} + + + +```htmlbars + +``` + + + {{ + template: hbs` + + + + `, + context: { + error: boolean('error', false), + value: text('value', 'value and selectedValue must match to select radiofield'), + selectedValue: text( + 'selectedValue', + 'value and selectedValue must match to select radiofield' + ), + disabled: boolean('disabled', false), + icon: select( + 'icon', + { + 'none': null, + 'flight-icons/svg/org-16': 'flight-icons/svg/org-16', + 'flight-icons/svg/clipboard-copy-16': 'flight-icons/svg/clipboard-copy-16', + }, + null + ), + inline: boolean('inline', false) + } + }} + diff --git a/addons/rose/addon/components/rose/form/radio/radio/index.hbs b/addons/rose/addon/components/rose/form/radio/radio/index.hbs index 47621405d..8537a4d00 100644 --- a/addons/rose/addon/components/rose/form/radio/radio/index.hbs +++ b/addons/rose/addon/components/rose/form/radio/radio/index.hbs @@ -1,5 +1,5 @@
- + - +