From dc9d3865e8154f5cf66143ce440344077b33ce79 Mon Sep 17 00:00:00 2001 From: lvuch Date: Fri, 2 Feb 2018 12:04:22 -0700 Subject: [PATCH 1/3] 11260 dropdowns --- app/styles/components/_searchable-select.scss | 2 +- lib/global-admin/addon/clusters/new/rke/template.hbs | 4 ++-- lib/shared/addon/components/form-members/template.hbs | 2 +- lib/shared/addon/components/modal-add-node/template.hbs | 4 ++++ 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/app/styles/components/_searchable-select.scss b/app/styles/components/_searchable-select.scss index fce81f9db..4be9ca278 100644 --- a/app/styles/components/_searchable-select.scss +++ b/app/styles/components/_searchable-select.scss @@ -44,7 +44,7 @@ .searchable-options { overflow-y: scroll; - background: $input-bg; + background: $dropdown-bg; position: absolute; box-sizing: border-box; width: 100%; diff --git a/lib/global-admin/addon/clusters/new/rke/template.hbs b/lib/global-admin/addon/clusters/new/rke/template.hbs index 11e621c75..601ff2c87 100644 --- a/lib/global-admin/addon/clusters/new/rke/template.hbs +++ b/lib/global-admin/addon/clusters/new/rke/template.hbs @@ -16,13 +16,13 @@
-

{{t 'clustersPage.addPage.rke.new.radio.embedded.detail' appName=settings.appName}} — Coming Soon

+

{{t 'clustersPage.addPage.rke.new.radio.embedded.detail' appName=settings.appName}} — Coming Soon

-

{{t 'clustersPage.addPage.rke.new.radio.dedicated.detail' appName=settings.appName}}

+

{{t 'clustersPage.addPage.rke.new.radio.dedicated.detail' appName=settings.appName}}

diff --git a/lib/shared/addon/components/form-members/template.hbs b/lib/shared/addon/components/form-members/template.hbs index 47d3df913..3d5b4b77d 100644 --- a/lib/shared/addon/components/form-members/template.hbs +++ b/lib/shared/addon/components/form-members/template.hbs @@ -1,5 +1,5 @@
- +
diff --git a/lib/shared/addon/components/modal-add-node/template.hbs b/lib/shared/addon/components/modal-add-node/template.hbs index 07b340600..58a3e2385 100644 --- a/lib/shared/addon/components/modal-add-node/template.hbs +++ b/lib/shared/addon/components/modal-add-node/template.hbs @@ -1,3 +1,7 @@ +
+

{{t 'nodesPage.addNode'}}

+
+ {{#if (eq mode 'machineTemplate')}} {{host-template-list model=templates From e2987fb2d8ec12f435b975048ec007295dc271db Mon Sep 17 00:00:00 2001 From: lvuch Date: Fri, 2 Feb 2018 14:29:10 -0700 Subject: [PATCH 2/3] dark theme --- app/styles/components/_code.scss | 2 +- app/styles/components/_dropdown.scss | 2 +- app/styles/themes/_dark.scss | 2 +- .../addon/components/modal-edit-apikey/template.hbs | 8 ++++---- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/styles/components/_code.scss b/app/styles/components/_code.scss index ce6ae7741..3c86b15ea 100644 --- a/app/styles/components/_code.scss +++ b/app/styles/components/_code.scss @@ -1,6 +1,6 @@ // Code $code-color : mix($warning, $error, 20%) !default; -$code-bg : #fcf2e9 !default; +$code-bg : $text-color !default; $pre-bg : #f5f5f5 !default; $pre-color : $dark-grey !default; diff --git a/app/styles/components/_dropdown.scss b/app/styles/components/_dropdown.scss index cddf99dd2..dac641097 100644 --- a/app/styles/components/_dropdown.scss +++ b/app/styles/components/_dropdown.scss @@ -2,7 +2,7 @@ $dropdown-bg : $body-bg !default; $dropdown-border : $light-grey !default; $dropdown-fallback-border : transparent !default; -$dropdown-divider-bg : $light-grey !default; +$dropdown-divider-bg : $border !default; $dropdown-link-color : $link-color !default; $dropdown-link-hover-color : $body-bg !default; diff --git a/app/styles/themes/_dark.scss b/app/styles/themes/_dark.scss index c1bc1c333..c02b4fde4 100644 --- a/app/styles/themes/_dark.scss +++ b/app/styles/themes/_dark.scss @@ -119,7 +119,7 @@ $dropdown-border : transparent; //** Dropdown menu `border-color` **for IE8**. $dropdown-fallback-border : transparent; //** Divider color for between dropdown items. -$dropdown-divider-bg : rgba($black,.55); +$dropdown-divider-bg : darken($border, 10); //** Dropdown link text color. $dropdown-link-color : white; diff --git a/lib/shared/addon/components/modal-edit-apikey/template.hbs b/lib/shared/addon/components/modal-edit-apikey/template.hbs index 17a19d3b2..398026c48 100644 --- a/lib/shared/addon/components/modal-edit-apikey/template.hbs +++ b/lib/shared/addon/components/modal-edit-apikey/template.hbs @@ -5,14 +5,14 @@
{{t 'apiPage.currentEndpoint'}} - {{displayEndpoint}} - {{copy-to-clipboard clipboardText=linkEndpoint}} +
{{displayEndpoint}}
+ {{copy-to-clipboard clipboardText=linkEndpoint}}
{{t 'editApiKey.token.label'}} - {{clone.token}} - {{copy-to-clipboard clipboardText=clone.token}} +
{{clone.token}}
+ {{copy-to-clipboard clipboardText=clone.token}}
{{t 'projectsPage.new.form.members.kind.label'}}