From cae2f4ff63800ac07a928484066b217c5613d87e Mon Sep 17 00:00:00 2001 From: Randall Morey Date: Wed, 30 Sep 2020 12:06:37 -0400 Subject: [PATCH 1/8] feautre: enable dark mode --- .../styles/rose/variables/color/_css.scss | 119 +++++++++--------- ui/core/app/styles/app.scss | 2 +- 2 files changed, 60 insertions(+), 61 deletions(-) diff --git a/addons/rose/addon/styles/rose/variables/color/_css.scss b/addons/rose/addon/styles/rose/variables/color/_css.scss index 6817be7a4..d4fbf61bb 100644 --- a/addons/rose/addon/styles/rose/variables/color/_css.scss +++ b/addons/rose/addon/styles/rose/variables/color/_css.scss @@ -79,64 +79,63 @@ --ui-header-subtler: #{color(ui-cool-gray, 700)}; } -// NOTE: dark mode is disabled for now. // Dark Mode -// @media (prefers-color-scheme: dark) { -// :root { -// // poles -// --subtle: #{darken(color(ui-gray, 900), 2%)}; -// --stark: var(--white); -// --stark-components: 255, 255, 255; -// -// // theme colors -// --info-subtler-3: #{color(blue, 800)}; -// --info-subtler-2: #{color(blue, 700)}; -// --info-subtler-1: #{color(blue, 600)}; -// --info: #{color(blue)}; -// --info-starker-1: #{color(blue, 300)}; -// --info-starker-2: #{color(blue, 200)}; -// -// --alert-subtler-2: #{color(orange, 900)}; -// --alert-subtler-1: #{color(orange, 800)}; -// --alert: #{color(orange)}; -// --alert-starker-1: #{color(orange, 200)}; -// -// --warning-subtler-2: #{color(yellow, 900)}; -// --warning-subtler-1: #{color(yellow, 800)}; -// --warning: #{color(yellow)}; -// --warning-starker-1: #{color(yellow, 200)}; -// -// --failure-subtler-2: #{color(red, 900)}; -// --failure-subtler-1: #{color(red, 800)}; -// --failure: #{lighten(color(red, 400), 2.5%)}; -// --failure-starker-1: #{color(red, 300)}; -// -// --success-subtler-2: #{color(green, 900)}; -// --success-subtler-1: #{color(green, 800)}; -// --success: #{color(green)}; -// --success-starker-1: #{color(green, 200)}; -// -// --action-subtler-2: #{color(blue, 900)}; -// --action-subtler-1h: #{color(blue, 800)}; -// --action-subtler-1: #{color(blue, 800)}; -// --action: #{color(blue, 300)}; -// --action-starker-1: #{color(blue, 200)}; -// -// --ui-border-subtler-1: #{color(ui-gray, 800)}; -// --ui-border: #{color(ui-gray, 700)}; -// -// --ui-gray-subtler-6: #{color(ui-gray, 900)}; -// --ui-gray-subtler-5: #{color(ui-gray, 800)}; -// --ui-gray-subtler-4: #{color(ui-gray, 700)}; -// --ui-gray-subtler-3: #{color(ui-gray, 600)}; -// --ui-gray-subtler-2: #{color(ui-gray, 500)}; -// --ui-gray-subtler-1: #{color(ui-gray, 400)}; -// --ui-gray: #{color(ui-gray, 300)}; -// --ui-gray-starker-1: #{color(ui-gray, 200)}; -// --ui-gray-starker-2: #{color(ui-gray, 100)}; -// --ui-gray-starker-3: #{color(ui-gray, 050)}; -// --ui-gray-starker-4: #{color(ui-gray, 010)}; -// -// --ui-header-subtler: #{color(ui-cool-gray, 100)}; -// } -// } +@media (prefers-color-scheme: dark) { + :root { + // poles + --subtle: #{darken(color(ui-gray, 900), 2%)}; + --stark: var(--white); + --stark-components: 255, 255, 255; + + // theme colors + --info-subtler-3: #{color(blue, 800)}; + --info-subtler-2: #{color(blue, 700)}; + --info-subtler-1: #{color(blue, 600)}; + --info: #{color(blue)}; + --info-starker-1: #{color(blue, 300)}; + --info-starker-2: #{color(blue, 200)}; + + --alert-subtler-2: #{color(orange, 900)}; + --alert-subtler-1: #{color(orange, 800)}; + --alert: #{color(orange)}; + --alert-starker-1: #{color(orange, 200)}; + + --warning-subtler-2: #{color(yellow, 900)}; + --warning-subtler-1: #{color(yellow, 800)}; + --warning: #{color(yellow)}; + --warning-starker-1: #{color(yellow, 200)}; + + --failure-subtler-2: #{color(red, 900)}; + --failure-subtler-1: #{color(red, 800)}; + --failure: #{lighten(color(red, 400), 2.5%)}; + --failure-starker-1: #{color(red, 300)}; + + --success-subtler-2: #{color(green, 900)}; + --success-subtler-1: #{color(green, 800)}; + --success: #{color(green)}; + --success-starker-1: #{color(green, 200)}; + + --action-subtler-2: #{color(blue, 900)}; + --action-subtler-1h: #{color(blue, 800)}; + --action-subtler-1: #{color(blue, 800)}; + --action: #{color(blue, 300)}; + --action-starker-1: #{color(blue, 200)}; + + --ui-border-subtler-1: #{color(ui-gray, 800)}; + --ui-border: #{color(ui-gray, 700)}; + + --ui-gray-subtler-6: #{color(ui-gray, 900)}; + --ui-gray-subtler-5: #{color(ui-gray, 800)}; + --ui-gray-subtler-4: #{color(ui-gray, 700)}; + --ui-gray-subtler-3: #{color(ui-gray, 600)}; + --ui-gray-subtler-2: #{color(ui-gray, 500)}; + --ui-gray-subtler-1: #{color(ui-gray, 400)}; + --ui-gray: #{color(ui-gray, 300)}; + --ui-gray-starker-1: #{color(ui-gray, 200)}; + --ui-gray-starker-2: #{color(ui-gray, 100)}; + --ui-gray-starker-3: #{color(ui-gray, 050)}; + --ui-gray-starker-4: #{color(ui-gray, 010)}; + + --ui-header-subtler: #{color(ui-cool-gray, 100)}; + } +} diff --git a/ui/core/app/styles/app.scss b/ui/core/app/styles/app.scss index 9e72b055f..3acf2edab 100644 --- a/ui/core/app/styles/app.scss +++ b/ui/core/app/styles/app.scss @@ -68,7 +68,7 @@ right: 0; height: 3px; - background: repeating-linear-gradient(to right, #fff, #fff, var(--info), #fff, #fff); + background: repeating-linear-gradient(to right, var(--subtle), var(--subtle), var(--info), var(--subtle), var(--subtle)); background-size: 200% auto; background-position: 0 100%; animation: gradient 1s linear infinite; From bdcb908ca714c30483f9deaf89765425ce1bd140 Mon Sep 17 00:00:00 2001 From: Randall Morey Date: Wed, 30 Sep 2020 12:15:18 -0400 Subject: [PATCH 2/8] chore: use stark/subtle instead of black/white --- .../rose/addon/styles/rose/components/dropdown/_button.scss | 4 ++-- .../rose/addon/styles/rose/components/dropdown/_dropdown.scss | 2 +- addons/rose/addon/styles/rose/components/dropdown/_link.scss | 4 ++-- addons/rose/addon/styles/rose/components/form/_checkbox.scss | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/addons/rose/addon/styles/rose/components/dropdown/_button.scss b/addons/rose/addon/styles/rose/components/dropdown/_button.scss index 7da5009a9..2fe195562 100644 --- a/addons/rose/addon/styles/rose/components/dropdown/_button.scss +++ b/addons/rose/addon/styles/rose/components/dropdown/_button.scss @@ -25,11 +25,11 @@ } &.rose-dropdown-button-danger { - --background-color: var(--white); + --background-color: var(--subtle); --color: var(--failure); &:hover { - --color: var(--white); + --color: var(--subtle); --background-color: var(--failure); } } diff --git a/addons/rose/addon/styles/rose/components/dropdown/_dropdown.scss b/addons/rose/addon/styles/rose/components/dropdown/_dropdown.scss index b3467aff9..66d3d7188 100644 --- a/addons/rose/addon/styles/rose/components/dropdown/_dropdown.scss +++ b/addons/rose/addon/styles/rose/components/dropdown/_dropdown.scss @@ -17,7 +17,7 @@ $chevron: "data:image/svg+xml;utf-8,"); From 2600411c700b29d0c88cf73a0cb4241aed0249b1 Mon Sep 17 00:00:00 2001 From: Susmitha Girumala Date: Wed, 30 Sep 2020 12:57:30 -0400 Subject: [PATCH 3/8] refactor: Fix sass lint errors in ui/core --- ui/core/app/styles/_notify.scss | 8 ++++---- ui/core/app/styles/app.scss | 25 +++++++++++++------------ 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/ui/core/app/styles/_notify.scss b/ui/core/app/styles/_notify.scss index 438f0950c..784bc746f 100644 --- a/ui/core/app/styles/_notify.scss +++ b/ui/core/app/styles/_notify.scss @@ -61,19 +61,19 @@ .ember-notify-show { -webkit-animation-duration: 500ms; -webkit-animation-name: ember-notify-show; - -webkit-animation-timing-function: cubic-bezier(0.175, 0.885, 0.32, 1.275); + -webkit-animation-timing-function: cubic-bezier(.175, .885, .32, 1.275); animation-duration: 500ms; animation-name: ember-notify-show; - animation-timing-function: cubic-bezier(0.175, 0.885, 0.32, 1.275); + animation-timing-function: cubic-bezier(.175, .885, .32, 1.275); } .ember-notify-hide { -webkit-animation-duration: 250ms; -webkit-animation-name: ember-notify-hide; - -webkit-animation-timing-function: cubic-bezier(0.6, -0.28, 0.735, 0.045); + -webkit-animation-timing-function: cubic-bezier(.6, -.28, .735, .045); animation-duration: 250ms; animation-name: ember-notify-hide; - animation-timing-function: cubic-bezier(0.6, -0.28, 0.735, 0.045); + animation-timing-function: cubic-bezier(.6, -.28, .735, .045); &:hover { -moz-animation-play-state: paused; diff --git a/ui/core/app/styles/app.scss b/ui/core/app/styles/app.scss index 9e72b055f..8aad37e0b 100644 --- a/ui/core/app/styles/app.scss +++ b/ui/core/app/styles/app.scss @@ -61,17 +61,16 @@ &.loading { &::after { - content: " "; - position: absolute; - top: 100%; - left: 0; - right: 0; - height: 3px; - - background: repeating-linear-gradient(to right, #fff, #fff, var(--info), #fff, #fff); - background-size: 200% auto; - background-position: 0 100%; animation: gradient 1s linear infinite; + background: repeating-linear-gradient(to right, var(--white), var(--white), var(--info), var(--white), var(--white)); + background-position: 0 100%; + background-size: 200% auto; + content: ' '; + height: 3px; + left: 0; + position: absolute; + right: 0; + top: 100%; @keyframes gradient { 0% { background-position: 0 0; } @@ -81,6 +80,8 @@ } } -.copyable .copyable-button { - padding: 0rem; +.copyable { + .copyable-button { + padding: 0; + } } From 346f76404d9a0c90dedbccdd3d2c228572eb5ec1 Mon Sep 17 00:00:00 2001 From: Randall Morey Date: Wed, 30 Sep 2020 13:17:23 -0400 Subject: [PATCH 4/8] chore: tweak colors to match waypoint and for a11y --- .../styles/rose/components/nav/_sidebar.scss | 2 +- .../styles/rose/components/nav/_tabs.scss | 2 +- .../styles/rose/variables/color/_css.scss | 18 +++++++++--------- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/addons/rose/addon/styles/rose/components/nav/_sidebar.scss b/addons/rose/addon/styles/rose/components/nav/_sidebar.scss index 7dae497d6..90e84159a 100644 --- a/addons/rose/addon/styles/rose/components/nav/_sidebar.scss +++ b/addons/rose/addon/styles/rose/components/nav/_sidebar.scss @@ -13,7 +13,7 @@ line-height: $lineHeight; padding: 0 sizing.rems(m); margin-bottom: $threePX; - border-bottom: sizing.rems(xxxxs) solid var(--ui-gray-subtler-2); + border-bottom: sizing.rems(xxxxs) solid var(--ui-border-subtler-1); } .rose-nav-link { diff --git a/addons/rose/addon/styles/rose/components/nav/_tabs.scss b/addons/rose/addon/styles/rose/components/nav/_tabs.scss index 2e2ca44f3..4d71816d1 100644 --- a/addons/rose/addon/styles/rose/components/nav/_tabs.scss +++ b/addons/rose/addon/styles/rose/components/nav/_tabs.scss @@ -5,7 +5,7 @@ display: flex; flex-wrap: wrap; margin-bottom: sizing.rems(m); - box-shadow: inset 0 -#{sizing.rems(xxxxs)} 0 var(--ui-gray-subtler-2); + box-shadow: inset 0 -#{sizing.rems(xxxxs)} 0 var(--ui-border); .rose-nav-link { --color: var(--ui-gray-starker-1); diff --git a/addons/rose/addon/styles/rose/variables/color/_css.scss b/addons/rose/addon/styles/rose/variables/color/_css.scss index d4fbf61bb..cb000c5df 100644 --- a/addons/rose/addon/styles/rose/variables/color/_css.scss +++ b/addons/rose/addon/styles/rose/variables/color/_css.scss @@ -83,8 +83,8 @@ @media (prefers-color-scheme: dark) { :root { // poles - --subtle: #{darken(color(ui-gray, 900), 2%)}; - --stark: var(--white); + --subtle: #{darken(color(ui-gray, 900), 3%)}; + --stark: #{color(ui-gray, 100)}; --stark-components: 255, 255, 255; // theme colors @@ -107,18 +107,18 @@ --failure-subtler-2: #{color(red, 900)}; --failure-subtler-1: #{color(red, 800)}; - --failure: #{lighten(color(red, 400), 2.5%)}; - --failure-starker-1: #{color(red, 300)}; + --failure: #{color(red, 300)}; + --failure-starker-1: #{color(red, 200)}; --success-subtler-2: #{color(green, 900)}; --success-subtler-1: #{color(green, 800)}; - --success: #{color(green)}; - --success-starker-1: #{color(green, 200)}; + --success: #{color(green, 700)}; + --success-starker-1: #{color(green, 400)}; - --action-subtler-2: #{color(blue, 900)}; - --action-subtler-1h: #{color(blue, 800)}; + --action-subtler-2: #{darken(color(blue, 900), 10%)}; + --action-subtler-1h: #{darken(color(blue, 900), 5%)}; --action-subtler-1: #{color(blue, 800)}; - --action: #{color(blue, 300)}; + --action: #{color(blue, 400)}; --action-starker-1: #{color(blue, 200)}; --ui-border-subtler-1: #{color(ui-gray, 800)}; From c3152eb41365813e463f452e854a46d031703466 Mon Sep 17 00:00:00 2001 From: Randall Morey Date: Wed, 30 Sep 2020 13:30:36 -0400 Subject: [PATCH 5/8] chore: tweak contrast for nav dark mode --- addons/rose/addon/styles/rose/components/nav/_tabs.scss | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/addons/rose/addon/styles/rose/components/nav/_tabs.scss b/addons/rose/addon/styles/rose/components/nav/_tabs.scss index 4d71816d1..19f112bd1 100644 --- a/addons/rose/addon/styles/rose/components/nav/_tabs.scss +++ b/addons/rose/addon/styles/rose/components/nav/_tabs.scss @@ -22,13 +22,17 @@ &:hover { --box-shadow-color: var(--ui-gray-subtler-2); - --background: var(--ui-gray-subtler-5); + --background: var(--ui-gray-subtler-6); } &:active, &.active { --color: var(--action); --box-shadow-color: currentColor; + + &:hover { + --color: var(--action-starker-1); + } } } } From 67581a01e5e00de14c46b89bbcb35ee2a870d155 Mon Sep 17 00:00:00 2001 From: Randall Morey Date: Wed, 30 Sep 2020 15:31:55 -0400 Subject: [PATCH 6/8] =?UTF-8?q?chore:=20=F0=9F=A4=96=20add=20initial=20bou?= =?UTF-8?q?ndary-icons?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ui/core/app/templates/application.hbs | 2 +- ui/core/app/templates/scopes/scope.hbs | 15 +++++++++++++++ .../scopes/scope/projects/project/_sidebar.hbs | 9 +++++++++ ui/core/public/boundary-icons/action-session.svg | 4 ++++ ui/core/public/boundary-icons/auth-method.svg | 4 ++++ ui/core/public/boundary-icons/gear.svg | 4 ++++ ui/core/public/boundary-icons/group.svg | 3 +++ ui/core/public/boundary-icons/host-catalogs.svg | 3 +++ ui/core/public/boundary-icons/org.svg | 3 +++ ui/core/public/boundary-icons/project.svg | 3 +++ ui/core/public/boundary-icons/roles.svg | 3 +++ ui/core/public/boundary-icons/target.svg | 3 +++ ui/core/public/boundary-icons/user-profile.svg | 3 +++ ui/core/public/boundary-icons/users.svg | 3 +++ 14 files changed, 61 insertions(+), 1 deletion(-) create mode 100644 ui/core/public/boundary-icons/action-session.svg create mode 100644 ui/core/public/boundary-icons/auth-method.svg create mode 100644 ui/core/public/boundary-icons/gear.svg create mode 100644 ui/core/public/boundary-icons/group.svg create mode 100644 ui/core/public/boundary-icons/host-catalogs.svg create mode 100644 ui/core/public/boundary-icons/org.svg create mode 100644 ui/core/public/boundary-icons/project.svg create mode 100644 ui/core/public/boundary-icons/roles.svg create mode 100644 ui/core/public/boundary-icons/target.svg create mode 100644 ui/core/public/boundary-icons/user-profile.svg create mode 100644 ui/core/public/boundary-icons/users.svg diff --git a/ui/core/app/templates/application.hbs b/ui/core/app/templates/application.hbs index b38e02f4d..f8de5b3f9 100644 --- a/ui/core/app/templates/application.hbs +++ b/ui/core/app/templates/application.hbs @@ -17,7 +17,7 @@ {{t 'actions.change-password'}} diff --git a/ui/core/app/templates/scopes/scope.hbs b/ui/core/app/templates/scopes/scope.hbs index 04b437e4d..718ce849e 100644 --- a/ui/core/app/templates/scopes/scope.hbs +++ b/ui/core/app/templates/scopes/scope.hbs @@ -5,21 +5,36 @@ + {{t "resources.project.title_plural"}} + {{t "resources.user.title_plural"}} + {{t "resources.group.title_plural"}} + {{t "resources.role.title_plural"}} + {{t "resources.auth-method.title_plural"}} diff --git a/ui/core/app/templates/scopes/scope/projects/project/_sidebar.hbs b/ui/core/app/templates/scopes/scope/projects/project/_sidebar.hbs index b9d440b7c..5f7845697 100644 --- a/ui/core/app/templates/scopes/scope/projects/project/_sidebar.hbs +++ b/ui/core/app/templates/scopes/scope/projects/project/_sidebar.hbs @@ -1,11 +1,20 @@ + {{t "resources.session.title_plural"}} + {{t "resources.target.title_plural"}} + {{t "resources.host-catalog.title_plural"}} diff --git a/ui/core/public/boundary-icons/action-session.svg b/ui/core/public/boundary-icons/action-session.svg new file mode 100644 index 000000000..6a9d8ca21 --- /dev/null +++ b/ui/core/public/boundary-icons/action-session.svg @@ -0,0 +1,4 @@ + + + + diff --git a/ui/core/public/boundary-icons/auth-method.svg b/ui/core/public/boundary-icons/auth-method.svg new file mode 100644 index 000000000..8e3768084 --- /dev/null +++ b/ui/core/public/boundary-icons/auth-method.svg @@ -0,0 +1,4 @@ + + + + diff --git a/ui/core/public/boundary-icons/gear.svg b/ui/core/public/boundary-icons/gear.svg new file mode 100644 index 000000000..d2bca3dc7 --- /dev/null +++ b/ui/core/public/boundary-icons/gear.svg @@ -0,0 +1,4 @@ + + + + diff --git a/ui/core/public/boundary-icons/group.svg b/ui/core/public/boundary-icons/group.svg new file mode 100644 index 000000000..2d2966c5a --- /dev/null +++ b/ui/core/public/boundary-icons/group.svg @@ -0,0 +1,3 @@ + + + diff --git a/ui/core/public/boundary-icons/host-catalogs.svg b/ui/core/public/boundary-icons/host-catalogs.svg new file mode 100644 index 000000000..18372da0c --- /dev/null +++ b/ui/core/public/boundary-icons/host-catalogs.svg @@ -0,0 +1,3 @@ + + + diff --git a/ui/core/public/boundary-icons/org.svg b/ui/core/public/boundary-icons/org.svg new file mode 100644 index 000000000..238cc8435 --- /dev/null +++ b/ui/core/public/boundary-icons/org.svg @@ -0,0 +1,3 @@ + + + diff --git a/ui/core/public/boundary-icons/project.svg b/ui/core/public/boundary-icons/project.svg new file mode 100644 index 000000000..5b9515d08 --- /dev/null +++ b/ui/core/public/boundary-icons/project.svg @@ -0,0 +1,3 @@ + + + diff --git a/ui/core/public/boundary-icons/roles.svg b/ui/core/public/boundary-icons/roles.svg new file mode 100644 index 000000000..a0b92dd37 --- /dev/null +++ b/ui/core/public/boundary-icons/roles.svg @@ -0,0 +1,3 @@ + + + diff --git a/ui/core/public/boundary-icons/target.svg b/ui/core/public/boundary-icons/target.svg new file mode 100644 index 000000000..1889f89e5 --- /dev/null +++ b/ui/core/public/boundary-icons/target.svg @@ -0,0 +1,3 @@ + + + diff --git a/ui/core/public/boundary-icons/user-profile.svg b/ui/core/public/boundary-icons/user-profile.svg new file mode 100644 index 000000000..f70d94404 --- /dev/null +++ b/ui/core/public/boundary-icons/user-profile.svg @@ -0,0 +1,3 @@ + + + diff --git a/ui/core/public/boundary-icons/users.svg b/ui/core/public/boundary-icons/users.svg new file mode 100644 index 000000000..e086f6503 --- /dev/null +++ b/ui/core/public/boundary-icons/users.svg @@ -0,0 +1,3 @@ + + + From 19cc18c4f69f7974aa5b077fd065a32b80a96a46 Mon Sep 17 00:00:00 2001 From: Randall Morey Date: Wed, 30 Sep 2020 15:59:57 -0400 Subject: [PATCH 7/8] chore: increase right margin on sidebar icons --- ui/core/app/styles/app.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ui/core/app/styles/app.scss b/ui/core/app/styles/app.scss index 3acf2edab..c05790a04 100644 --- a/ui/core/app/styles/app.scss +++ b/ui/core/app/styles/app.scss @@ -25,6 +25,10 @@ & + .rose-nav-sidebar { margin-top: 0; } + + .rose-icon { + margin-right: sizing.rems(xs); + } } .rose-form { From a5a69b06742d0879e5f7e021e0e40c7ca5b9b7e5 Mon Sep 17 00:00:00 2001 From: Randall Morey Date: Wed, 30 Sep 2020 16:00:11 -0400 Subject: [PATCH 8/8] chore: remove underline on sidebar nav hover --- addons/rose/addon/styles/rose/components/nav/_sidebar.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/rose/addon/styles/rose/components/nav/_sidebar.scss b/addons/rose/addon/styles/rose/components/nav/_sidebar.scss index 90e84159a..010a3bd52 100644 --- a/addons/rose/addon/styles/rose/components/nav/_sidebar.scss +++ b/addons/rose/addon/styles/rose/components/nav/_sidebar.scss @@ -32,7 +32,7 @@ } &:hover { - text-decoration: underline; + //text-decoration: underline; color: var(--action); background-color: var(--action-subtler-1h); }