From 137757727902d052e99bb283a3bd8ddc7533e0ae Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Tue, 14 Jul 2015 20:24:37 +0200 Subject: make suggested-action buttons green-ish --- common/gtk-3.0/3.14/_colors.scss | 2 +- common/gtk-3.0/3.14/_common.scss | 1 + common/gtk-3.0/3.14/gtk-contained-dark.css | 42 +++++++++++---------- common/gtk-3.0/3.14/gtk-contained-darker.css | 42 +++++++++++---------- common/gtk-3.0/3.14/gtk-contained-solid-dark.css | 42 +++++++++++---------- common/gtk-3.0/3.14/gtk-contained-solid-darker.css | 42 +++++++++++---------- common/gtk-3.0/3.14/gtk-contained-solid.css | 42 +++++++++++---------- common/gtk-3.0/3.14/gtk-contained.css | 42 +++++++++++---------- common/gtk-3.0/3.16/_colors.scss | 2 +- common/gtk-3.0/3.16/_common.scss | 2 + common/gtk-3.0/3.16/gtk-contained-dark.css | 44 ++++++++++++---------- common/gtk-3.0/3.16/gtk-contained-darker.css | 44 ++++++++++++---------- common/gtk-3.0/3.16/gtk-contained-solid-dark.css | 44 ++++++++++++---------- common/gtk-3.0/3.16/gtk-contained-solid-darker.css | 44 ++++++++++++---------- common/gtk-3.0/3.16/gtk-contained-solid.css | 44 ++++++++++++---------- common/gtk-3.0/3.16/gtk-contained.css | 44 ++++++++++++---------- 16 files changed, 281 insertions(+), 242 deletions(-) (limited to 'common/gtk-3.0') diff --git a/common/gtk-3.0/3.14/_colors.scss b/common/gtk-3.0/3.14/_colors.scss index 430aaa3..b2768be 100644 --- a/common/gtk-3.0/3.14/_colors.scss +++ b/common/gtk-3.0/3.14/_colors.scss @@ -22,7 +22,7 @@ $warning_color: #F27835; $error_color: #FC4138; $success_color: #73d216; $destructive_color: #F04A50; -$suggested_color: if($variant == 'light', #9EA4B5, #5B5F69); +$suggested_color: #49C98D; $osd_fg_color: #A8ADB5; $osd_bg_color: transparentize(#3c4049, 0.05); diff --git a/common/gtk-3.0/3.14/_common.scss b/common/gtk-3.0/3.14/_common.scss index 8884b4d..2d1558a 100644 --- a/common/gtk-3.0/3.14/_common.scss +++ b/common/gtk-3.0/3.14/_common.scss @@ -504,6 +504,7 @@ $_dot_color: $selected_bg_color; @each $b_type, $b_color in (suggested-action, $suggested_color), (destructive-action, $destructive_color) { &.#{$b_type} { + background-clip: border-box; color: $selected_fg_color; border-color: $b_color; background-color: $b_color; diff --git a/common/gtk-3.0/3.14/gtk-contained-dark.css b/common/gtk-3.0/3.14/gtk-contained-dark.css index 623c1e9..eae31d3 100644 --- a/common/gtk-3.0/3.14/gtk-contained-dark.css +++ b/common/gtk-3.0/3.14/gtk-contained-dark.css @@ -383,27 +383,29 @@ GtkFlowBox .grid-child { border-color: #5294E2; background-image: linear-gradient(to bottom, #5294E2); } .button.suggested-action { + background-clip: border-box; color: #ffffff; - border-color: #5B5F69; - background-color: #5B5F69; } + border-color: #49C98D; + background-color: #49C98D; } .button.suggested-action.flat { border-color: transparent; background-color: transparent; background-image: none; - color: #5B5F69; } + color: #49C98D; } .button.suggested-action:hover { color: #ffffff; - border-color: #707582; - background-color: #707582; } + border-color: #6cd4a3; + background-color: #6cd4a3; } .button.suggested-action:active, .button.suggested-action:checked { color: #ffffff; - border-color: #4a4e56; - background-color: #4a4e56; } + border-color: #37b87b; + background-color: #37b87b; } .button.suggested-action:insensitive { color: rgba(255, 255, 255, 0.6); - border-color: rgba(91, 95, 105, 0.65); - background-color: rgba(91, 95, 105, 0.65); } + border-color: rgba(73, 201, 141, 0.65); + background-color: rgba(73, 201, 141, 0.65); } .button.destructive-action { + background-clip: border-box; color: #ffffff; border-color: #F04A50; background-color: #F04A50; } @@ -963,30 +965,30 @@ GtkComboBox { .primary-toolbar .button.suggested-action, .header-bar .button.suggested-action { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5B5F69; - background-color: #5B5F69; } + border-color: #49C98D; + background-color: #49C98D; } .primary-toolbar .button.suggested-action.flat, .header-bar .button.suggested-action.flat { border-color: transparent; background-color: transparent; background-image: none; - color: #5B5F69; - outline-color: rgba(91, 95, 105, 0.3); } + color: #49C98D; + outline-color: rgba(73, 201, 141, 0.3); } .primary-toolbar .button.suggested-action:hover, .header-bar .button.suggested-action:hover { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #707582; - background-color: #707582; } + border-color: #6cd4a3; + background-color: #6cd4a3; } .primary-toolbar .button.suggested-action:active, .header-bar .button.suggested-action:active, .primary-toolbar .button.suggested-action:checked, .header-bar .button.suggested-action:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #4a4e56; - background-color: #4a4e56; } + border-color: #37b87b; + background-color: #37b87b; } .primary-toolbar .button.suggested-action.flat:insensitive, .header-bar .button.suggested-action.flat:insensitive { - color: rgba(91, 95, 105, 0.45); } + color: rgba(73, 201, 141, 0.45); } .primary-toolbar .button.suggested-action:insensitive, .header-bar .button.suggested-action:insensitive { color: rgba(255, 255, 255, 0.6); - border-color: rgba(91, 95, 105, 0.65); - background-color: rgba(91, 95, 105, 0.65); } + border-color: rgba(73, 201, 141, 0.65); + background-color: rgba(73, 201, 141, 0.65); } .primary-toolbar .button.suggested-action:backdrop, .header-bar .button.suggested-action:backdrop, .primary-toolbar .button.suggested-action:backdrop, .header-bar .button.suggested-action:backdrop { diff --git a/common/gtk-3.0/3.14/gtk-contained-darker.css b/common/gtk-3.0/3.14/gtk-contained-darker.css index 1f91ae4..75b1570 100644 --- a/common/gtk-3.0/3.14/gtk-contained-darker.css +++ b/common/gtk-3.0/3.14/gtk-contained-darker.css @@ -383,27 +383,29 @@ GtkFlowBox .grid-child { border-color: #5294E2; background-image: linear-gradient(to bottom, #5294E2); } .button.suggested-action { + background-clip: border-box; color: #ffffff; - border-color: #9EA4B5; - background-color: #9EA4B5; } + border-color: #49C98D; + background-color: #49C98D; } .button.suggested-action.flat { border-color: transparent; background-color: transparent; background-image: none; - color: #9EA4B5; } + color: #49C98D; } .button.suggested-action:hover { color: #ffffff; - border-color: #b8bcc9; - background-color: #b8bcc9; } + border-color: #6cd4a3; + background-color: #6cd4a3; } .button.suggested-action:active, .button.suggested-action:checked { color: #ffffff; - border-color: #8a91a6; - background-color: #8a91a6; } + border-color: #37b87b; + background-color: #37b87b; } .button.suggested-action:insensitive { color: rgba(255, 255, 255, 0.6); - border-color: rgba(158, 164, 181, 0.65); - background-color: rgba(158, 164, 181, 0.65); } + border-color: rgba(73, 201, 141, 0.65); + background-color: rgba(73, 201, 141, 0.65); } .button.destructive-action { + background-clip: border-box; color: #ffffff; border-color: #F04A50; background-color: #F04A50; } @@ -963,30 +965,30 @@ GtkComboBox { .primary-toolbar .button.suggested-action, .header-bar .button.suggested-action { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #9EA4B5; - background-color: #9EA4B5; } + border-color: #49C98D; + background-color: #49C98D; } .primary-toolbar .button.suggested-action.flat, .header-bar .button.suggested-action.flat { border-color: transparent; background-color: transparent; background-image: none; - color: #9EA4B5; - outline-color: rgba(158, 164, 181, 0.3); } + color: #49C98D; + outline-color: rgba(73, 201, 141, 0.3); } .primary-toolbar .button.suggested-action:hover, .header-bar .button.suggested-action:hover { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #b8bcc9; - background-color: #b8bcc9; } + border-color: #6cd4a3; + background-color: #6cd4a3; } .primary-toolbar .button.suggested-action:active, .header-bar .button.suggested-action:active, .primary-toolbar .button.suggested-action:checked, .header-bar .button.suggested-action:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #8a91a6; - background-color: #8a91a6; } + border-color: #37b87b; + background-color: #37b87b; } .primary-toolbar .button.suggested-action.flat:insensitive, .header-bar .button.suggested-action.flat:insensitive { - color: rgba(158, 164, 181, 0.45); } + color: rgba(73, 201, 141, 0.45); } .primary-toolbar .button.suggested-action:insensitive, .header-bar .button.suggested-action:insensitive { color: rgba(255, 255, 255, 0.6); - border-color: rgba(158, 164, 181, 0.65); - background-color: rgba(158, 164, 181, 0.65); } + border-color: rgba(73, 201, 141, 0.65); + background-color: rgba(73, 201, 141, 0.65); } .primary-toolbar .button.suggested-action:backdrop, .header-bar .button.suggested-action:backdrop, .primary-toolbar .button.suggested-action:backdrop, .header-bar .button.suggested-action:backdrop { diff --git a/common/gtk-3.0/3.14/gtk-contained-solid-dark.css b/common/gtk-3.0/3.14/gtk-contained-solid-dark.css index 0feb38d..ad954ee 100644 --- a/common/gtk-3.0/3.14/gtk-contained-solid-dark.css +++ b/common/gtk-3.0/3.14/gtk-contained-solid-dark.css @@ -383,27 +383,29 @@ GtkFlowBox .grid-child { border-color: #5294E2; background-image: linear-gradient(to bottom, #5294E2); } .button.suggested-action { + background-clip: border-box; color: #ffffff; - border-color: #5B5F69; - background-color: #5B5F69; } + border-color: #49C98D; + background-color: #49C98D; } .button.suggested-action.flat { border-color: transparent; background-color: transparent; background-image: none; - color: #5B5F69; } + color: #49C98D; } .button.suggested-action:hover { color: #ffffff; - border-color: #707582; - background-color: #707582; } + border-color: #6cd4a3; + background-color: #6cd4a3; } .button.suggested-action:active, .button.suggested-action:checked { color: #ffffff; - border-color: #4a4e56; - background-color: #4a4e56; } + border-color: #37b87b; + background-color: #37b87b; } .button.suggested-action:insensitive { color: rgba(255, 255, 255, 0.6); - border-color: rgba(91, 95, 105, 0.65); - background-color: rgba(91, 95, 105, 0.65); } + border-color: rgba(73, 201, 141, 0.65); + background-color: rgba(73, 201, 141, 0.65); } .button.destructive-action { + background-clip: border-box; color: #ffffff; border-color: #F04A50; background-color: #F04A50; } @@ -963,30 +965,30 @@ GtkComboBox { .primary-toolbar .button.suggested-action, .header-bar .button.suggested-action { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5B5F69; - background-color: #5B5F69; } + border-color: #49C98D; + background-color: #49C98D; } .primary-toolbar .button.suggested-action.flat, .header-bar .button.suggested-action.flat { border-color: transparent; background-color: transparent; background-image: none; - color: #5B5F69; - outline-color: rgba(91, 95, 105, 0.3); } + color: #49C98D; + outline-color: rgba(73, 201, 141, 0.3); } .primary-toolbar .button.suggested-action:hover, .header-bar .button.suggested-action:hover { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #707582; - background-color: #707582; } + border-color: #6cd4a3; + background-color: #6cd4a3; } .primary-toolbar .button.suggested-action:active, .header-bar .button.suggested-action:active, .primary-toolbar .button.suggested-action:checked, .header-bar .button.suggested-action:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #4a4e56; - background-color: #4a4e56; } + border-color: #37b87b; + background-color: #37b87b; } .primary-toolbar .button.suggested-action.flat:insensitive, .header-bar .button.suggested-action.flat:insensitive { - color: rgba(91, 95, 105, 0.45); } + color: rgba(73, 201, 141, 0.45); } .primary-toolbar .button.suggested-action:insensitive, .header-bar .button.suggested-action:insensitive { color: rgba(255, 255, 255, 0.6); - border-color: rgba(91, 95, 105, 0.65); - background-color: rgba(91, 95, 105, 0.65); } + border-color: rgba(73, 201, 141, 0.65); + background-color: rgba(73, 201, 141, 0.65); } .primary-toolbar .button.suggested-action:backdrop, .header-bar .button.suggested-action:backdrop, .primary-toolbar .button.suggested-action:backdrop, .header-bar .button.suggested-action:backdrop { diff --git a/common/gtk-3.0/3.14/gtk-contained-solid-darker.css b/common/gtk-3.0/3.14/gtk-contained-solid-darker.css index feb7140..5976c7a 100644 --- a/common/gtk-3.0/3.14/gtk-contained-solid-darker.css +++ b/common/gtk-3.0/3.14/gtk-contained-solid-darker.css @@ -383,27 +383,29 @@ GtkFlowBox .grid-child { border-color: #5294E2; background-image: linear-gradient(to bottom, #5294E2); } .button.suggested-action { + background-clip: border-box; color: #ffffff; - border-color: #9EA4B5; - background-color: #9EA4B5; } + border-color: #49C98D; + background-color: #49C98D; } .button.suggested-action.flat { border-color: transparent; background-color: transparent; background-image: none; - color: #9EA4B5; } + color: #49C98D; } .button.suggested-action:hover { color: #ffffff; - border-color: #b8bcc9; - background-color: #b8bcc9; } + border-color: #6cd4a3; + background-color: #6cd4a3; } .button.suggested-action:active, .button.suggested-action:checked { color: #ffffff; - border-color: #8a91a6; - background-color: #8a91a6; } + border-color: #37b87b; + background-color: #37b87b; } .button.suggested-action:insensitive { color: rgba(255, 255, 255, 0.6); - border-color: rgba(158, 164, 181, 0.65); - background-color: rgba(158, 164, 181, 0.65); } + border-color: rgba(73, 201, 141, 0.65); + background-color: rgba(73, 201, 141, 0.65); } .button.destructive-action { + background-clip: border-box; color: #ffffff; border-color: #F04A50; background-color: #F04A50; } @@ -963,30 +965,30 @@ GtkComboBox { .primary-toolbar .button.suggested-action, .header-bar .button.suggested-action { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #9EA4B5; - background-color: #9EA4B5; } + border-color: #49C98D; + background-color: #49C98D; } .primary-toolbar .button.suggested-action.flat, .header-bar .button.suggested-action.flat { border-color: transparent; background-color: transparent; background-image: none; - color: #9EA4B5; - outline-color: rgba(158, 164, 181, 0.3); } + color: #49C98D; + outline-color: rgba(73, 201, 141, 0.3); } .primary-toolbar .button.suggested-action:hover, .header-bar .button.suggested-action:hover { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #b8bcc9; - background-color: #b8bcc9; } + border-color: #6cd4a3; + background-color: #6cd4a3; } .primary-toolbar .button.suggested-action:active, .header-bar .button.suggested-action:active, .primary-toolbar .button.suggested-action:checked, .header-bar .button.suggested-action:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #8a91a6; - background-color: #8a91a6; } + border-color: #37b87b; + background-color: #37b87b; } .primary-toolbar .button.suggested-action.flat:insensitive, .header-bar .button.suggested-action.flat:insensitive { - color: rgba(158, 164, 181, 0.45); } + color: rgba(73, 201, 141, 0.45); } .primary-toolbar .button.suggested-action:insensitive, .header-bar .button.suggested-action:insensitive { color: rgba(255, 255, 255, 0.6); - border-color: rgba(158, 164, 181, 0.65); - background-color: rgba(158, 164, 181, 0.65); } + border-color: rgba(73, 201, 141, 0.65); + background-color: rgba(73, 201, 141, 0.65); } .primary-toolbar .button.suggested-action:backdrop, .header-bar .button.suggested-action:backdrop, .primary-toolbar .button.suggested-action:backdrop, .header-bar .button.suggested-action:backdrop { diff --git a/common/gtk-3.0/3.14/gtk-contained-solid.css b/common/gtk-3.0/3.14/gtk-contained-solid.css index 64dd65f..31a7d3d 100644 --- a/common/gtk-3.0/3.14/gtk-contained-solid.css +++ b/common/gtk-3.0/3.14/gtk-contained-solid.css @@ -383,27 +383,29 @@ GtkFlowBox .grid-child { border-color: #5294E2; background-image: linear-gradient(to bottom, #5294E2); } .button.suggested-action { + background-clip: border-box; color: #ffffff; - border-color: #9EA4B5; - background-color: #9EA4B5; } + border-color: #49C98D; + background-color: #49C98D; } .button.suggested-action.flat { border-color: transparent; background-color: transparent; background-image: none; - color: #9EA4B5; } + color: #49C98D; } .button.suggested-action:hover { color: #ffffff; - border-color: #b8bcc9; - background-color: #b8bcc9; } + border-color: #6cd4a3; + background-color: #6cd4a3; } .button.suggested-action:active, .button.suggested-action:checked { color: #ffffff; - border-color: #8a91a6; - background-color: #8a91a6; } + border-color: #37b87b; + background-color: #37b87b; } .button.suggested-action:insensitive { color: rgba(255, 255, 255, 0.6); - border-color: rgba(158, 164, 181, 0.65); - background-color: rgba(158, 164, 181, 0.65); } + border-color: rgba(73, 201, 141, 0.65); + background-color: rgba(73, 201, 141, 0.65); } .button.destructive-action { + background-clip: border-box; color: #ffffff; border-color: #F04A50; background-color: #F04A50; } @@ -963,30 +965,30 @@ GtkComboBox { .primary-toolbar .button.suggested-action, .header-bar .button.suggested-action { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #9EA4B5; - background-color: #9EA4B5; } + border-color: #49C98D; + background-color: #49C98D; } .primary-toolbar .button.suggested-action.flat, .header-bar .button.suggested-action.flat { border-color: transparent; background-color: transparent; background-image: none; - color: #9EA4B5; - outline-color: rgba(158, 164, 181, 0.3); } + color: #49C98D; + outline-color: rgba(73, 201, 141, 0.3); } .primary-toolbar .button.suggested-action:hover, .header-bar .button.suggested-action:hover { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #b8bcc9; - background-color: #b8bcc9; } + border-color: #6cd4a3; + background-color: #6cd4a3; } .primary-toolbar .button.suggested-action:active, .header-bar .button.suggested-action:active, .primary-toolbar .button.suggested-action:checked, .header-bar .button.suggested-action:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #8a91a6; - background-color: #8a91a6; } + border-color: #37b87b; + background-color: #37b87b; } .primary-toolbar .button.suggested-action.flat:insensitive, .header-bar .button.suggested-action.flat:insensitive { - color: rgba(158, 164, 181, 0.45); } + color: rgba(73, 201, 141, 0.45); } .primary-toolbar .button.suggested-action:insensitive, .header-bar .button.suggested-action:insensitive { color: rgba(255, 255, 255, 0.6); - border-color: rgba(158, 164, 181, 0.65); - background-color: rgba(158, 164, 181, 0.65); } + border-color: rgba(73, 201, 141, 0.65); + background-color: rgba(73, 201, 141, 0.65); } .primary-toolbar .button.suggested-action:backdrop, .header-bar .button.suggested-action:backdrop, .primary-toolbar .button.suggested-action:backdrop, .header-bar .button.suggested-action:backdrop { diff --git a/common/gtk-3.0/3.14/gtk-contained.css b/common/gtk-3.0/3.14/gtk-contained.css index ba2c31c..50af8c6 100644 --- a/common/gtk-3.0/3.14/gtk-contained.css +++ b/common/gtk-3.0/3.14/gtk-contained.css @@ -383,27 +383,29 @@ GtkFlowBox .grid-child { border-color: #5294E2; background-image: linear-gradient(to bottom, #5294E2); } .button.suggested-action { + background-clip: border-box; color: #ffffff; - border-color: #9EA4B5; - background-color: #9EA4B5; } + border-color: #49C98D; + background-color: #49C98D; } .button.suggested-action.flat { border-color: transparent; background-color: transparent; background-image: none; - color: #9EA4B5; } + color: #49C98D; } .button.suggested-action:hover { color: #ffffff; - border-color: #b8bcc9; - background-color: #b8bcc9; } + border-color: #6cd4a3; + background-color: #6cd4a3; } .button.suggested-action:active, .button.suggested-action:checked { color: #ffffff; - border-color: #8a91a6; - background-color: #8a91a6; } + border-color: #37b87b; + background-color: #37b87b; } .button.suggested-action:insensitive { color: rgba(255, 255, 255, 0.6); - border-color: rgba(158, 164, 181, 0.65); - background-color: rgba(158, 164, 181, 0.65); } + border-color: rgba(73, 201, 141, 0.65); + background-color: rgba(73, 201, 141, 0.65); } .button.destructive-action { + background-clip: border-box; color: #ffffff; border-color: #F04A50; background-color: #F04A50; } @@ -963,30 +965,30 @@ GtkComboBox { .primary-toolbar .button.suggested-action, .header-bar .button.suggested-action { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #9EA4B5; - background-color: #9EA4B5; } + border-color: #49C98D; + background-color: #49C98D; } .primary-toolbar .button.suggested-action.flat, .header-bar .button.suggested-action.flat { border-color: transparent; background-color: transparent; background-image: none; - color: #9EA4B5; - outline-color: rgba(158, 164, 181, 0.3); } + color: #49C98D; + outline-color: rgba(73, 201, 141, 0.3); } .primary-toolbar .button.suggested-action:hover, .header-bar .button.suggested-action:hover { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #b8bcc9; - background-color: #b8bcc9; } + border-color: #6cd4a3; + background-color: #6cd4a3; } .primary-toolbar .button.suggested-action:active, .header-bar .button.suggested-action:active, .primary-toolbar .button.suggested-action:checked, .header-bar .button.suggested-action:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #8a91a6; - background-color: #8a91a6; } + border-color: #37b87b; + background-color: #37b87b; } .primary-toolbar .button.suggested-action.flat:insensitive, .header-bar .button.suggested-action.flat:insensitive { - color: rgba(158, 164, 181, 0.45); } + color: rgba(73, 201, 141, 0.45); } .primary-toolbar .button.suggested-action:insensitive, .header-bar .button.suggested-action:insensitive { color: rgba(255, 255, 255, 0.6); - border-color: rgba(158, 164, 181, 0.65); - background-color: rgba(158, 164, 181, 0.65); } + border-color: rgba(73, 201, 141, 0.65); + background-color: rgba(73, 201, 141, 0.65); } .primary-toolbar .button.suggested-action:backdrop, .header-bar .button.suggested-action:backdrop, .primary-toolbar .button.suggested-action:backdrop, .header-bar .button.suggested-action:backdrop { diff --git a/common/gtk-3.0/3.16/_colors.scss b/common/gtk-3.0/3.16/_colors.scss index 430aaa3..b2768be 100644 --- a/common/gtk-3.0/3.16/_colors.scss +++ b/common/gtk-3.0/3.16/_colors.scss @@ -22,7 +22,7 @@ $warning_color: #F27835; $error_color: #FC4138; $success_color: #73d216; $destructive_color: #F04A50; -$suggested_color: if($variant == 'light', #9EA4B5, #5B5F69); +$suggested_color: #49C98D; $osd_fg_color: #A8ADB5; $osd_bg_color: transparentize(#3c4049, 0.05); diff --git a/common/gtk-3.0/3.16/_common.scss b/common/gtk-3.0/3.16/_common.scss index e141044..b60279a 100644 --- a/common/gtk-3.0/3.16/_common.scss +++ b/common/gtk-3.0/3.16/_common.scss @@ -504,7 +504,9 @@ $_dot_color: $selected_bg_color; @each $b_type, $b_color in (suggested-action, $suggested_color), (destructive-action, $destructive_color) { &.#{$b_type} { + background-clip: border-box; color: $selected_fg_color; + outline-color: transparentize($selected_fg_color, 0.7); border-color: $b_color; background-color: $b_color; diff --git a/common/gtk-3.0/3.16/gtk-contained-dark.css b/common/gtk-3.0/3.16/gtk-contained-dark.css index 0a8d4ed..6a38c09 100644 --- a/common/gtk-3.0/3.16/gtk-contained-dark.css +++ b/common/gtk-3.0/3.16/gtk-contained-dark.css @@ -383,28 +383,32 @@ GtkTextView { border-color: #5294E2; background-image: linear-gradient(to bottom, #5294E2); } .button.suggested-action { + background-clip: border-box; color: #ffffff; - border-color: #5B5F69; - background-color: #5B5F69; } + outline-color: rgba(255, 255, 255, 0.3); + border-color: #49C98D; + background-color: #49C98D; } .button.suggested-action.flat { border-color: transparent; background-color: transparent; background-image: none; - color: #5B5F69; } + color: #49C98D; } .button.suggested-action:hover { color: #ffffff; - border-color: #707582; - background-color: #707582; } + border-color: #6cd4a3; + background-color: #6cd4a3; } .button.suggested-action:active, .button.suggested-action:checked { color: #ffffff; - border-color: #4a4e56; - background-color: #4a4e56; } + border-color: #37b87b; + background-color: #37b87b; } .button.suggested-action:insensitive { color: rgba(255, 255, 255, 0.6); - border-color: rgba(91, 95, 105, 0.65); - background-color: rgba(91, 95, 105, 0.65); } + border-color: rgba(73, 201, 141, 0.65); + background-color: rgba(73, 201, 141, 0.65); } .button.destructive-action { + background-clip: border-box; color: #ffffff; + outline-color: rgba(255, 255, 255, 0.3); border-color: #F04A50; background-color: #F04A50; } .button.destructive-action.flat { @@ -970,30 +974,30 @@ GtkComboBox { .primary-toolbar .button.suggested-action, .header-bar .button.suggested-action { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5B5F69; - background-color: #5B5F69; } + border-color: #49C98D; + background-color: #49C98D; } .primary-toolbar .button.suggested-action.flat, .header-bar .button.suggested-action.flat { border-color: transparent; background-color: transparent; background-image: none; - color: #5B5F69; - outline-color: rgba(91, 95, 105, 0.3); } + color: #49C98D; + outline-color: rgba(73, 201, 141, 0.3); } .primary-toolbar .button.suggested-action:hover, .header-bar .button.suggested-action:hover { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #707582; - background-color: #707582; } + border-color: #6cd4a3; + background-color: #6cd4a3; } .primary-toolbar .button.suggested-action:active, .header-bar .button.suggested-action:active, .primary-toolbar .button.suggested-action:checked, .header-bar .button.suggested-action:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #4a4e56; - background-color: #4a4e56; } + border-color: #37b87b; + background-color: #37b87b; } .primary-toolbar .button.suggested-action.flat:insensitive, .header-bar .button.suggested-action.flat:insensitive { - color: rgba(91, 95, 105, 0.45); } + color: rgba(73, 201, 141, 0.45); } .primary-toolbar .button.suggested-action:insensitive, .header-bar .button.suggested-action:insensitive { color: rgba(255, 255, 255, 0.6); - border-color: rgba(91, 95, 105, 0.65); - background-color: rgba(91, 95, 105, 0.65); } + border-color: rgba(73, 201, 141, 0.65); + background-color: rgba(73, 201, 141, 0.65); } .primary-toolbar .button.suggested-action:backdrop, .header-bar .button.suggested-action:backdrop, .primary-toolbar .button.suggested-action:backdrop, .header-bar .button.suggested-action:backdrop { diff --git a/common/gtk-3.0/3.16/gtk-contained-darker.css b/common/gtk-3.0/3.16/gtk-contained-darker.css index ec75cfc..fb7dd43 100644 --- a/common/gtk-3.0/3.16/gtk-contained-darker.css +++ b/common/gtk-3.0/3.16/gtk-contained-darker.css @@ -383,28 +383,32 @@ GtkTextView { border-color: #5294E2; background-image: linear-gradient(to bottom, #5294E2); } .button.suggested-action { + background-clip: border-box; color: #ffffff; - border-color: #9EA4B5; - background-color: #9EA4B5; } + outline-color: rgba(255, 255, 255, 0.3); + border-color: #49C98D; + background-color: #49C98D; } .button.suggested-action.flat { border-color: transparent; background-color: transparent; background-image: none; - color: #9EA4B5; } + color: #49C98D; } .button.suggested-action:hover { color: #ffffff; - border-color: #b8bcc9; - background-color: #b8bcc9; } + border-color: #6cd4a3; + background-color: #6cd4a3; } .button.suggested-action:active, .button.suggested-action:checked { color: #ffffff; - border-color: #8a91a6; - background-color: #8a91a6; } + border-color: #37b87b; + background-color: #37b87b; } .button.suggested-action:insensitive { color: rgba(255, 255, 255, 0.6); - border-color: rgba(158, 164, 181, 0.65); - background-color: rgba(158, 164, 181, 0.65); } + border-color: rgba(73, 201, 141, 0.65); + background-color: rgba(73, 201, 141, 0.65); } .button.destructive-action { + background-clip: border-box; color: #ffffff; + outline-color: rgba(255, 255, 255, 0.3); border-color: #F04A50; background-color: #F04A50; } .button.destructive-action.flat { @@ -970,30 +974,30 @@ GtkComboBox { .primary-toolbar .button.suggested-action, .header-bar .button.suggested-action { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #9EA4B5; - background-color: #9EA4B5; } + border-color: #49C98D; + background-color: #49C98D; } .primary-toolbar .button.suggested-action.flat, .header-bar .button.suggested-action.flat { border-color: transparent; background-color: transparent; background-image: none; - color: #9EA4B5; - outline-color: rgba(158, 164, 181, 0.3); } + color: #49C98D; + outline-color: rgba(73, 201, 141, 0.3); } .primary-toolbar .button.suggested-action:hover, .header-bar .button.suggested-action:hover { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #b8bcc9; - background-color: #b8bcc9; } + border-color: #6cd4a3; + background-color: #6cd4a3; } .primary-toolbar .button.suggested-action:active, .header-bar .button.suggested-action:active, .primary-toolbar .button.suggested-action:checked, .header-bar .button.suggested-action:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #8a91a6; - background-color: #8a91a6; } + border-color: #37b87b; + background-color: #37b87b; } .primary-toolbar .button.suggested-action.flat:insensitive, .header-bar .button.suggested-action.flat:insensitive { - color: rgba(158, 164, 181, 0.45); } + color: rgba(73, 201, 141, 0.45); } .primary-toolbar .button.suggested-action:insensitive, .header-bar .button.suggested-action:insensitive { color: rgba(255, 255, 255, 0.6); - border-color: rgba(158, 164, 181, 0.65); - background-color: rgba(158, 164, 181, 0.65); } + border-color: rgba(73, 201, 141, 0.65); + background-color: rgba(73, 201, 141, 0.65); } .primary-toolbar .button.suggested-action:backdrop, .header-bar .button.suggested-action:backdrop, .primary-toolbar .button.suggested-action:backdrop, .header-bar .button.suggested-action:backdrop { diff --git a/common/gtk-3.0/3.16/gtk-contained-solid-dark.css b/common/gtk-3.0/3.16/gtk-contained-solid-dark.css index 095310d..f42002a 100644 --- a/common/gtk-3.0/3.16/gtk-contained-solid-dark.css +++ b/common/gtk-3.0/3.16/gtk-contained-solid-dark.css @@ -383,28 +383,32 @@ GtkTextView { border-color: #5294E2; background-image: linear-gradient(to bottom, #5294E2); } .button.suggested-action { + background-clip: border-box; color: #ffffff; - border-color: #5B5F69; - background-color: #5B5F69; } + outline-color: rgba(255, 255, 255, 0.3); + border-color: #49C98D; + background-color: #49C98D; } .button.suggested-action.flat { border-color: transparent; background-color: transparent; background-image: none; - color: #5B5F69; } + color: #49C98D; } .button.suggested-action:hover { color: #ffffff; - border-color: #707582; - background-color: #707582; } + border-color: #6cd4a3; + background-color: #6cd4a3; } .button.suggested-action:active, .button.suggested-action:checked { color: #ffffff; - border-color: #4a4e56; - background-color: #4a4e56; } + border-color: #37b87b; + background-color: #37b87b; } .button.suggested-action:insensitive { color: rgba(255, 255, 255, 0.6); - border-color: rgba(91, 95, 105, 0.65); - background-color: rgba(91, 95, 105, 0.65); } + border-color: rgba(73, 201, 141, 0.65); + background-color: rgba(73, 201, 141, 0.65); } .button.destructive-action { + background-clip: border-box; color: #ffffff; + outline-color: rgba(255, 255, 255, 0.3); border-color: #F04A50; background-color: #F04A50; } .button.destructive-action.flat { @@ -970,30 +974,30 @@ GtkComboBox { .primary-toolbar .button.suggested-action, .header-bar .button.suggested-action { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5B5F69; - background-color: #5B5F69; } + border-color: #49C98D; + background-color: #49C98D; } .primary-toolbar .button.suggested-action.flat, .header-bar .button.suggested-action.flat { border-color: transparent; background-color: transparent; background-image: none; - color: #5B5F69; - outline-color: rgba(91, 95, 105, 0.3); } + color: #49C98D; + outline-color: rgba(73, 201, 141, 0.3); } .primary-toolbar .button.suggested-action:hover, .header-bar .button.suggested-action:hover { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #707582; - background-color: #707582; } + border-color: #6cd4a3; + background-color: #6cd4a3; } .primary-toolbar .button.suggested-action:active, .header-bar .button.suggested-action:active, .primary-toolbar .button.suggested-action:checked, .header-bar .button.suggested-action:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #4a4e56; - background-color: #4a4e56; } + border-color: #37b87b; + background-color: #37b87b; } .primary-toolbar .button.suggested-action.flat:insensitive, .header-bar .button.suggested-action.flat:insensitive { - color: rgba(91, 95, 105, 0.45); } + color: rgba(73, 201, 141, 0.45); } .primary-toolbar .button.suggested-action:insensitive, .header-bar .button.suggested-action:insensitive { color: rgba(255, 255, 255, 0.6); - border-color: rgba(91, 95, 105, 0.65); - background-color: rgba(91, 95, 105, 0.65); } + border-color: rgba(73, 201, 141, 0.65); + background-color: rgba(73, 201, 141, 0.65); } .primary-toolbar .button.suggested-action:backdrop, .header-bar .button.suggested-action:backdrop, .primary-toolbar .button.suggested-action:backdrop, .header-bar .button.suggested-action:backdrop { diff --git a/common/gtk-3.0/3.16/gtk-contained-solid-darker.css b/common/gtk-3.0/3.16/gtk-contained-solid-darker.css index 378a670..5eb7f19 100644 --- a/common/gtk-3.0/3.16/gtk-contained-solid-darker.css +++ b/common/gtk-3.0/3.16/gtk-contained-solid-darker.css @@ -383,28 +383,32 @@ GtkTextView { border-color: #5294E2; background-image: linear-gradient(to bottom, #5294E2); } .button.suggested-action { + background-clip: border-box; color: #ffffff; - border-color: #9EA4B5; - background-color: #9EA4B5; } + outline-color: rgba(255, 255, 255, 0.3); + border-color: #49C98D; + background-color: #49C98D; } .button.suggested-action.flat { border-color: transparent; background-color: transparent; background-image: none; - color: #9EA4B5; } + color: #49C98D; } .button.suggested-action:hover { color: #ffffff; - border-color: #b8bcc9; - background-color: #b8bcc9; } + border-color: #6cd4a3; + background-color: #6cd4a3; } .button.suggested-action:active, .button.suggested-action:checked { color: #ffffff; - border-color: #8a91a6; - background-color: #8a91a6; } + border-color: #37b87b; + background-color: #37b87b; } .button.suggested-action:insensitive { color: rgba(255, 255, 255, 0.6); - border-color: rgba(158, 164, 181, 0.65); - background-color: rgba(158, 164, 181, 0.65); } + border-color: rgba(73, 201, 141, 0.65); + background-color: rgba(73, 201, 141, 0.65); } .button.destructive-action { + background-clip: border-box; color: #ffffff; + outline-color: rgba(255, 255, 255, 0.3); border-color: #F04A50; background-color: #F04A50; } .button.destructive-action.flat { @@ -970,30 +974,30 @@ GtkComboBox { .primary-toolbar .button.suggested-action, .header-bar .button.suggested-action { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #9EA4B5; - background-color: #9EA4B5; } + border-color: #49C98D; + background-color: #49C98D; } .primary-toolbar .button.suggested-action.flat, .header-bar .button.suggested-action.flat { border-color: transparent; background-color: transparent; background-image: none; - color: #9EA4B5; - outline-color: rgba(158, 164, 181, 0.3); } + color: #49C98D; + outline-color: rgba(73, 201, 141, 0.3); } .primary-toolbar .button.suggested-action:hover, .header-bar .button.suggested-action:hover { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #b8bcc9; - background-color: #b8bcc9; } + border-color: #6cd4a3; + background-color: #6cd4a3; } .primary-toolbar .button.suggested-action:active, .header-bar .button.suggested-action:active, .primary-toolbar .button.suggested-action:checked, .header-bar .button.suggested-action:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #8a91a6; - background-color: #8a91a6; } + border-color: #37b87b; + background-color: #37b87b; } .primary-toolbar .button.suggested-action.flat:insensitive, .header-bar .button.suggested-action.flat:insensitive { - color: rgba(158, 164, 181, 0.45); } + color: rgba(73, 201, 141, 0.45); } .primary-toolbar .button.suggested-action:insensitive, .header-bar .button.suggested-action:insensitive { color: rgba(255, 255, 255, 0.6); - border-color: rgba(158, 164, 181, 0.65); - background-color: rgba(158, 164, 181, 0.65); } + border-color: rgba(73, 201, 141, 0.65); + background-color: rgba(73, 201, 141, 0.65); } .primary-toolbar .button.suggested-action:backdrop, .header-bar .button.suggested-action:backdrop, .primary-toolbar .button.suggested-action:backdrop, .header-bar .button.suggested-action:backdrop { diff --git a/common/gtk-3.0/3.16/gtk-contained-solid.css b/common/gtk-3.0/3.16/gtk-contained-solid.css index dc23f21..9dfda59 100644 --- a/common/gtk-3.0/3.16/gtk-contained-solid.css +++ b/common/gtk-3.0/3.16/gtk-contained-solid.css @@ -383,28 +383,32 @@ GtkTextView { border-color: #5294E2; background-image: linear-gradient(to bottom, #5294E2); } .button.suggested-action { + background-clip: border-box; color: #ffffff; - border-color: #9EA4B5; - background-color: #9EA4B5; } + outline-color: rgba(255, 255, 255, 0.3); + border-color: #49C98D; + background-color: #49C98D; } .button.suggested-action.flat { border-color: transparent; background-color: transparent; background-image: none; - color: #9EA4B5; } + color: #49C98D; } .button.suggested-action:hover { color: #ffffff; - border-color: #b8bcc9; - background-color: #b8bcc9; } + border-color: #6cd4a3; + background-color: #6cd4a3; } .button.suggested-action:active, .button.suggested-action:checked { color: #ffffff; - border-color: #8a91a6; - background-color: #8a91a6; } + border-color: #37b87b; + background-color: #37b87b; } .button.suggested-action:insensitive { color: rgba(255, 255, 255, 0.6); - border-color: rgba(158, 164, 181, 0.65); - background-color: rgba(158, 164, 181, 0.65); } + border-color: rgba(73, 201, 141, 0.65); + background-color: rgba(73, 201, 141, 0.65); } .button.destructive-action { + background-clip: border-box; color: #ffffff; + outline-color: rgba(255, 255, 255, 0.3); border-color: #F04A50; background-color: #F04A50; } .button.destructive-action.flat { @@ -970,30 +974,30 @@ GtkComboBox { .primary-toolbar .button.suggested-action, .header-bar .button.suggested-action { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #9EA4B5; - background-color: #9EA4B5; } + border-color: #49C98D; + background-color: #49C98D; } .primary-toolbar .button.suggested-action.flat, .header-bar .button.suggested-action.flat { border-color: transparent; background-color: transparent; background-image: none; - color: #9EA4B5; - outline-color: rgba(158, 164, 181, 0.3); } + color: #49C98D; + outline-color: rgba(73, 201, 141, 0.3); } .primary-toolbar .button.suggested-action:hover, .header-bar .button.suggested-action:hover { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #b8bcc9; - background-color: #b8bcc9; } + border-color: #6cd4a3; + background-color: #6cd4a3; } .primary-toolbar .button.suggested-action:active, .header-bar .button.suggested-action:active, .primary-toolbar .button.suggested-action:checked, .header-bar .button.suggested-action:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #8a91a6; - background-color: #8a91a6; } + border-color: #37b87b; + background-color: #37b87b; } .primary-toolbar .button.suggested-action.flat:insensitive, .header-bar .button.suggested-action.flat:insensitive { - color: rgba(158, 164, 181, 0.45); } + color: rgba(73, 201, 141, 0.45); } .primary-toolbar .button.suggested-action:insensitive, .header-bar .button.suggested-action:insensitive { color: rgba(255, 255, 255, 0.6); - border-color: rgba(158, 164, 181, 0.65); - background-color: rgba(158, 164, 181, 0.65); } + border-color: rgba(73, 201, 141, 0.65); + background-color: rgba(73, 201, 141, 0.65); } .primary-toolbar .button.suggested-action:backdrop, .header-bar .button.suggested-action:backdrop, .primary-toolbar .button.suggested-action:backdrop, .header-bar .button.suggested-action:backdrop { diff --git a/common/gtk-3.0/3.16/gtk-contained.css b/common/gtk-3.0/3.16/gtk-contained.css index 0b5c350..d9711bc 100644 --- a/common/gtk-3.0/3.16/gtk-contained.css +++ b/common/gtk-3.0/3.16/gtk-contained.css @@ -383,28 +383,32 @@ GtkTextView { border-color: #5294E2; background-image: linear-gradient(to bottom, #5294E2); } .button.suggested-action { + background-clip: border-box; color: #ffffff; - border-color: #9EA4B5; - background-color: #9EA4B5; } + outline-color: rgba(255, 255, 255, 0.3); + border-color: #49C98D; + background-color: #49C98D; } .button.suggested-action.flat { border-color: transparent; background-color: transparent; background-image: none; - color: #9EA4B5; } + color: #49C98D; } .button.suggested-action:hover { color: #ffffff; - border-color: #b8bcc9; - background-color: #b8bcc9; } + border-color: #6cd4a3; + background-color: #6cd4a3; } .button.suggested-action:active, .button.suggested-action:checked { color: #ffffff; - border-color: #8a91a6; - background-color: #8a91a6; } + border-color: #37b87b; + background-color: #37b87b; } .button.suggested-action:insensitive { color: rgba(255, 255, 255, 0.6); - border-color: rgba(158, 164, 181, 0.65); - background-color: rgba(158, 164, 181, 0.65); } + border-color: rgba(73, 201, 141, 0.65); + background-color: rgba(73, 201, 141, 0.65); } .button.destructive-action { + background-clip: border-box; color: #ffffff; + outline-color: rgba(255, 255, 255, 0.3); border-color: #F04A50; background-color: #F04A50; } .button.destructive-action.flat { @@ -970,30 +974,30 @@ GtkComboBox { .primary-toolbar .button.suggested-action, .header-bar .button.suggested-action { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #9EA4B5; - background-color: #9EA4B5; } + border-color: #49C98D; + background-color: #49C98D; } .primary-toolbar .button.suggested-action.flat, .header-bar .button.suggested-action.flat { border-color: transparent; background-color: transparent; background-image: none; - color: #9EA4B5; - outline-color: rgba(158, 164, 181, 0.3); } + color: #49C98D; + outline-color: rgba(73, 201, 141, 0.3); } .primary-toolbar .button.suggested-action:hover, .header-bar .button.suggested-action:hover { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #b8bcc9; - background-color: #b8bcc9; } + border-color: #6cd4a3; + background-color: #6cd4a3; } .primary-toolbar .button.suggested-action:active, .header-bar .button.suggested-action:active, .primary-toolbar .button.suggested-action:checked, .header-bar .button.suggested-action:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #8a91a6; - background-color: #8a91a6; } + border-color: #37b87b; + background-color: #37b87b; } .primary-toolbar .button.suggested-action.flat:insensitive, .header-bar .button.suggested-action.flat:insensitive { - color: rgba(158, 164, 181, 0.45); } + color: rgba(73, 201, 141, 0.45); } .primary-toolbar .button.suggested-action:insensitive, .header-bar .button.suggested-action:insensitive { color: rgba(255, 255, 255, 0.6); - border-color: rgba(158, 164, 181, 0.65); - background-color: rgba(158, 164, 181, 0.65); } + border-color: rgba(73, 201, 141, 0.65); + background-color: rgba(73, 201, 141, 0.65); } .primary-toolbar .button.suggested-action:backdrop, .header-bar .button.suggested-action:backdrop, .primary-toolbar .button.suggested-action:backdrop, .header-bar .button.suggested-action:backdrop { -- cgit v1.2.3