From 8956941e00e907c88b071d7d534ce9c4dbcabe76 Mon Sep 17 00:00:00 2001 From: Thomas von Deyen Date: Wed, 14 Mar 2018 11:47:44 +0100 Subject: [PATCH 1/2] Use darker blue for dialog headers and primary buttons Use the darker blue form the left menu for dialog headers and primary buttons as well. --- app/assets/stylesheets/alchemy/_variables.scss | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/app/assets/stylesheets/alchemy/_variables.scss b/app/assets/stylesheets/alchemy/_variables.scss index 9f2602bf69..f905dd4d05 100644 --- a/app/assets/stylesheets/alchemy/_variables.scss +++ b/app/assets/stylesheets/alchemy/_variables.scss @@ -1,6 +1,7 @@ $light-blue: #cddce5; $very-light-blue: lighten($light-blue, 12%); $blue: #2d5a8d; +$dark-blue: darken($blue, 10%); $light-gray: #f7f7f7; $medium-gray: #efefef; $dark-gray: #666666; @@ -24,7 +25,7 @@ $default-font-size: 12px !default; $default-font-style: $default-font-size $default-font-face !default; $dialog-header-height: 36px !default; -$dialog-header-color: $blue !default; +$dialog-header-color: $dark-blue !default; $dialog-header-text-color: $white !default; $dialog-header-font-size: $default-font-size !default; $dialog-box-shadow: 0 8px 16px rgba(35, 35, 35, 0.5) !default; @@ -58,7 +59,7 @@ $form-field-disabled-bg-color: rgba($white, 0.5) !default; $focus-color: rgba(#eca96e, 0.75) !default; -$button-bg-color: $blue !default; +$button-bg-color: $dark-blue !default; $button-hover-bg-color: lighten($button-bg-color, 5%) !default; $button-border-color: darken($button-bg-color, 5%) !default; $button-hover-border-color: lighten($button-border-color, 5%) !default; @@ -69,8 +70,8 @@ $button-padding: 0.5em 1.5em !default; $button-margin: $form-field-margin !default; $secondary-button-bg-color: transparent !default; -$secondary-button-text-color: $blue !default; -$secondary-button-border-color: $blue !default; +$secondary-button-text-color: $button-bg-color !default; +$secondary-button-border-color: $button-bg-color !default; $linked-button-color: rgba($linked-color, 0.75) !default; $linked-border-color: darken($linked-color, 10%) !default; @@ -102,7 +103,7 @@ $sitemap-highlight-color: rgba(#fffba5, 0.5) !default; $main-menu-width: 150px !default; $collapsed-main-menu-width: 48px !default; -$main-menu-bg-color: darken($blue, 10%) !default; +$main-menu-bg-color: $dark-blue !default; $main-menu-active-bg-color: $dark-orange !default; $main-menu-active-text-color: $very-dark-gray !default; $main-menu-text-color: $white !default; From 52b02a9a42aa5a1f3c270de64b8862c425f41a1c Mon Sep 17 00:00:00 2001 From: Thomas von Deyen Date: Wed, 14 Mar 2018 11:48:33 +0100 Subject: [PATCH 2/2] Use a secondary button in leave dialog The secondary action is to stay logged in while chosing to leave alchemy admin. --- app/views/alchemy/admin/leave.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/alchemy/admin/leave.html.erb b/app/views/alchemy/admin/leave.html.erb index 26f96a271c..a27c7a54ad 100644 --- a/app/views/alchemy/admin/leave.html.erb +++ b/app/views/alchemy/admin/leave.html.erb @@ -3,7 +3,7 @@ <% end %>

- <%= link_to Alchemy.t('stay logged in'), alchemy.root_path, class: 'button' %> + <%= link_to Alchemy.t('stay logged in'), alchemy.root_path, class: 'button secondary' %>

<%= form_tag Alchemy.logout_path, method: 'delete', class: 'buttons' do %>