From 30650962d91e659103bc84c0df158c970e57b001 Mon Sep 17 00:00:00 2001 From: Susmitha Girumala Date: Fri, 14 Aug 2020 12:25:15 -0400 Subject: [PATCH 1/3] style: Add simple styles for rose/table --- .../styles/rose/components/table/_index.scss | 18 +--------- .../styles/rose/components/table/_table.scss | 34 +++++++++++++++++++ .../addon/templates/components/rose/table.hbs | 2 +- 3 files changed, 36 insertions(+), 18 deletions(-) create mode 100644 addons/rose/addon/styles/rose/components/table/_table.scss diff --git a/addons/rose/addon/styles/rose/components/table/_index.scss b/addons/rose/addon/styles/rose/components/table/_index.scss index ef81e56e7..a801a8478 100644 --- a/addons/rose/addon/styles/rose/components/table/_index.scss +++ b/addons/rose/addon/styles/rose/components/table/_index.scss @@ -1,17 +1 @@ -@use '../../variables/sizing'; -@use '../../utilities/type'; - -.rose-table { - @include type.type(s, normal); - width: 100%; - - .rose-table-header { - background-color: var(--ui-gray-subtler-5); - text-align: left; - } - - .rose-table-cell { - border: sizing.rems(xxxxs) solid var(--ui-gray-subtler-3); - padding: sizing.rems(xs) sizing.rems(xxs); - } -} +@import 'table'; \ No newline at end of file diff --git a/addons/rose/addon/styles/rose/components/table/_table.scss b/addons/rose/addon/styles/rose/components/table/_table.scss new file mode 100644 index 000000000..a5dfb114d --- /dev/null +++ b/addons/rose/addon/styles/rose/components/table/_table.scss @@ -0,0 +1,34 @@ +@use '../../variables/sizing'; +@use '../../utilities/type'; +@use '../../variables/typography'; + +.rose-table { + @include type.type(s, normal); + width: 100%; + + .rose-table-row { + border: sizing.rems(xxxxs) solid var(--ui-gray-subtler-3); + border-left: none; + border-right: none; + text-align: left; + + .rose-table-cell, .rose-table-header-cell { + vertical-align: middle; + padding: 0 sizing.rems(s); + } + } + + .rose-table-header { + color: var(--ui-gray-starker-2); + + .rose-table-cell, .rose-table-header-cell { + padding: sizing.rems(xs) sizing.rems(s); + } + } + + .rose-table-body, .rose-table-footer { + .rose-table-cell, .rose-table-header-cell { + padding: sizing.rems(s) sizing.rems(s); + } + } +} diff --git a/addons/rose/addon/templates/components/rose/table.hbs b/addons/rose/addon/templates/components/rose/table.hbs index d50ec970e..655e7dbd4 100644 --- a/addons/rose/addon/templates/components/rose/table.hbs +++ b/addons/rose/addon/templates/components/rose/table.hbs @@ -12,6 +12,6 @@ classNames='rose-table-body') footer=(component 'rose/table/section' tagName='tfoot' - classNames='rose-table-foot') + classNames='rose-table-footer') )}} From 635ee53494b7a13bc583892d2b4d231cf07648df Mon Sep 17 00:00:00 2001 From: Susmitha Girumala Date: Fri, 14 Aug 2020 12:29:18 -0400 Subject: [PATCH 2/3] style: Remove unused style use --- addons/rose/addon/styles/rose/components/table/_table.scss | 1 - 1 file changed, 1 deletion(-) diff --git a/addons/rose/addon/styles/rose/components/table/_table.scss b/addons/rose/addon/styles/rose/components/table/_table.scss index a5dfb114d..64eb22b88 100644 --- a/addons/rose/addon/styles/rose/components/table/_table.scss +++ b/addons/rose/addon/styles/rose/components/table/_table.scss @@ -1,6 +1,5 @@ @use '../../variables/sizing'; @use '../../utilities/type'; -@use '../../variables/typography'; .rose-table { @include type.type(s, normal); From 560f5db43b69e679fe239b810f20213e37f4d163 Mon Sep 17 00:00:00 2001 From: Randall Morey Date: Mon, 17 Aug 2020 10:47:28 -0400 Subject: [PATCH 3/3] =?UTF-8?q?style:=20=F0=9F=92=84=20increase=20cell=20p?= =?UTF-8?q?adding=20and=20header=20font=20weight?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../styles/rose/components/table/_table.scss | 38 ++++++++++--------- .../templates/scopes/scope/users/index.hbs | 8 ++-- 2 files changed, 25 insertions(+), 21 deletions(-) diff --git a/addons/rose/addon/styles/rose/components/table/_table.scss b/addons/rose/addon/styles/rose/components/table/_table.scss index 64eb22b88..ba63d37aa 100644 --- a/addons/rose/addon/styles/rose/components/table/_table.scss +++ b/addons/rose/addon/styles/rose/components/table/_table.scss @@ -6,28 +6,32 @@ width: 100%; .rose-table-row { - border: sizing.rems(xxxxs) solid var(--ui-gray-subtler-3); - border-left: none; - border-right: none; + border-bottom: sizing.rems(xxxxs) solid var(--ui-gray-subtler-3); text-align: left; + } - .rose-table-cell, .rose-table-header-cell { - vertical-align: middle; - padding: 0 sizing.rems(s); + .rose-table-cell, + .rose-table-header-cell { + vertical-align: middle; + } + + .rose-table-header-cell { + @include type.type(s, semibold); + color: var(--ui-gray); + } + + .rose-table-header, + .rose-table-footer { + .rose-table-cell, + .rose-table-header-cell { + padding: sizing.rems(s); } } - .rose-table-header { - color: var(--ui-gray-starker-2); - - .rose-table-cell, .rose-table-header-cell { - padding: sizing.rems(xs) sizing.rems(s); - } - } - - .rose-table-body, .rose-table-footer { - .rose-table-cell, .rose-table-header-cell { - padding: sizing.rems(s) sizing.rems(s); + .rose-table-body { + .rose-table-cell, + .rose-table-header-cell { + padding: sizing.rems(l) sizing.rems(s); } } } diff --git a/ui/core/app/templates/scopes/scope/users/index.hbs b/ui/core/app/templates/scopes/scope/users/index.hbs index 1ee0f3ac2..fb0a06a09 100644 --- a/ui/core/app/templates/scopes/scope/users/index.hbs +++ b/ui/core/app/templates/scopes/scope/users/index.hbs @@ -21,21 +21,21 @@ - {{t 'form.label.name'}} - {{t 'form.label.description'}} + {{t 'form.label.name'}} + {{t 'form.label.description'}} {{#each @model as |user|}} - + {{user.name}} - + {{user.description}} {{/each}}