diff options
| author | Horst3180 | 2015-09-20 16:46:14 +0200 |
|---|---|---|
| committer | Horst3180 | 2015-09-20 16:46:14 +0200 |
| commit | e6d9055657ba65d657814e2ea59fe5ccef08e384 (patch) | |
| tree | da1514aa1d171dab70bfe42c8bac879fd7fe61fc | |
| parent | a96d6ad4e27cda870192e050890c30309cdc6319 (diff) | |
| download | solarc-theme-e6d9055657ba65d657814e2ea59fe5ccef08e384.tar.gz solarc-theme-e6d9055657ba65d657814e2ea59fe5ccef08e384.tar.xz solarc-theme-e6d9055657ba65d657814e2ea59fe5ccef08e384.zip | |
refactor error and warning entries
21 files changed, 1461 insertions, 409 deletions
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 68ee9d6..b06ec6b 100644 --- a/common/gtk-3.0/3.14/gtk-contained-dark.css +++ b/common/gtk-3.0/3.14/gtk-contained-dark.css @@ -196,32 +196,30 @@ GtkFlowBox .grid-child { border-left-style: none; } .linked > .entry:last-child:dir(rtl) { border-left-style: solid; } - .entry.error { - color: white; - border-color: #FC4138; - background-image: linear-gradient(to bottom, #d6423d); } - .entry.error:focus { - background-image: linear-gradient(to bottom, #FC4138); - color: white; } - .entry.error:selected, .entry.error:selected:focus { - background-color: white; - color: #FC4138; } .entry.warning { - color: white; - border-color: #F27835; - background-image: linear-gradient(to bottom, #ce6e3b); } + color: #ffffff; + border-color: #2b2e39; + background-image: linear-gradient(to bottom, #ab6441); } .entry.warning:focus { + color: #ffffff; background-image: linear-gradient(to bottom, #F27835); - color: white; } + box-shadow: none; } .entry.warning:selected, .entry.warning:selected:focus { - background-color: white; + background-color: #ffffff; color: #F27835; } + .entry.error { + color: #ffffff; + border-color: #2b2e39; + background-image: linear-gradient(to bottom, #b14342); } + .entry.error:focus { + color: #ffffff; + background-image: linear-gradient(to bottom, #FC4138); + box-shadow: none; } + .entry.error:selected, .entry.error:selected:focus { + background-color: #ffffff; + color: #FC4138; } .entry.image { color: #b6bcc6; } - .entry.image:hover { - color: #D3DAE3; } - .entry.image:active { - color: #5294E2; } .linked.vertical > .entry { border-bottom-color: #3a3e4a; box-shadow: none; } @@ -1050,6 +1048,26 @@ GtkComboBox { border-color: #5294E2; background-image: none; background-color: transparent; } + .primary-toolbar .entry.warning, .header-bar .entry.warning { + color: #ffffff; + border-color: rgba(21, 23, 28, 0.37); + background-image: linear-gradient(to bottom, rgba(167, 94, 57, 0.988)); } + .primary-toolbar .entry.warning:focus, .header-bar .entry.warning:focus { + color: #ffffff; + background-image: linear-gradient(to bottom, #F27835); } + .primary-toolbar .entry.warning:selected, .header-bar .entry.warning:selected, .primary-toolbar .entry.warning:selected:focus, .header-bar .entry.warning:selected:focus { + background-color: #ffffff; + color: #F27835; } + .primary-toolbar .entry.error, .header-bar .entry.error { + color: #ffffff; + border-color: rgba(21, 23, 28, 0.37); + background-image: linear-gradient(to bottom, rgba(173, 60, 59, 0.988)); } + .primary-toolbar .entry.error:focus, .header-bar .entry.error:focus { + color: #ffffff; + background-image: linear-gradient(to bottom, #FC4138); } + .primary-toolbar .entry.error:selected, .header-bar .entry.error:selected, .primary-toolbar .entry.error:selected:focus, .header-bar .entry.error:selected:focus { + background-color: #ffffff; + color: #FC4138; } .primary-toolbar .button, .header-bar .button { color: rgba(207, 218, 231, 0.8); 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 c987323..3a3e021 100644 --- a/common/gtk-3.0/3.14/gtk-contained-darker.css +++ b/common/gtk-3.0/3.14/gtk-contained-darker.css @@ -195,32 +195,30 @@ GtkFlowBox .grid-child { border-left-style: none; } .linked > .entry:last-child:dir(rtl) { border-left-style: solid; } - .entry.error { - color: white; - border-color: #FC4138; - background-image: linear-gradient(to bottom, #fd6760); } - .entry.error:focus { - background-image: linear-gradient(to bottom, #FC4138); - color: white; } - .entry.error:selected, .entry.error:selected:focus { - background-color: white; - color: #FC4138; } .entry.warning { - color: white; + color: #ffffff; border-color: #F27835; - background-image: linear-gradient(to bottom, #f5935d); } + background-image: linear-gradient(to bottom, #f7ae86); } .entry.warning:focus { + color: #ffffff; background-image: linear-gradient(to bottom, #F27835); - color: white; } + box-shadow: none; } .entry.warning:selected, .entry.warning:selected:focus { - background-color: white; + background-color: #ffffff; color: #F27835; } + .entry.error { + color: #ffffff; + border-color: #FC4138; + background-image: linear-gradient(to bottom, #fd8d88); } + .entry.error:focus { + color: #ffffff; + background-image: linear-gradient(to bottom, #FC4138); + box-shadow: none; } + .entry.error:selected, .entry.error:selected:focus { + background-color: #ffffff; + color: #FC4138; } .entry.image { color: #7d8189; } - .entry.image:hover { - color: #5c616c; } - .entry.image:active { - color: #5294E2; } .linked.vertical > .entry { border-bottom-color: #f4f5f6; box-shadow: none; } @@ -1053,6 +1051,26 @@ GtkComboBox { border-color: #5294E2; background-image: none; background-color: transparent; } + .primary-toolbar .entry.warning, .header-bar .entry.warning { + color: #ffffff; + border-color: rgba(21, 23, 28, 0.37); + background-image: linear-gradient(to bottom, rgba(167, 94, 57, 0.988)); } + .primary-toolbar .entry.warning:focus, .header-bar .entry.warning:focus { + color: #ffffff; + background-image: linear-gradient(to bottom, #F27835); } + .primary-toolbar .entry.warning:selected, .header-bar .entry.warning:selected, .primary-toolbar .entry.warning:selected:focus, .header-bar .entry.warning:selected:focus { + background-color: #ffffff; + color: #F27835; } + .primary-toolbar .entry.error, .header-bar .entry.error { + color: #ffffff; + border-color: rgba(21, 23, 28, 0.37); + background-image: linear-gradient(to bottom, rgba(173, 60, 59, 0.988)); } + .primary-toolbar .entry.error:focus, .header-bar .entry.error:focus { + color: #ffffff; + background-image: linear-gradient(to bottom, #FC4138); } + .primary-toolbar .entry.error:selected, .header-bar .entry.error:selected, .primary-toolbar .entry.error:selected:focus, .header-bar .entry.error:selected:focus { + background-color: #ffffff; + color: #FC4138; } .primary-toolbar .button, .header-bar .button { color: rgba(207, 218, 231, 0.8); 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 61b1a23..fab80df 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 @@ -196,32 +196,30 @@ GtkFlowBox .grid-child { border-left-style: none; } .linked > .entry:last-child:dir(rtl) { border-left-style: solid; } - .entry.error { - color: white; - border-color: #FC4138; - background-image: linear-gradient(to bottom, #d6423d); } - .entry.error:focus { - background-image: linear-gradient(to bottom, #FC4138); - color: white; } - .entry.error:selected, .entry.error:selected:focus { - background-color: white; - color: #FC4138; } .entry.warning { - color: white; - border-color: #F27835; - background-image: linear-gradient(to bottom, #ce6e3b); } + color: #ffffff; + border-color: #2b2e39; + background-image: linear-gradient(to bottom, #ab6441); } .entry.warning:focus { + color: #ffffff; background-image: linear-gradient(to bottom, #F27835); - color: white; } + box-shadow: none; } .entry.warning:selected, .entry.warning:selected:focus { - background-color: white; + background-color: #ffffff; color: #F27835; } + .entry.error { + color: #ffffff; + border-color: #2b2e39; + background-image: linear-gradient(to bottom, #b14342); } + .entry.error:focus { + color: #ffffff; + background-image: linear-gradient(to bottom, #FC4138); + box-shadow: none; } + .entry.error:selected, .entry.error:selected:focus { + background-color: #ffffff; + color: #FC4138; } .entry.image { color: #b6bcc6; } - .entry.image:hover { - color: #D3DAE3; } - .entry.image:active { - color: #5294E2; } .linked.vertical > .entry { border-bottom-color: #3a3e4a; box-shadow: none; } @@ -1050,6 +1048,26 @@ GtkComboBox { border-color: #5294E2; background-image: none; background-color: transparent; } + .primary-toolbar .entry.warning, .header-bar .entry.warning { + color: #ffffff; + border-color: rgba(21, 23, 28, 0.4); + background-image: linear-gradient(to bottom, #a45d39); } + .primary-toolbar .entry.warning:focus, .header-bar .entry.warning:focus { + color: #ffffff; + background-image: linear-gradient(to bottom, #F27835); } + .primary-toolbar .entry.warning:selected, .header-bar .entry.warning:selected, .primary-toolbar .entry.warning:selected:focus, .header-bar .entry.warning:selected:focus { + background-color: #ffffff; + color: #F27835; } + .primary-toolbar .entry.error, .header-bar .entry.error { + color: #ffffff; + border-color: rgba(21, 23, 28, 0.4); + background-image: linear-gradient(to bottom, #aa3c3b); } + .primary-toolbar .entry.error:focus, .header-bar .entry.error:focus { + color: #ffffff; + background-image: linear-gradient(to bottom, #FC4138); } + .primary-toolbar .entry.error:selected, .header-bar .entry.error:selected, .primary-toolbar .entry.error:selected:focus, .header-bar .entry.error:selected:focus { + background-color: #ffffff; + color: #FC4138; } .primary-toolbar .button, .header-bar .button { color: rgba(207, 218, 231, 0.8); 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 1a61ad6..78e00a4 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 @@ -195,32 +195,30 @@ GtkFlowBox .grid-child { border-left-style: none; } .linked > .entry:last-child:dir(rtl) { border-left-style: solid; } - .entry.error { - color: white; - border-color: #FC4138; - background-image: linear-gradient(to bottom, #fd6760); } - .entry.error:focus { - background-image: linear-gradient(to bottom, #FC4138); - color: white; } - .entry.error:selected, .entry.error:selected:focus { - background-color: white; - color: #FC4138; } .entry.warning { - color: white; + color: #ffffff; border-color: #F27835; - background-image: linear-gradient(to bottom, #f5935d); } + background-image: linear-gradient(to bottom, #f7ae86); } .entry.warning:focus { + color: #ffffff; background-image: linear-gradient(to bottom, #F27835); - color: white; } + box-shadow: none; } .entry.warning:selected, .entry.warning:selected:focus { - background-color: white; + background-color: #ffffff; color: #F27835; } + .entry.error { + color: #ffffff; + border-color: #FC4138; + background-image: linear-gradient(to bottom, #fd8d88); } + .entry.error:focus { + color: #ffffff; + background-image: linear-gradient(to bottom, #FC4138); + box-shadow: none; } + .entry.error:selected, .entry.error:selected:focus { + background-color: #ffffff; + color: #FC4138; } .entry.image { color: #7d8189; } - .entry.image:hover { - color: #5c616c; } - .entry.image:active { - color: #5294E2; } .linked.vertical > .entry { border-bottom-color: #f4f5f6; box-shadow: none; } @@ -1053,6 +1051,26 @@ GtkComboBox { border-color: #5294E2; background-image: none; background-color: transparent; } + .primary-toolbar .entry.warning, .header-bar .entry.warning { + color: #ffffff; + border-color: rgba(21, 23, 28, 0.4); + background-image: linear-gradient(to bottom, #a45d39); } + .primary-toolbar .entry.warning:focus, .header-bar .entry.warning:focus { + color: #ffffff; + background-image: linear-gradient(to bottom, #F27835); } + .primary-toolbar .entry.warning:selected, .header-bar .entry.warning:selected, .primary-toolbar .entry.warning:selected:focus, .header-bar .entry.warning:selected:focus { + background-color: #ffffff; + color: #F27835; } + .primary-toolbar .entry.error, .header-bar .entry.error { + color: #ffffff; + border-color: rgba(21, 23, 28, 0.4); + background-image: linear-gradient(to bottom, #aa3c3b); } + .primary-toolbar .entry.error:focus, .header-bar .entry.error:focus { + color: #ffffff; + background-image: linear-gradient(to bottom, #FC4138); } + .primary-toolbar .entry.error:selected, .header-bar .entry.error:selected, .primary-toolbar .entry.error:selected:focus, .header-bar .entry.error:selected:focus { + background-color: #ffffff; + color: #FC4138; } .primary-toolbar .button, .header-bar .button { color: rgba(207, 218, 231, 0.8); 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 e57fad9..530b830 100644 --- a/common/gtk-3.0/3.14/gtk-contained-solid.css +++ b/common/gtk-3.0/3.14/gtk-contained-solid.css @@ -195,32 +195,30 @@ GtkFlowBox .grid-child { border-left-style: none; } .linked > .entry:last-child:dir(rtl) { border-left-style: solid; } - .entry.error { - color: white; - border-color: #FC4138; - background-image: linear-gradient(to bottom, #fd6760); } - .entry.error:focus { - background-image: linear-gradient(to bottom, #FC4138); - color: white; } - .entry.error:selected, .entry.error:selected:focus { - background-color: white; - color: #FC4138; } .entry.warning { - color: white; + color: #ffffff; border-color: #F27835; - background-image: linear-gradient(to bottom, #f5935d); } + background-image: linear-gradient(to bottom, #f7ae86); } .entry.warning:focus { + color: #ffffff; background-image: linear-gradient(to bottom, #F27835); - color: white; } + box-shadow: none; } .entry.warning:selected, .entry.warning:selected:focus { - background-color: white; + background-color: #ffffff; color: #F27835; } + .entry.error { + color: #ffffff; + border-color: #FC4138; + background-image: linear-gradient(to bottom, #fd8d88); } + .entry.error:focus { + color: #ffffff; + background-image: linear-gradient(to bottom, #FC4138); + box-shadow: none; } + .entry.error:selected, .entry.error:selected:focus { + background-color: #ffffff; + color: #FC4138; } .entry.image { color: #7d8189; } - .entry.image:hover { - color: #5c616c; } - .entry.image:active { - color: #5294E2; } .linked.vertical > .entry { border-bottom-color: #f4f5f6; box-shadow: none; } @@ -1053,6 +1051,26 @@ GtkComboBox { border-color: #5294E2; background-image: none; background-color: transparent; } + .primary-toolbar .entry.warning, .header-bar .entry.warning { + color: #ffffff; + border-color: #F27835; + background-image: linear-gradient(to bottom, #eea57e); } + .primary-toolbar .entry.warning:focus, .header-bar .entry.warning:focus { + color: #ffffff; + background-image: linear-gradient(to bottom, #F27835); } + .primary-toolbar .entry.warning:selected, .header-bar .entry.warning:selected, .primary-toolbar .entry.warning:selected:focus, .header-bar .entry.warning:selected:focus { + background-color: #ffffff; + color: #F27835; } + .primary-toolbar .entry.error, .header-bar .entry.error { + color: #ffffff; + border-color: #FC4138; + background-image: linear-gradient(to bottom, #f48480); } + .primary-toolbar .entry.error:focus, .header-bar .entry.error:focus { + color: #ffffff; + background-image: linear-gradient(to bottom, #FC4138); } + .primary-toolbar .entry.error:selected, .header-bar .entry.error:selected, .primary-toolbar .entry.error:selected:focus, .header-bar .entry.error:selected:focus { + background-color: #ffffff; + color: #FC4138; } .primary-toolbar .button, .header-bar .button { color: rgba(82, 93, 118, 0.8); diff --git a/common/gtk-3.0/3.14/gtk-contained.css b/common/gtk-3.0/3.14/gtk-contained.css index 14206f1..a29cd7c 100644 --- a/common/gtk-3.0/3.14/gtk-contained.css +++ b/common/gtk-3.0/3.14/gtk-contained.css @@ -195,32 +195,30 @@ GtkFlowBox .grid-child { border-left-style: none; } .linked > .entry:last-child:dir(rtl) { border-left-style: solid; } - .entry.error { - color: white; - border-color: #FC4138; - background-image: linear-gradient(to bottom, #fd6760); } - .entry.error:focus { - background-image: linear-gradient(to bottom, #FC4138); - color: white; } - .entry.error:selected, .entry.error:selected:focus { - background-color: white; - color: #FC4138; } .entry.warning { - color: white; + color: #ffffff; border-color: #F27835; - background-image: linear-gradient(to bottom, #f5935d); } + background-image: linear-gradient(to bottom, #f7ae86); } .entry.warning:focus { + color: #ffffff; background-image: linear-gradient(to bottom, #F27835); - color: white; } + box-shadow: none; } .entry.warning:selected, .entry.warning:selected:focus { - background-color: white; + background-color: #ffffff; color: #F27835; } + .entry.error { + color: #ffffff; + border-color: #FC4138; + background-image: linear-gradient(to bottom, #fd8d88); } + .entry.error:focus { + color: #ffffff; + background-image: linear-gradient(to bottom, #FC4138); + box-shadow: none; } + .entry.error:selected, .entry.error:selected:focus { + background-color: #ffffff; + color: #FC4138; } .entry.image { color: #7d8189; } - .entry.image:hover { - color: #5c616c; } - .entry.image:active { - color: #5294E2; } .linked.vertical > .entry { border-bottom-color: #f4f5f6; box-shadow: none; } @@ -1053,6 +1051,26 @@ GtkComboBox { border-color: #5294E2; background-image: none; background-color: transparent; } + .primary-toolbar .entry.warning, .header-bar .entry.warning { + color: #ffffff; + border-color: #F27835; + background-image: linear-gradient(to bottom, rgba(238, 162, 121, 0.98)); } + .primary-toolbar .entry.warning:focus, .header-bar .entry.warning:focus { + color: #ffffff; + background-image: linear-gradient(to bottom, #F27835); } + .primary-toolbar .entry.warning:selected, .header-bar .entry.warning:selected, .primary-toolbar .entry.warning:selected:focus, .header-bar .entry.warning:selected:focus { + background-color: #ffffff; + color: #F27835; } + .primary-toolbar .entry.error, .header-bar .entry.error { + color: #ffffff; + border-color: #FC4138; + background-image: linear-gradient(to bottom, rgba(244, 128, 123, 0.98)); } + .primary-toolbar .entry.error:focus, .header-bar .entry.error:focus { + color: #ffffff; + background-image: linear-gradient(to bottom, #FC4138); } + .primary-toolbar .entry.error:selected, .header-bar .entry.error:selected, .primary-toolbar .entry.error:selected:focus, .header-bar .entry.error:selected:focus { + background-color: #ffffff; + color: #FC4138; } .primary-toolbar .button, .header-bar .button { color: rgba(82, 93, 118, 0.8); diff --git a/common/gtk-3.0/3.14/sass/_common.scss b/common/gtk-3.0/3.14/sass/_common.scss index cbf1fdd..808502a 100644 --- a/common/gtk-3.0/3.14/sass/_common.scss +++ b/common/gtk-3.0/3.14/sass/_common.scss @@ -270,38 +270,27 @@ GtkFlowBox .grid-child { } } - &.error { - color: white; - border-color: $error_color; - background-image: linear-gradient(to bottom, mix($error_color, $base_color, 80%)); - &:focus { - background-image: linear-gradient(to bottom, $error_color); - color: white; - } - &:selected, &:selected:focus { - background-color: white; - color: $error_color; - } - } + @each $e_type, $e_color in (warning, $warning_color), + (error, $error_color) { + &.#{$e_type} { + color: $selected_fg_color; + border-color: if($variant=='light', $e_color, $entry_border); + background-image: linear-gradient(to bottom, mix($e_color, $base_color, 60%)); - &.warning { - color: white; - border-color: $warning_color; - background-image: linear-gradient(to bottom, mix($warning_color, $base_color, 80%)); - &:focus { - background-image: linear-gradient(to bottom, $warning_color); - color: white; - } - &:selected, &:selected:focus { - background-color: white; - color: $warning_color; + &:focus { + color: $selected_fg_color; + background-image: linear-gradient(to bottom, $e_color); + box-shadow: none; + } + &:selected, &:selected:focus { + background-color: $selected_fg_color; + color: $e_color; + } } } &.image { // entry icons colors color: mix($fg_color,$base_color,80%); - &:hover { color: $fg_color; } - &:active { color: $selected_bg_color; } } .linked.vertical > & { //FIXME comment stuff and make the whole thing smarter. @@ -1216,6 +1205,24 @@ GtkComboBox { background-image: none; background-color: transparent; } + + @each $e_type, $e_color in (warning, $warning_color), + (error, $error_color) { + &.#{$e_type} { + color: $selected_fg_color; + border-color: if($darker=='false' and $variant=='light', $e_color, $header_entry_border); + background-image: linear-gradient(to bottom, mix($e_color, $header_bg, 60%)); + + &:focus { + color: $selected_fg_color; + background-image: linear-gradient(to bottom, $e_color); + } + &:selected, &:selected:focus { + background-color: $selected_fg_color; + color: $e_color; + } + } + } } // Header-bar Buttons 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 97a18fa..133a9be 100644 --- a/common/gtk-3.0/3.16/gtk-contained-dark.css +++ b/common/gtk-3.0/3.16/gtk-contained-dark.css @@ -196,32 +196,30 @@ GtkTextView { border-left-style: none; } .linked > .entry:last-child:dir(rtl) { border-left-style: solid; } - .entry.error { - color: white; - border-color: #FC4138; - background-image: linear-gradient(to bottom, #d6423d); } - .entry.error:focus { - background-image: linear-gradient(to bottom, #FC4138); - color: white; } - .entry.error:selected, .entry.error:selected:focus { - background-color: white; - color: #FC4138; } .entry.warning { - color: white; - border-color: #F27835; - background-image: linear-gradient(to bottom, #ce6e3b); } + color: #ffffff; + border-color: #2b2e39; + background-image: linear-gradient(to bottom, #ab6441); } .entry.warning:focus { + color: #ffffff; background-image: linear-gradient(to bottom, #F27835); - color: white; } + box-shadow: none; } .entry.warning:selected, .entry.warning:selected:focus { - background-color: white; + background-color: #ffffff; color: #F27835; } + .entry.error { + color: #ffffff; + border-color: #2b2e39; + background-image: linear-gradient(to bottom, #b14342); } + .entry.error:focus { + color: #ffffff; + background-image: linear-gradient(to bottom, #FC4138); + box-shadow: none; } + .entry.error:selected, .entry.error:selected:focus { + background-color: #ffffff; + color: #FC4138; } .entry.image { color: #b6bcc6; } - .entry.image:hover { - color: #D3DAE3; } - .entry.image:active { - color: #5294E2; } .linked.vertical > .entry { border-bottom-color: #3a3e4a; box-shadow: none; } @@ -1057,6 +1055,26 @@ GtkComboBox { border-color: #5294E2; background-image: none; background-color: transparent; } + .primary-toolbar .entry.warning, .header-bar .entry.warning { + color: #ffffff; + border-color: rgba(21, 23, 28, 0.37); + background-image: linear-gradient(to bottom, rgba(167, 94, 57, 0.988)); } + .primary-toolbar .entry.warning:focus, .header-bar .entry.warning:focus { + color: #ffffff; + background-image: linear-gradient(to bottom, #F27835); } + .primary-toolbar .entry.warning:selected, .header-bar .entry.warning:selected, .primary-toolbar .entry.warning:selected:focus, .header-bar .entry.warning:selected:focus { + background-color: #ffffff; + color: #F27835; } + .primary-toolbar .entry.error, .header-bar .entry.error { + color: #ffffff; + border-color: rgba(21, 23, 28, 0.37); + background-image: linear-gradient(to bottom, rgba(173, 60, 59, 0.988)); } + .primary-toolbar .entry.error:focus, .header-bar .entry.error:focus { + color: #ffffff; + background-image: linear-gradient(to bottom, #FC4138); } + .primary-toolbar .entry.error:selected, .header-bar .entry.error:selected, .primary-toolbar .entry.error:selected:focus, .header-bar .entry.error:selected:focus { + background-color: #ffffff; + color: #FC4138; } .primary-toolbar .button, .header-bar .button { color: rgba(207, 218, 231, 0.8); 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 306b6ba..b3f5b83 100644 --- a/common/gtk-3.0/3.16/gtk-contained-darker.css +++ b/common/gtk-3.0/3.16/gtk-contained-darker.css @@ -195,32 +195,30 @@ GtkTextView { border-left-style: none; } .linked > .entry:last-child:dir(rtl) { border-left-style: solid; } - .entry.error { - color: white; - border-color: #FC4138; - background-image: linear-gradient(to bottom, #fd6760); } - .entry.error:focus { - background-image: linear-gradient(to bottom, #FC4138); - color: white; } - .entry.error:selected, .entry.error:selected:focus { - background-color: white; - color: #FC4138; } .entry.warning { - color: white; + color: #ffffff; border-color: #F27835; - background-image: linear-gradient(to bottom, #f5935d); } + background-image: linear-gradient(to bottom, #f7ae86); } .entry.warning:focus { + color: #ffffff; background-image: linear-gradient(to bottom, #F27835); - color: white; } + box-shadow: none; } .entry.warning:selected, .entry.warning:selected:focus { - background-color: white; + background-color: #ffffff; color: #F27835; } + .entry.error { + color: #ffffff; + border-color: #FC4138; + background-image: linear-gradient(to bottom, #fd8d88); } + .entry.error:focus { + color: #ffffff; + background-image: linear-gradient(to bottom, #FC4138); + box-shadow: none; } + .entry.error:selected, .entry.error:selected:focus { + background-color: #ffffff; + color: #FC4138; } .entry.image { color: #7d8189; } - .entry.image:hover { - color: #5c616c; } - .entry.image:active { - color: #5294E2; } .linked.vertical > .entry { border-bottom-color: #f4f5f6; box-shadow: none; } @@ -1060,6 +1058,26 @@ GtkComboBox { border-color: #5294E2; background-image: none; background-color: transparent; } + .primary-toolbar .entry.warning, .header-bar .entry.warning { + color: #ffffff; + border-color: rgba(21, 23, 28, 0.37); + background-image: linear-gradient(to bottom, rgba(167, 94, 57, 0.988)); } + .primary-toolbar .entry.warning:focus, .header-bar .entry.warning:focus { + color: #ffffff; + background-image: linear-gradient(to bottom, #F27835); } + .primary-toolbar .entry.warning:selected, .header-bar .entry.warning:selected, .primary-toolbar .entry.warning:selected:focus, .header-bar .entry.warning:selected:focus { + background-color: #ffffff; + color: #F27835; } + .primary-toolbar .entry.error, .header-bar .entry.error { + color: #ffffff; + border-color: rgba(21, 23, 28, 0.37); + background-image: linear-gradient(to bottom, rgba(173, 60, 59, 0.988)); } + .primary-toolbar .entry.error:focus, .header-bar .entry.error:focus { + color: #ffffff; + background-image: linear-gradient(to bottom, #FC4138); } + .primary-toolbar .entry.error:selected, .header-bar .entry.error:selected, .primary-toolbar .entry.error:selected:focus, .header-bar .entry.error:selected:focus { + background-color: #ffffff; + color: #FC4138; } .primary-toolbar .button, .header-bar .button { color: rgba(207, 218, 231, 0.8); 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 1284db6..d0c7802 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 @@ -196,32 +196,30 @@ GtkTextView { border-left-style: none; } .linked > .entry:last-child:dir(rtl) { border-left-style: solid; } - .entry.error { - color: white; - border-color: #FC4138; - background-image: linear-gradient(to bottom, #d6423d); } - .entry.error:focus { - background-image: linear-gradient(to bottom, #FC4138); - color: white; } - .entry.error:selected, .entry.error:selected:focus { - background-color: white; - color: #FC4138; } .entry.warning { - color: white; - border-color: #F27835; - background-image: linear-gradient(to bottom, #ce6e3b); } + color: #ffffff; + border-color: #2b2e39; + background-image: linear-gradient(to bottom, #ab6441); } .entry.warning:focus { + color: #ffffff; background-image: linear-gradient(to bottom, #F27835); - color: white; } + box-shadow: none; } .entry.warning:selected, .entry.warning:selected:focus { - background-color: white; + background-color: #ffffff; color: #F27835; } + .entry.error { + color: #ffffff; + border-color: #2b2e39; + background-image: linear-gradient(to bottom, #b14342); } + .entry.error:focus { + color: #ffffff; + background-image: linear-gradient(to bottom, #FC4138); + box-shadow: none; } + .entry.error:selected, .entry.error:selected:focus { + background-color: #ffffff; + color: #FC4138; } .entry.image { color: #b6bcc6; } - .entry.image:hover { - color: #D3DAE3; } - .entry.image:active { - color: #5294E2; } .linked.vertical > .entry { border-bottom-color: #3a3e4a; box-shadow: none; } @@ -1057,6 +1055,26 @@ GtkComboBox { border-color: #5294E2; background-image: none; background-color: transparent; } + .primary-toolbar .entry.warning, .header-bar .entry.warning { + color: #ffffff; + border-color: rgba(21, 23, 28, 0.4); + background-image: linear-gradient(to bottom, #a45d39); } + .primary-toolbar .entry.warning:focus, .header-bar .entry.warning:focus { + color: #ffffff; + background-image: linear-gradient(to bottom, #F27835); } + .primary-toolbar .entry.warning:selected, .header-bar .entry.warning:selected, .primary-toolbar .entry.warning:selected:focus, .header-bar .entry.warning:selected:focus { + background-color: #ffffff; + color: #F27835; } + .primary-toolbar .entry.error, .header-bar .entry.error { + color: #ffffff; + border-color: rgba(21, 23, 28, 0.4); + background-image: linear-gradient(to bottom, #aa3c3b); } + .primary-toolbar .entry.error:focus, .header-bar .entry.error:focus { + color: #ffffff; + background-image: linear-gradient(to bottom, #FC4138); } + .primary-toolbar .entry.error:selected, .header-bar .entry.error:selected, .primary-toolbar .entry.error:selected:focus, .header-bar .entry.error:selected:focus { + background-color: #ffffff; + color: #FC4138; } .primary-toolbar .button, .header-bar .button { color: rgba(207, 218, 231, 0.8); 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 5fc94d4..e12335c 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 @@ -195,32 +195,30 @@ GtkTextView { border-left-style: none; } .linked > .entry:last-child:dir(rtl) { border-left-style: solid; } - .entry.error { - color: white; - border-color: #FC4138; - background-image: linear-gradient(to bottom, #fd6760); } - .entry.error:focus { - background-image: linear-gradient(to bottom, #FC4138); - color: white; } - .entry.error:selected, .entry.error:selected:focus { - background-color: white; - color: #FC4138; } .entry.warning { - color: white; + color: #ffffff; border-color: #F27835; - background-image: linear-gradient(to bottom, #f5935d); } + background-image: linear-gradient(to bottom, #f7ae86); } .entry.warning:focus { + color: #ffffff; background-image: linear-gradient(to bottom, #F27835); - color: white; } + box-shadow: none; } .entry.warning:selected, .entry.warning:selected:focus { - background-color: white; + background-color: #ffffff; color: #F27835; } + .entry.error { + color: #ffffff; + border-color: #FC4138; + background-image: linear-gradient(to bottom, #fd8d88); } + .entry.error:focus { + color: #ffffff; + background-image: linear-gradient(to bottom, #FC4138); + box-shadow: none; } + .entry.error:selected, .entry.error:selected:focus { + background-color: #ffffff; + color: #FC4138; } .entry.image { color: #7d8189; } - .entry.image:hover { - color: #5c616c; } - .entry.image:active { - color: #5294E2; } .linked.vertical > .entry { border-bottom-color: #f4f5f6; box-shadow: none; } @@ -1060,6 +1058,26 @@ GtkComboBox { border-color: #5294E2; background-image: none; background-color: transparent; } + .primary-toolbar .entry.warning, .header-bar .entry.warning { + color: #ffffff; + border-color: rgba(21, 23, 28, 0.4); + background-image: linear-gradient(to bottom, #a45d39); } + .primary-toolbar .entry.warning:focus, .header-bar .entry.warning:focus { + color: #ffffff; + background-image: linear-gradient(to bottom, #F27835); } + .primary-toolbar .entry.warning:selected, .header-bar .entry.warning:selected, .primary-toolbar .entry.warning:selected:focus, .header-bar .entry.warning:selected:focus { + background-color: #ffffff; + color: #F27835; } + .primary-toolbar .entry.error, .header-bar .entry.error { + color: #ffffff; + border-color: rgba(21, 23, 28, 0.4); + background-image: linear-gradient(to bottom, #aa3c3b); } + .primary-toolbar .entry.error:focus, .header-bar .entry.error:focus { + color: #ffffff; + background-image: linear-gradient(to bottom, #FC4138); } + .primary-toolbar .entry.error:selected, .header-bar .entry.error:selected, .primary-toolbar .entry.error:selected:focus, .header-bar .entry.error:selected:focus { + background-color: #ffffff; + color: #FC4138; } .primary-toolbar .button, .header-bar .button { color: rgba(207, 218, 231, 0.8); 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 1b44d4b..0f0a74e 100644 --- a/common/gtk-3.0/3.16/gtk-contained-solid.css +++ b/common/gtk-3.0/3.16/gtk-contained-solid.css @@ -195,32 +195,30 @@ GtkTextView { border-left-style: none; } .linked > .entry:last-child:dir(rtl) { border-left-style: solid; } - .entry.error { - color: white; - border-color: #FC4138; - background-image: linear-gradient(to bottom, #fd6760); } - .entry.error:focus { - background-image: linear-gradient(to bottom, #FC4138); - color: white; } - .entry.error:selected, .entry.error:selected:focus { - background-color: white; - color: #FC4138; } .entry.warning { - color: white; + color: #ffffff; border-color: #F27835; - background-image: linear-gradient(to bottom, #f5935d); } + background-image: linear-gradient(to bottom, #f7ae86); } .entry.warning:focus { + color: #ffffff; background-image: linear-gradient(to bottom, #F27835); - color: white; } + box-shadow: none; } .entry.warning:selected, .entry.warning:selected:focus { - background-color: white; + background-color: #ffffff; color: #F27835; } + .entry.error { + color: #ffffff; + border-color: #FC4138; + background-image: linear-gradient(to bottom, #fd8d88); } + .entry.error:focus { + color: #ffffff; + background-image: linear-gradient(to bottom, #FC4138); + box-shadow: none; } + .entry.error:selected, .entry.error:selected:focus { + background-color: #ffffff; + color: #FC4138; } .entry.image { color: #7d8189; } - .entry.image:hover { - color: #5c616c; } - .entry.image:active { - color: #5294E2; } .linked.vertical > .entry { border-bottom-color: #f4f5f6; box-shadow: none; } @@ -1060,6 +1058,26 @@ GtkComboBox { border-color: #5294E2; background-image: none; background-color: transparent; } + .primary-toolbar .entry.warning, .header-bar .entry.warning { + color: #ffffff; + border-color: #F27835; + background-image: linear-gradient(to bottom, #eea57e); } + .primary-toolbar .entry.warning:focus, .header-bar .entry.warning:focus { + color: #ffffff; + background-image: linear-gradient(to bottom, #F27835); } + .primary-toolbar .entry.warning:selected, .header-bar .entry.warning:selected, .primary-toolbar .entry.warning:selected:focus, .header-bar .entry.warning:selected:focus { + background-color: #ffffff; + color: #F27835; } + .primary-toolbar .entry.error, .header-bar .entry.error { + color: #ffffff; + border-color: #FC4138; + background-image: linear-gradient(to bottom, #f48480); } + .primary-toolbar .entry.error:focus, .header-bar .entry.error:focus { + color: #ffffff; + background-image: linear-gradient(to bottom, #FC4138); } + .primary-toolbar .entry.error:selected, .header-bar .entry.error:selected, .primary-toolbar .entry.error:selected:focus, .header-bar .entry.error:selected:focus { + background-color: #ffffff; + color: #FC4138; } .primary-toolbar .button, .header-bar .button { color: rgba(82, 93, 118, 0.8); diff --git a/common/gtk-3.0/3.16/gtk-contained.css b/common/gtk-3.0/3.16/gtk-contained.css index 5be879f..8bd1c54 100644 --- a/common/gtk-3.0/3.16/gtk-contained.css +++ b/common/gtk-3.0/3.16/gtk-contained.css @@ -195,32 +195,30 @@ GtkTextView { border-left-style: none; } .linked > .entry:last-child:dir(rtl) { border-left-style: solid; } - .entry.error { - color: white; - border-color: #FC4138; - background-image: linear-gradient(to bottom, #fd6760); } - .entry.error:focus { - background-image: linear-gradient(to bottom, #FC4138); - color: white; } - .entry.error:selected, .entry.error:selected:focus { - background-color: white; - color: #FC4138; } .entry.warning { - color: white; + color: #ffffff; border-color: #F27835; - background-image: linear-gradient(to bottom, #f5935d); } + background-image: linear-gradient(to bottom, #f7ae86); } .entry.warning:focus { + color: #ffffff; background-image: linear-gradient(to bottom, #F27835); - color: white; } + box-shadow: none; } .entry.warning:selected, .entry.warning:selected:focus { - background-color: white; + background-color: #ffffff; color: #F27835; } + .entry.error { + color: #ffffff; + border-color: #FC4138; + background-image: linear-gradient(to bottom, #fd8d88); } + .entry.error:focus { + color: #ffffff; + background-image: linear-gradient(to bottom, #FC4138); + box-shadow: none; } + .entry.error:selected, .entry.error:selected:focus { + background-color: #ffffff; + color: #FC4138; } .entry.image { color: #7d8189; } - .entry.image:hover { - color: #5c616c; } - .entry.image:active { - color: #5294E2; } .linked.vertical > .entry { border-bottom-color: #f4f5f6; box-shadow: none; } @@ -1060,6 +1058,26 @@ GtkComboBox { border-color: #5294E2; background-image: none; background-color: transparent; } + .primary-toolbar .entry.warning, .header-bar .entry.warning { + color: #ffffff; + border-color: #F27835; + background-image: linear-gradient(to bottom, rgba(238, 162, 121, 0.98)); } + .primary-toolbar .entry.warning:focus, .header-bar .entry.warning:focus { + color: #ffffff; + background-image: linear-gradient(to bottom, #F27835); } + .primary-toolbar .entry.warning:selected, .header-bar .entry.warning:selected, .primary-toolbar .entry.warning:selected:focus, .header-bar .entry.warning:selected:focus { + background-color: #ffffff; + color: #F27835; } + .primary-toolbar .entry.error, .header-bar .entry.error { + color: #ffffff; + border-color: #FC4138; + background-image: linear-gradient(to bottom, rgba(244, 128, 123, 0.98)); } + .primary-toolbar .entry.error:focus, .header-bar .entry.error:focus { + color: #ffffff; + background-image: linear-gradient(to bottom, #FC4138); } + .primary-toolbar .entry.error:selected, .header-bar .entry.error:selected, .primary-toolbar .entry.error:selected:focus, .header-bar .entry.error:selected:focus { + background-color: #ffffff; + color: #FC4138; } .primary-toolbar .button, .header-bar .button { color: rgba(82, 93, 118, 0.8); diff --git a/common/gtk-3.0/3.16/sass/_common.scss b/common/gtk-3.0/3.16/sass/_common.scss index 90c6063..0728848 100644 --- a/common/gtk-3.0/3.16/sass/_common.scss +++ b/common/gtk-3.0/3.16/sass/_common.scss @@ -270,38 +270,27 @@ GtkTextView { // This will get overridden by .view, needed by gedit line numbers } } - &.error { - color: white; - border-color: $error_color; - background-image: linear-gradient(to bottom, mix($error_color, $base_color, 80%)); - &:focus { - background-image: linear-gradient(to bottom, $error_color); - color: white; - } - &:selected, &:selected:focus { - background-color: white; - color: $error_color; - } - } + @each $e_type, $e_color in (warning, $warning_color), + (error, $error_color) { + &.#{$e_type} { + color: $selected_fg_color; + border-color: if($variant=='light', $e_color, $entry_border); + background-image: linear-gradient(to bottom, mix($e_color, $base_color, 60%)); - &.warning { - color: white; - border-color: $warning_color; - background-image: linear-gradient(to bottom, mix($warning_color, $base_color, 80%)); - &:focus { - background-image: linear-gradient(to bottom, $warning_color); - color: white; - } - &:selected, &:selected:focus { - background-color: white; - color: $warning_color; + &:focus { + color: $selected_fg_color; + background-image: linear-gradient(to bottom, $e_color); + box-shadow: none; + } + &:selected, &:selected:focus { + background-color: $selected_fg_color; + color: $e_color; + } } } &.image { // entry icons colors color: mix($fg_color,$base_color,80%); - &:hover { color: $fg_color; } - &:active { color: $selected_bg_color; } } .linked.vertical > & { //FIXME comment stuff and make the whole thing smarter. @@ -1225,6 +1214,24 @@ GtkComboBox { background-image: none; background-color: transparent; } + + @each $e_type, $e_color in (warning, $warning_color), + (error, $error_color) { + &.#{$e_type} { + color: $selected_fg_color; + border-color: if($darker=='false' and $variant=='light', $e_color, $header_entry_border); + background-image: linear-gradient(to bottom, mix($e_color, $header_bg, 60%)); + + &:focus { + color: $selected_fg_color; + background-image: linear-gradient(to bottom, $e_color); + } + &:selected, &:selected:focus { + background-color: $selected_fg_color; + color: $e_color; + } + } + } } // Header-bar Buttons diff --git a/common/gtk-3.0/3.18/gtk-contained-dark.css b/common/gtk-3.0/3.18/gtk-contained-dark.css index 1c1d2c6..6b9ad62 100644 --- a/common/gtk-3.0/3.18/gtk-contained-dark.css +++ b/common/gtk-3.0/3.18/gtk-contained-dark.css @@ -184,32 +184,30 @@ GtkTextView { background-image: none; background-color: transparent; box-shadow: none; } - .entry.error { - color: white; - border-color: #FC4138; - background-image: linear-gradient(to bottom, #d6423d); } - .entry.error:focus { - background-image: linear-gradient(to bottom, #FC4138); - color: white; } - .entry.error:selected, .entry.error:selected:focus { - background-color: white; - color: #FC4138; } .entry.warning { - color: white; - border-color: #F27835; - background-image: linear-gradient(to bottom, #ce6e3b); } + color: #ffffff; + border-color: #2b2e39; + background-image: linear-gradient(to bottom, #ab6441); } .entry.warning:focus { + color: #ffffff; background-image: linear-gradient(to bottom, #F27835); - color: white; } + box-shadow: none; } .entry.warning:selected, .entry.warning:selected:focus { - background-color: white; + background-color: #ffffff; color: #F27835; } + .entry.error { + color: #ffffff; + border-color: #2b2e39; + background-image: linear-gradient(to bottom, #b14342); } + .entry.error:focus { + color: #ffffff; + background-image: linear-gradient(to bottom, #FC4138); + box-shadow: none; } + .entry.error:selected, .entry.error:selected:focus { + background-color: #ffffff; + color: #FC4138; } .entry.image { color: #b6bcc6; } - .entry.image:hover { - color: #D3DAE3; } - .entry.image:active { - color: #5294E2; } .osd .entry { color: #BAC3CF; border-color: rgba(26, 28, 34, 0.35); @@ -521,10 +519,29 @@ GtkSearchEntry.entry { .linked:not(.vertical):not(.pathbar) > .entry + .entry { border-left-color: rgba(43, 46, 57, 0.3); } +.linked:not(.vertical):not(.pathbar) > .entry.error + .entry, +.linked:not(.vertical):not(.pathbar) > .entry + .entry.error { + border-left-color: rgba(43, 46, 57, 0.3); } + +.linked:not(.vertical):not(.pathbar) > .entry.warning + .entry, +.linked:not(.vertical):not(.pathbar) > .entry + .entry.warning { + border-left-color: rgba(43, 46, 57, 0.3); } + +.linked:not(.vertical):not(.pathbar) > .entry.error + .entry.warning { + border-left-color: rgba(43, 46, 57, 0.3); } + .linked:not(.vertical):not(.pathbar) > .entry + .entry:focus:not(:last-child), .linked:not(.vertical):not(.pathbar) > .entry + .entry:focus:last-child { border-left-color: #2b2e39; } +.linked:not(.vertical):not(.pathbar) > .entry + .entry.warning:focus:not(:last-child), +.linked:not(.vertical):not(.pathbar) > .entry + .entry.warning:focus:last-child { + border-left-color: #2b2e39; } + +.linked:not(.vertical):not(.pathbar) > .entry + .entry.error:focus:not(:last-child), +.linked:not(.vertical):not(.pathbar) > .entry + .entry.error:focus:last-child { + border-left-color: #2b2e39; } + .linked:not(.vertical):not(.pathbar) > .entry + .button, .linked:not(.vertical):not(.pathbar) > .entry + .button:hover, .linked:not(.vertical):not(.pathbar) > .entry + .button:active, @@ -538,6 +555,18 @@ GtkSearchEntry.entry { .linked:not(.vertical):not(.pathbar) > .entry:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox { border-left-color: #2b2e39; } +.linked:not(.vertical):not(.pathbar) > .entry.warning:focus:not(:only-child) + .entry, +.linked:not(.vertical):not(.pathbar) > .entry.warning:focus:not(:only-child) + .button, +.linked:not(.vertical):not(.pathbar) > .entry.warning:focus:not(:only-child) + GtkComboBox > .the-button-in-the-combobox, +.linked:not(.vertical):not(.pathbar) > .entry.warning:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox { + border-left-color: #2b2e39; } + +.linked:not(.vertical):not(.pathbar) > .entry.error:focus:not(:only-child) + .entry, +.linked:not(.vertical):not(.pathbar) > .entry.error:focus:not(:only-child) + .button, +.linked:not(.vertical):not(.pathbar) > .entry.error:focus:not(:only-child) + GtkComboBox > .the-button-in-the-combobox, +.linked:not(.vertical):not(.pathbar) > .entry.error:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox { + border-left-color: #2b2e39; } + .linked:not(.vertical):not(.pathbar) > .button:hover:not(:checked):not(:active):not(:only-child), .linked:not(.vertical):not(.pathbar) > .button:hover:not(:checked):not(:active) + .button:not(:checked):not(:active) { box-shadow: -1px 0 #2b2e39; } @@ -566,10 +595,29 @@ GtkSearchEntry.entry { .linked.vertical > .entry + .entry { border-top-color: rgba(43, 46, 57, 0.3); } +.linked.vertical > .entry.error + .entry, +.linked.vertical > .entry + .entry.error { + border-top-color: rgba(43, 46, 57, 0.3); } + +.linked.vertical > .entry.warning + .entry, +.linked.vertical > .entry + .entry.warning { + border-top-color: rgba(43, 46, 57, 0.3); } + +.linked.vertical > .entry.error + .entry.warning { + border-top-color: rgba(43, 46, 57, 0.3); } + .linked.vertical > .entry + .entry:focus:not(:last-child), .linked.vertical > .entry + .entry:focus:last-child { border-top-color: #2b2e39; } +.linked.vertical > .entry + .entry.warning:focus:not(:last-child), +.linked.vertical > .entry + .entry.warning:focus:last-child { + border-top-color: #2b2e39; } + +.linked.vertical > .entry + .entry.error:focus:not(:last-child), +.linked.vertical > .entry + .entry.error:focus:last-child { + border-top-color: #2b2e39; } + .linked.vertical > .entry + .button, .linked.vertical > .entry + .button:hover, .linked.vertical > .entry + .button:active, @@ -583,6 +631,18 @@ GtkSearchEntry.entry { .linked.vertical > .entry:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox { border-top-color: #2b2e39; } +.linked.vertical > .entry.warning:focus:not(:only-child) + .entry, +.linked.vertical > .entry.warning:focus:not(:only-child) + .button, +.linked.vertical > .entry.warning:focus:not(:only-child) + GtkComboBox > .the-button-in-the-combobox, +.linked.vertical > .entry.warning:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox { + border-top-color: #2b2e39; } + +.linked.vertical > .entry.error:focus:not(:only-child) + .entry, +.linked.vertical > .entry.error:focus:not(:only-child) + .button, +.linked.vertical > .entry.error:focus:not(:only-child) + GtkComboBox > .the-button-in-the-combobox, +.linked.vertical > .entry.error:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox { + border-top-color: #2b2e39; } + .linked.vertical > .button:hover:not(:checked):not(:active):not(:only-child), .linked.vertical > .button:hover:not(:checked):not(:active) + .button:not(:checked):not(:active) { box-shadow: 0 -1px #2b2e39; } @@ -1084,6 +1144,26 @@ GtkComboBox { border-color: #5294E2; background-image: none; background-color: transparent; } + .primary-toolbar .entry.warning, .header-bar .entry.warning { + color: #ffffff; + border-color: rgba(21, 23, 28, 0.37); + background-image: linear-gradient(to bottom, rgba(167, 94, 57, 0.988)); } + .primary-toolbar .entry.warning:focus, .header-bar .entry.warning:focus { + color: #ffffff; + background-image: linear-gradient(to bottom, #F27835); } + .primary-toolbar .entry.warning:selected, .header-bar .entry.warning:selected, .primary-toolbar .entry.warning:selected:focus, .header-bar .entry.warning:selected:focus { + background-color: #ffffff; + color: #F27835; } + .primary-toolbar .entry.error, .header-bar .entry.error { + color: #ffffff; + border-color: rgba(21, 23, 28, 0.37); + background-image: linear-gradient(to bottom, rgba(173, 60, 59, 0.988)); } + .primary-toolbar .entry.error:focus, .header-bar .entry.error:focus { + color: #ffffff; + background-image: linear-gradient(to bottom, #FC4138); } + .primary-toolbar .entry.error:selected, .header-bar .entry.error:selected, .primary-toolbar .entry.error:selected:focus, .header-bar .entry.error:selected:focus { + background-color: #ffffff; + color: #FC4138; } .primary-toolbar .button, .header-bar .button { color: rgba(207, 218, 231, 0.8); @@ -1179,11 +1259,34 @@ GtkComboBox { .primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry + .entry, .header-bar .linked:not(.vertical):not(.pathbar) > .entry + .entry { border-left-color: rgba(21, 23, 28, 0); } +.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry.error + .entry, +.header-bar .linked:not(.vertical):not(.pathbar) > .entry.error + .entry, +.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry + .entry.error, .header-bar .linked:not(.vertical):not(.pathbar) > .entry + .entry.error { + border-left-color: rgba(21, 23, 28, 0); } + +.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry.warning + .entry, +.header-bar .linked:not(.vertical):not(.pathbar) > .entry.warning + .entry, +.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry + .entry.warning, .header-bar .linked:not(.vertical):not(.pathbar) > .entry + .entry.warning { + border-left-color: rgba(21, 23, 28, 0); } + +.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry.error + .entry.warning, .header-bar .linked:not(.vertical):not(.pathbar) > .entry.error + .entry.warning { + border-left-color: rgba(21, 23, 28, 0); } + .primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry + .entry:focus:not(:last-child), .header-bar .linked:not(.vertical):not(.pathbar) > .entry + .entry:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry + .entry:focus:last-child, .header-bar .linked:not(.vertical):not(.pathbar) > .entry + .entry:focus:last-child { border-left-color: rgba(21, 23, 28, 0.37); } +.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry + .entry.warning:focus:not(:last-child), +.header-bar .linked:not(.vertical):not(.pathbar) > .entry + .entry.warning:focus:not(:last-child), +.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry + .entry.warning:focus:last-child, .header-bar .linked:not(.vertical):not(.pathbar) > .entry + .entry.warning:focus:last-child { + border-left-color: rgba(21, 23, 28, 0.37); } + +.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry + .entry.error:focus:not(:last-child), +.header-bar .linked:not(.vertical):not(.pathbar) > .entry + .entry.error:focus:not(:last-child), +.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry + .entry.error:focus:last-child, .header-bar .linked:not(.vertical):not(.pathbar) > .entry + .entry.error:focus:last-child { + border-left-color: rgba(21, 23, 28, 0.37); } + .primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry:focus:not(:only-child) + .entry, .header-bar .linked:not(.vertical):not(.pathbar) > .entry:focus:not(:only-child) + .entry, .primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry:focus:not(:only-child) + .button, @@ -1193,6 +1296,24 @@ GtkComboBox { .primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox, .header-bar .linked:not(.vertical):not(.pathbar) > .entry:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox { border-left-color: rgba(21, 23, 28, 0.37); } +.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry.warning:focus:not(:only-child) + .entry, +.header-bar .linked:not(.vertical):not(.pathbar) > .entry.warning:focus:not(:only-child) + .entry, +.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry.warning:focus:not(:only-child) + .button, +.header-bar .linked:not(.vertical):not(.pathbar) > .entry.warning:focus:not(:only-child) + .button, +.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry.warning:focus:not(:only-child) + GtkComboBox > .the-button-in-the-combobox, +.header-bar .linked:not(.vertical):not(.pathbar) > .entry.warning:focus:not(:only-child) + GtkComboBox > .the-button-in-the-combobox, +.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry.warning:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox, .header-bar .linked:not(.vertical):not(.pathbar) > .entry.warning:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox { + border-left-color: rgba(21, 23, 28, 0.37); } + +.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry.error:focus:not(:only-child) + .entry, +.header-bar .linked:not(.vertical):not(.pathbar) > .entry.error:focus:not(:only-child) + .entry, +.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry.error:focus:not(:only-child) + .button, +.header-bar .linked:not(.vertical):not(.pathbar) > .entry.error:focus:not(:only-child) + .button, +.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry.error:focus:not(:only-child) + GtkComboBox > .the-button-in-the-combobox, +.header-bar .linked:not(.vertical):not(.pathbar) > .entry.error:focus:not(:only-child) + GtkComboBox > .the-button-in-the-combobox, +.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry.error:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox, .header-bar .linked:not(.vertical):not(.pathbar) > .entry.error:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox { + border-left-color: rgba(21, 23, 28, 0.37); } + .primary-toolbar .button.suggested-action, .header-bar .button.suggested-action { background-clip: border-box; color: #ffffff; diff --git a/common/gtk-3.0/3.18/gtk-contained-darker.css b/common/gtk-3.0/3.18/gtk-contained-darker.css index 4724c97..da4c471 100644 --- a/common/gtk-3.0/3.18/gtk-contained-darker.css +++ b/common/gtk-3.0/3.18/gtk-contained-darker.css @@ -183,32 +183,30 @@ GtkTextView { background-image: none; background-color: transparent; box-shadow: none; } - .entry.error { - color: white; - border-color: #FC4138; - background-image: linear-gradient(to bottom, #fd6760); } - .entry.error:focus { - background-image: linear-gradient(to bottom, #FC4138); - color: white; } - .entry.error:selected, .entry.error:selected:focus { - background-color: white; - color: #FC4138; } .entry.warning { - color: white; + color: #ffffff; border-color: #F27835; - background-image: linear-gradient(to bottom, #f5935d); } + background-image: linear-gradient(to bottom, #f7ae86); } .entry.warning:focus { + color: #ffffff; background-image: linear-gradient(to bottom, #F27835); - color: white; } + box-shadow: none; } .entry.warning:selected, .entry.warning:selected:focus { - background-color: white; + background-color: #ffffff; color: #F27835; } + .entry.error { + color: #ffffff; + border-color: #FC4138; + background-image: linear-gradient(to bottom, #fd8d88); } + .entry.error:focus { + color: #ffffff; + background-image: linear-gradient(to bottom, #FC4138); + box-shadow: none; } + .entry.error:selected, .entry.error:selected:focus { + background-color: #ffffff; + color: #FC4138; } .entry.image { color: #7d8189; } - .entry.image:hover { - color: #5c616c; } - .entry.image:active { - color: #5294E2; } .osd .entry { color: #BAC3CF; border-color: rgba(26, 28, 34, 0.35); @@ -520,10 +518,29 @@ GtkSearchEntry.entry { .linked:not(.vertical):not(.pathbar) > .entry + .entry { border-left-color: rgba(207, 214, 230, 0.3); } +.linked:not(.vertical):not(.pathbar) > .entry.error + .entry, +.linked:not(.vertical):not(.pathbar) > .entry + .entry.error { + border-left-color: #FC4138; } + +.linked:not(.vertical):not(.pathbar) > .entry.warning + .entry, +.linked:not(.vertical):not(.pathbar) > .entry + .entry.warning { + border-left-color: #F27835; } + +.linked:not(.vertical):not(.pathbar) > .entry.error + .entry.warning { + border-left-color: #FC4138; } + .linked:not(.vertical):not(.pathbar) > .entry + .entry:focus:not(:last-child), .linked:not(.vertical):not(.pathbar) > .entry + .entry:focus:last-child { border-left-color: #5294E2; } +.linked:not(.vertical):not(.pathbar) > .entry + .entry.warning:focus:not(:last-child), +.linked:not(.vertical):not(.pathbar) > .entry + .entry.warning:focus:last-child { + border-left-color: #F27835; } + +.linked:not(.vertical):not(.pathbar) > .entry + .entry.error:focus:not(:last-child), +.linked:not(.vertical):not(.pathbar) > .entry + .entry.error:focus:last-child { + border-left-color: #FC4138; } + .linked:not(.vertical):not(.pathbar) > .entry + .button, .linked:not(.vertical):not(.pathbar) > .entry + .button:hover, .linked:not(.vertical):not(.pathbar) > .entry + .button:active, @@ -537,6 +554,18 @@ GtkSearchEntry.entry { .linked:not(.vertical):not(.pathbar) > .entry:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox { border-left-color: #5294E2; } +.linked:not(.vertical):not(.pathbar) > .entry.warning:focus:not(:only-child) + .entry, +.linked:not(.vertical):not(.pathbar) > .entry.warning:focus:not(:only-child) + .button, +.linked:not(.vertical):not(.pathbar) > .entry.warning:focus:not(:only-child) + GtkComboBox > .the-button-in-the-combobox, +.linked:not(.vertical):not(.pathbar) > .entry.warning:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox { + border-left-color: #F27835; } + +.linked:not(.vertical):not(.pathbar) > .entry.error:focus:not(:only-child) + .entry, +.linked:not(.vertical):not(.pathbar) > .entry.error:focus:not(:only-child) + .button, +.linked:not(.vertical):not(.pathbar) > .entry.error:focus:not(:only-child) + GtkComboBox > .the-button-in-the-combobox, +.linked:not(.vertical):not(.pathbar) > .entry.error:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox { + border-left-color: #FC4138; } + .linked:not(.vertical):not(.pathbar) > .button:hover:not(:checked):not(:active):not(:only-child), .linked:not(.vertical):not(.pathbar) > .button:hover:not(:checked):not(:active) + .button:not(:checked):not(:active) { box-shadow: -1px 0 #cfd6e6; } @@ -565,10 +594,29 @@ GtkSearchEntry.entry { .linked.vertical > .entry + .entry { border-top-color: rgba(207, 214, 230, 0.3); } +.linked.vertical > .entry.error + .entry, +.linked.vertical > .entry + .entry.error { + border-top-color: #FC4138; } + +.linked.vertical > .entry.warning + .entry, +.linked.vertical > .entry + .entry.warning { + border-top-color: #F27835; } + +.linked.vertical > .entry.error + .entry.warning { + border-top-color: #FC4138; } + .linked.vertical > .entry + .entry:focus:not(:last-child), .linked.vertical > .entry + .entry:focus:last-child { border-top-color: #5294E2; } +.linked.vertical > .entry + .entry.warning:focus:not(:last-child), +.linked.vertical > .entry + .entry.warning:focus:last-child { + border-top-color: #F27835; } + +.linked.vertical > .entry + .entry.error:focus:not(:last-child), +.linked.vertical > .entry + .entry.error:focus:last-child { + border-top-color: #FC4138; } + .linked.vertical > .entry + .button, .linked.vertical > .entry + .button:hover, .linked.vertical > .entry + .button:active, @@ -582,6 +630,18 @@ GtkSearchEntry.entry { .linked.vertical > .entry:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox { border-top-color: #5294E2; } +.linked.vertical > .entry.warning:focus:not(:only-child) + .entry, +.linked.vertical > .entry.warning:focus:not(:only-child) + .button, +.linked.vertical > .entry.warning:focus:not(:only-child) + GtkComboBox > .the-button-in-the-combobox, +.linked.vertical > .entry.warning:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox { + border-top-color: #F27835; } + +.linked.vertical > .entry.error:focus:not(:only-child) + .entry, +.linked.vertical > .entry.error:focus:not(:only-child) + .button, +.linked.vertical > .entry.error:focus:not(:only-child) + GtkComboBox > .the-button-in-the-combobox, +.linked.vertical > .entry.error:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox { + border-top-color: #FC4138; } + .linked.vertical > .button:hover:not(:checked):not(:active):not(:only-child), .linked.vertical > .button:hover:not(:checked):not(:active) + .button:not(:checked):not(:active) { box-shadow: 0 -1px #cfd6e6; } @@ -1087,6 +1147,26 @@ GtkComboBox { border-color: #5294E2; background-image: none; background-color: transparent; } + .primary-toolbar .entry.warning, .header-bar .entry.warning { + color: #ffffff; + border-color: rgba(21, 23, 28, 0.37); + background-image: linear-gradient(to bottom, rgba(167, 94, 57, 0.988)); } + .primary-toolbar .entry.warning:focus, .header-bar .entry.warning:focus { + color: #ffffff; + background-image: linear-gradient(to bottom, #F27835); } + .primary-toolbar .entry.warning:selected, .header-bar .entry.warning:selected, .primary-toolbar .entry.warning:selected:focus, .header-bar .entry.warning:selected:focus { + background-color: #ffffff; + color: #F27835; } + .primary-toolbar .entry.error, .header-bar .entry.error { + color: #ffffff; + border-color: rgba(21, 23, 28, 0.37); + background-image: linear-gradient(to bottom, rgba(173, 60, 59, 0.988)); } + .primary-toolbar .entry.error:focus, .header-bar .entry.error:focus { + color: #ffffff; + background-image: linear-gradient(to bottom, #FC4138); } + .primary-toolbar .entry.error:selected, .header-bar .entry.error:selected, .primary-toolbar .entry.error:selected:focus, .header-bar .entry.error:selected:focus { + background-color: #ffffff; + color: #FC4138; } .primary-toolbar .button, .header-bar .button { color: rgba(207, 218, 231, 0.8); @@ -1182,11 +1262,34 @@ GtkComboBox { .primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry + .entry, .header-bar .linked:not(.vertical):not(.pathbar) > .entry + .entry { border-left-color: rgba(21, 23, 28, 0); } +.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry.error + .entry, +.header-bar .linked:not(.vertical):not(.pathbar) > .entry.error + .entry, +.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry + .entry.error, .header-bar .linked:not(.vertical):not(.pathbar) > .entry + .entry.error { + border-left-color: #FC4138; } + +.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry.warning + .entry, +.header-bar .linked:not(.vertical):not(.pathbar) > .entry.warning + .entry, +.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry + .entry.warning, .header-bar .linked:not(.vertical):not(.pathbar) > .entry + .entry.warning { + border-left-color: #F27835; } + +.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry.error + .entry.warning, .header-bar .linked:not(.vertical):not(.pathbar) > .entry.error + .entry.warning { + border-left-color: #FC4138; } + .primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry + .entry:focus:not(:last-child), .header-bar .linked:not(.vertical):not(.pathbar) > .entry + .entry:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry + .entry:focus:last-child, .header-bar .linked:not(.vertical):not(.pathbar) > .entry + .entry:focus:last-child { border-left-color: rgba(21, 23, 28, 0.37); } +.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry + .entry.warning:focus:not(:last-child), +.header-bar .linked:not(.vertical):not(.pathbar) > .entry + .entry.warning:focus:not(:last-child), +.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry + .entry.warning:focus:last-child, .header-bar .linked:not(.vertical):not(.pathbar) > .entry + .entry.warning:focus:last-child { + border-left-color: #F27835; } + +.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry + .entry.error:focus:not(:last-child), +.header-bar .linked:not(.vertical):not(.pathbar) > .entry + .entry.error:focus:not(:last-child), +.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry + .entry.error:focus:last-child, .header-bar .linked:not(.vertical):not(.pathbar) > .entry + .entry.error:focus:last-child { + border-left-color: #FC4138; } + .primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry:focus:not(:only-child) + .entry, .header-bar .linked:not(.vertical):not(.pathbar) > .entry:focus:not(:only-child) + .entry, .primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry:focus:not(:only-child) + .button, @@ -1196,6 +1299,24 @@ GtkComboBox { .primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox, .header-bar .linked:not(.vertical):not(.pathbar) > .entry:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox { border-left-color: rgba(21, 23, 28, 0.37); } +.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry.warning:focus:not(:only-child) + .entry, +.header-bar .linked:not(.vertical):not(.pathbar) > .entry.warning:focus:not(:only-child) + .entry, +.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry.warning:focus:not(:only-child) + .button, +.header-bar .linked:not(.vertical):not(.pathbar) > .entry.warning:focus:not(:only-child) + .button, +.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry.warning:focus:not(:only-child) + GtkComboBox > .the-button-in-the-combobox, +.header-bar .linked:not(.vertical):not(.pathbar) > .entry.warning:focus:not(:only-child) + GtkComboBox > .the-button-in-the-combobox, +.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry.warning:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox, .header-bar .linked:not(.vertical):not(.pathbar) > .entry.warning:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox { + border-left-color: #F27835; } + +.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry.error:focus:not(:only-child) + .entry, +.header-bar .linked:not(.vertical):not(.pathbar) > .entry.error:focus:not(:only-child) + .entry, +.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry.error:focus:not(:only-child) + .button, +.header-bar .linked:not(.vertical):not(.pathbar) > .entry.error:focus:not(:only-child) + .button, +.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry.error:focus:not(:only-child) + GtkComboBox > .the-button-in-the-combobox, +.header-bar .linked:not(.vertical):not(.pathbar) > .entry.error:focus:not(:only-child) + GtkComboBox > .the-button-in-the-combobox, +.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry.error:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox, .header-bar .linked:not(.vertical):not(.pathbar) > .entry.error:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox { + border-left-color: #FC4138; } + .primary-toolbar .button.suggested-action, .header-bar .button.suggested-action { background-clip: border-box; color: #ffffff; diff --git a/common/gtk-3.0/3.18/gtk-contained-solid-dark.css b/common/gtk-3.0/3.18/gtk-contained-solid-dark.css index 2fc9204..672a825 100644 --- a/common/gtk-3.0/3.18/gtk-contained-solid-dark.css +++ b/common/gtk-3.0/3.18/gtk-contained-solid-dark.css @@ -184,32 +184,30 @@ GtkTextView { background-image: none; background-color: transparent; box-shadow: none; } - .entry.error { - color: white; - border-color: #FC4138; - background-image: linear-gradient(to bottom, #d6423d); } - .entry.error:focus { - background-image: linear-gradient(to bottom, #FC4138); - color: white; } - .entry.error:selected, .entry.error:selected:focus { - background-color: white; - color: #FC4138; } .entry.warning { - color: white; - border-color: #F27835; - background-image: linear-gradient(to bottom, #ce6e3b); } + color: #ffffff; + border-color: #2b2e39; + background-image: linear-gradient(to bottom, #ab6441); } .entry.warning:focus { + color: #ffffff; background-image: linear-gradient(to bottom, #F27835); - color: white; } + box-shadow: none; } .entry.warning:selected, .entry.warning:selected:focus { - background-color: white; + background-color: #ffffff; color: #F27835; } + .entry.error { + color: #ffffff; + border-color: #2b2e39; + background-image: linear-gradient(to bottom, #b14342); } + .entry.error:focus { + color: #ffffff; + background-image: linear-gradient(to bottom, #FC4138); + box-shadow: none; } + .entry.error:selected, .entry.error:selected:focus { + background-color: #ffffff; + color: #FC4138; } .entry.image { color: #b6bcc6; } - .entry.image:hover { - color: #D3DAE3; } - .entry.image:active { - color: #5294E2; } .osd .entry { color: #BAC3CF; border-color: rgba(26, 28, 34, 0.4); @@ -521,10 +519,29 @@ GtkSearchEntry.entry { .linked:not(.vertical):not(.pathbar) > .entry + .entry { border-left-color: rgba(43, 46, 57, 0.3); } +.linked:not(.vertical):not(.pathbar) > .entry.error + .entry, +.linked:not(.vertical):not(.pathbar) > .entry + .entry.error { + border-left-color: rgba(43, 46, 57, 0.3); } + +.linked:not(.vertical):not(.pathbar) > .entry.warning + .entry, +.linked:not(.vertical):not(.pathbar) > .entry + .entry.warning { + border-left-color: rgba(43, 46, 57, 0.3); } + +.linked:not(.vertical):not(.pathbar) > .entry.error + .entry.warning { + border-left-color: rgba(43, 46, 57, 0.3); } + .linked:not(.vertical):not(.pathbar) > .entry + .entry:focus:not(:last-child), .linked:not(.vertical):not(.pathbar) > .entry + .entry:focus:last-child { border-left-color: #2b2e39; } +.linked:not(.vertical):not(.pathbar) > .entry + .entry.warning:focus:not(:last-child), +.linked:not(.vertical):not(.pathbar) > .entry + .entry.warning:focus:last-child { + border-left-color: #2b2e39; } + +.linked:not(.vertical):not(.pathbar) > .entry + .entry.error:focus:not(:last-child), +.linked:not(.vertical):not(.pathbar) > .entry + .entry.error:focus:last-child { + border-left-color: #2b2e39; } + .linked:not(.vertical):not(.pathbar) > .entry + .button, .linked:not(.vertical):not(.pathbar) > .entry + .button:hover, .linked:not(.vertical):not(.pathbar) > .entry + .button:active, @@ -538,6 +555,18 @@ GtkSearchEntry.entry { .linked:not(.vertical):not(.pathbar) > .entry:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox { border-left-color: #2b2e39; } +.linked:not(.vertical):not(.pathbar) > .entry.warning:focus:not(:only-child) + .entry, +.linked:not(.vertical):not(.pathbar) > .entry.warning:focus:not(:only-child) + .button, +.linked:not(.vertical):not(.pathbar) > .entry.warning:focus:not(:only-child) + GtkComboBox > .the-button-in-the-combobox, +.linked:not(.vertical):not(.pathbar) > .entry.warning:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox { + border-left-color: #2b2e39; } + +.linked:not(.vertical):not(.pathbar) > .entry.error:focus:not(:only-child) + .entry, +.linked:not(.vertical):not(.pathbar) > .entry.error:focus:not(:only-child) + .button, +.linked:not(.vertical):not(.pathbar) > .entry.error:focus:not(:only-child) + GtkComboBox > .the-button-in-the-combobox, +.linked:not(.vertical):not(.pathbar) > .entry.error:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox { + border-left-color: #2b2e39; } + .linked:not(.vertical):not(.pathbar) > .button:hover:not(:checked):not(:active):not(:only-child), .linked:not(.vertical):not(.pathbar) > .button:hover:not(:checked):not(:active) + .button:not(:checked):not(:active) { box-shadow: -1px 0 #2b2e39; } @@ -566,10 +595,29 @@ GtkSearchEntry.entry { .linked.vertical > .entry + .entry { border-top-color: rgba(43, 46, 57, 0.3); } +.linked.vertical > .entry.error + .entry, +.linked.vertical > .entry + .entry.error { + border-top-color: rgba(43, 46, 57, 0.3); } + +.linked.vertical > .entry.warning + .entry, +.linked.vertical > .entry + .entry.warning { + border-top-color: rgba(43, 46, 57, 0.3); } + +.linked.vertical > .entry.error + .entry.warning { + border-top-color: rgba(43, 46, 57, 0.3); } + .linked.vertical > .entry + .entry:focus:not(:last-child), .linked.vertical > .entry + .entry:focus:last-child { border-top-color: #2b2e39; } +.linked.vertical > .entry + .entry.warning:focus:not(:last-child), +.linked.vertical > .entry + .entry.warning:focus:last-child { + border-top-color: #2b2e39; } + +.linked.vertical > .entry + .entry.error:focus:not(:last-child), +.linked.vertical > .entry + .entry.error:focus:last-child { + border-top-color: #2b2e39; } + .linked.vertical > .entry + .button, .linked.vertical > .entry + .button:hover, .linked.vertical > .entry + .button:active, @@ -583,6 +631,18 @@ GtkSearchEntry.entry { .linked.vertical > .entry:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox { border-top-color: #2b2e39; } +.linked.vertical > .entry.warning:focus:not(:only-child) + .entry, +.linked.vertical > .entry.warning:focus:not(:only-child) + .button, +.linked.vertical > .entry.warning:focus:not(:only-child) + GtkComboBox > .the-button-in-the-combobox, +.linked.vertical > .entry.warning:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox { + border-top-color: #2b2e39; } + +.linked.vertical > .entry.error:focus:not(:only-child) + .entry, +.linked.vertical > .entry.error:focus:not(:only-child) + .button, +.linked.vertical > .entry.error:focus:not(:only-child) + GtkComboBox > .the-button-in-the-combobox, +.linked.vertical > .entry.error:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox { + border-top-color: #2b2e39; } + .linked.vertical > .button:hover:not(:checked):not(:active):not(:only-child), .linked.vertical > .button:hover:not(:checked):not(:active) + .button:not(:checked):not(:active) { box-shadow: 0 -1px #2b2e39; } @@ -1084,6 +1144,26 @@ GtkComboBox { border-color: #5294E2; background-image: none; background-color: transparent; } + .primary-toolbar .entry.warning, .header-bar .entry.warning { + color: #ffffff; + border-color: rgba(21, 23, 28, 0.4); + background-image: linear-gradient(to bottom, #a45d39); } + .primary-toolbar .entry.warning:focus, .header-bar .entry.warning:focus { + color: #ffffff; + background-image: linear-gradient(to bottom, #F27835); } + .primary-toolbar .entry.warning:selected, .header-bar .entry.warning:selected, .primary-toolbar .entry.warning:selected:focus, .header-bar .entry.warning:selected:focus { + background-color: #ffffff; + color: #F27835; } + .primary-toolbar .entry.error, .header-bar .entry.error { + color: #ffffff; + border-color: rgba(21, 23, 28, 0.4); + background-image: linear-gradient(to bottom, #aa3c3b); } + .primary-toolbar .entry.error:focus, .header-bar .entry.error:focus { + color: #ffffff; + background-image: linear-gradient(to bottom, #FC4138); } + .primary-toolbar .entry.error:selected, .header-bar .entry.error:selected, .primary-toolbar .entry.error:selected:focus, .header-bar .entry.error:selected:focus { + background-color: #ffffff; + color: #FC4138; } .primary-toolbar .button, .header-bar .button { color: rgba(207, 218, 231, 0.8); @@ -1179,11 +1259,34 @@ GtkComboBox { .primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry + .entry, .header-bar .linked:not(.vertical):not(.pathbar) > .entry + .entry { border-left-color: rgba(21, 23, 28, 0); } +.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry.error + .entry, +.header-bar .linked:not(.vertical):not(.pathbar) > .entry.error + .entry, +.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry + .entry.error, .header-bar .linked:not(.vertical):not(.pathbar) > .entry + .entry.error { + border-left-color: rgba(21, 23, 28, 0); } + +.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry.warning + .entry, +.header-bar .linked:not(.vertical):not(.pathbar) > .entry.warning + .entry, +.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry + .entry.warning, .header-bar .linked:not(.vertical):not(.pathbar) > .entry + .entry.warning { + border-left-color: rgba(21, 23, 28, 0); } + +.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry.error + .entry.warning, .header-bar .linked:not(.vertical):not(.pathbar) > .entry.error + .entry.warning { + border-left-color: rgba(21, 23, 28, 0); } + .primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry + .entry:focus:not(:last-child), .header-bar .linked:not(.vertical):not(.pathbar) > .entry + .entry:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry + .entry:focus:last-child, .header-bar .linked:not(.vertical):not(.pathbar) > .entry + .entry:focus:last-child { border-left-color: rgba(21, 23, 28, 0.4); } +.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry + .entry.warning:focus:not(:last-child), +.header-bar .linked:not(.vertical):not(.pathbar) > .entry + .entry.warning:focus:not(:last-child), +.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry + .entry.warning:focus:last-child, .header-bar .linked:not(.vertical):not(.pathbar) > .entry + .entry.warning:focus:last-child { + border-left-color: rgba(21, 23, 28, 0.4); } + +.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry + .entry.error:focus:not(:last-child), +.header-bar .linked:not(.vertical):not(.pathbar) > .entry + .entry.error:focus:not(:last-child), +.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry + .entry.error:focus:last-child, .header-bar .linked:not(.vertical):not(.pathbar) > .entry + .entry.error:focus:last-child { + border-left-color: rgba(21, 23, 28, 0.4); } + .primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry:focus:not(:only-child) + .entry, .header-bar .linked:not(.vertical):not(.pathbar) > .entry:focus:not(:only-child) + .entry, .primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry:focus:not(:only-child) + .button, @@ -1193,6 +1296,24 @@ GtkComboBox { .primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox, .header-bar .linked:not(.vertical):not(.pathbar) > .entry:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox { border-left-color: rgba(21, 23, 28, 0.4); } +.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry.warning:focus:not(:only-child) + .entry, +.header-bar .linked:not(.vertical):not(.pathbar) > .entry.warning:focus:not(:only-child) + .entry, +.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry.warning:focus:not(:only-child) + .button, +.header-bar .linked:not(.vertical):not(.pathbar) > .entry.warning:focus:not(:only-child) + .button, +.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry.warning:focus:not(:only-child) + GtkComboBox > .the-button-in-the-combobox, +.header-bar .linked:not(.vertical):not(.pathbar) > .entry.warning:focus:not(:only-child) + GtkComboBox > .the-button-in-the-combobox, +.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry.warning:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox, .header-bar .linked:not(.vertical):not(.pathbar) > .entry.warning:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox { + border-left-color: rgba(21, 23, 28, 0.4); } + +.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry.error:focus:not(:only-child) + .entry, +.header-bar .linked:not(.vertical):not(.pathbar) > .entry.error:focus:not(:only-child) + .entry, +.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry.error:focus:not(:only-child) + .button, +.header-bar .linked:not(.vertical):not(.pathbar) > .entry.error:focus:not(:only-child) + .button, +.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry.error:focus:not(:only-child) + GtkComboBox > .the-button-in-the-combobox, +.header-bar .linked:not(.vertical):not(.pathbar) > .entry.error:focus:not(:only-child) + GtkComboBox > .the-button-in-the-combobox, +.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry.error:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox, .header-bar .linked:not(.vertical):not(.pathbar) > .entry.error:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox { + border-left-color: rgba(21, 23, 28, 0.4); } + .primary-toolbar .button.suggested-action, .header-bar .button.suggested-action { background-clip: border-box; color: #ffffff; diff --git a/common/gtk-3.0/3.18/gtk-contained-solid-darker.css b/common/gtk-3.0/3.18/gtk-contained-solid-darker.css index 6dc9f47..64b8cff 100644 --- a/common/gtk-3.0/3.18/gtk-contained-solid-darker.css +++ b/common/gtk-3.0/3.18/gtk-contained-solid-darker.css @@ -183,32 +183,30 @@ GtkTextView { background-image: none; background-color: transparent; box-shadow: none; } - .entry.error { - color: white; - border-color: #FC4138; - background-image: linear-gradient(to bottom, #fd6760); } - .entry.error:focus { - background-image: linear-gradient(to bottom, #FC4138); - color: white; } - .entry.error:selected, .entry.error:selected:focus { - background-color: white; - color: #FC4138; } .entry.warning { - color: white; + color: #ffffff; border-color: #F27835; - background-image: linear-gradient(to bottom, #f5935d); } + background-image: linear-gradient(to bottom, #f7ae86); } .entry.warning:focus { + color: #ffffff; background-image: linear-gradient(to bottom, #F27835); - color: white; } + box-shadow: none; } .entry.warning:selected, .entry.warning:selected:focus { - background-color: white; + background-color: #ffffff; color: #F27835; } + .entry.error { + color: #ffffff; + border-color: #FC4138; + background-image: linear-gradient(to bottom, #fd8d88); } + .entry.error:focus { + color: #ffffff; + background-image: linear-gradient(to bottom, #FC4138); + box-shadow: none; } + .entry.error:selected, .entry.error:selected:focus { + background-color: #ffffff; + color: #FC4138; } .entry.image { color: #7d8189; } - .entry.image:hover { - color: #5c616c; } - .entry.image:active { - color: #5294E2; } .osd .entry { color: #BAC3CF; border-color: rgba(26, 28, 34, 0.4); @@ -520,10 +518,29 @@ GtkSearchEntry.entry { .linked:not(.vertical):not(.pathbar) > .entry + .entry { border-left-color: rgba(207, 214, 230, 0.3); } +.linked:not(.vertical):not(.pathbar) > .entry.error + .entry, +.linked:not(.vertical):not(.pathbar) > .entry + .entry.error { + border-left-color: #FC4138; } + +.linked:not(.vertical):not(.pathbar) > .entry.warning + .entry, +.linked:not(.vertical):not(.pathbar) > .entry + .entry.warning { + border-left-color: #F27835; } + +.linked:not(.vertical):not(.pathbar) > .entry.error + .entry.warning { + border-left-color: #FC4138; } + .linked:not(.vertical):not(.pathbar) > .entry + .entry:focus:not(:last-child), .linked:not(.vertical):not(.pathbar) > .entry + .entry:focus:last-child { border-left-color: #5294E2; } +.linked:not(.vertical):not(.pathbar) > .entry + .entry.warning:focus:not(:last-child), +.linked:not(.vertical):not(.pathbar) > .entry + .entry.warning:focus:last-child { + border-left-color: #F27835; } + +.linked:not(.vertical):not(.pathbar) > .entry + .entry.error:focus:not(:last-child), +.linked:not(.vertical):not(.pathbar) > .entry + .entry.error:focus:last-child { + border-left-color: #FC4138; } + .linked:not(.vertical):not(.pathbar) > .entry + .button, .linked:not(.vertical):not(.pathbar) > .entry + .button:hover, .linked:not(.vertical):not(.pathbar) > .entry + .button:active, @@ -537,6 +554,18 @@ GtkSearchEntry.entry { .linked:not(.vertical):not(.pathbar) > .entry:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox { border-left-color: #5294E2; } +.linked:not(.vertical):not(.pathbar) > .entry.warning:focus:not(:only-child) + .entry, +.linked:not(.vertical):not(.pathbar) > .entry.warning:focus:not(:only-child) + .button, +.linked:not(.vertical):not(.pathbar) > .entry.warning:focus:not(:only-child) + GtkComboBox > .the-button-in-the-combobox, +.linked:not(.vertical):not(.pathbar) > .entry.warning:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox { + border-left-color: #F27835; } + +.linked:not(.vertical):not(.pathbar) > .entry.error:focus:not(:only-child) + .entry, +.linked:not(.vertical):not(.pathbar) > .entry.error:focus:not(:only-child) + .button, +.linked:not(.vertical):not(.pathbar) > .entry.error:focus:not(:only-child) + GtkComboBox > .the-button-in-the-combobox, +.linked:not(.vertical):not(.pathbar) > .entry.error:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox { + border-left-color: #FC4138; } + .linked:not(.vertical):not(.pathbar) > .button:hover:not(:checked):not(:active):not(:only-child), .linked:not(.vertical):not(.pathbar) > .button:hover:not(:checked):not(:active) + .button:not(:checked):not(:active) { box-shadow: -1px 0 #cfd6e6; } @@ -565,10 +594,29 @@ GtkSearchEntry.entry { .linked.vertical > .entry + .entry { border-top-color: rgba(207, 214, 230, 0.3); } +.linked.vertical > .entry.error + .entry, +.linked.vertical > .entry + .entry.error { + border-top-color: #FC4138; } + +.linked.vertical > .entry.warning + .entry, +.linked.vertical > .entry + .entry.warning { + border-top-color: #F27835; } + +.linked.vertical > .entry.error + .entry.warning { + border-top-color: #FC4138; } + .linked.vertical > .entry + .entry:focus:not(:last-child), .linked.vertical > .entry + .entry:focus:last-child { border-top-color: #5294E2; } +.linked.vertical > .entry + .entry.warning:focus:not(:last-child), +.linked.vertical > .entry + .entry.warning:focus:last-child { + border-top-color: #F27835; } + +.linked.vertical > .entry + .entry.error:focus:not(:last-child), +.linked.vertical > .entry + .entry.error:focus:last-child { + border-top-color: #FC4138; } + .linked.vertical > .entry + .button, .linked.vertical > .entry + .button:hover, .linked.vertical > .entry + .button:active, @@ -582,6 +630,18 @@ GtkSearchEntry.entry { .linked.vertical > .entry:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox { border-top-color: #5294E2; } +.linked.vertical > .entry.warning:focus:not(:only-child) + .entry, +.linked.vertical > .entry.warning:focus:not(:only-child) + .button, +.linked.vertical > .entry.warning:focus:not(:only-child) + GtkComboBox > .the-button-in-the-combobox, +.linked.vertical > .entry.warning:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox { + border-top-color: #F27835; } + +.linked.vertical > .entry.error:focus:not(:only-child) + .entry, +.linked.vertical > .entry.error:focus:not(:only-child) + .button, +.linked.vertical > .entry.error:focus:not(:only-child) + GtkComboBox > .the-button-in-the-combobox, +.linked.vertical > .entry.error:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox { + border-top-color: #FC4138; } + .linked.vertical > .button:hover:not(:checked):not(:active):not(:only-child), .linked.vertical > .button:hover:not(:checked):not(:active) + .button:not(:checked):not(:active) { box-shadow: 0 -1px #cfd6e6; } @@ -1087,6 +1147,26 @@ GtkComboBox { border-color: #5294E2; background-image: none; background-color: transparent; } + .primary-toolbar .entry.warning, .header-bar .entry.warning { + color: #ffffff; + border-color: rgba(21, 23, 28, 0.4); + background-image: linear-gradient(to bottom, #a45d39); } + .primary-toolbar .entry.warning:focus, .header-bar .entry.warning:focus { + color: #ffffff; + background-image: linear-gradient(to bottom, #F27835); } + .primary-toolbar .entry.warning:selected, .header-bar .entry.warning:selected, .primary-toolbar .entry.warning:selected:focus, .header-bar .entry.warning:selected:focus { + background-color: #ffffff; + color: #F27835; } + .primary-toolbar .entry.error, .header-bar .entry.error { + color: #ffffff; + border-color: rgba(21, 23, 28, 0.4); + background-image: linear-gradient(to bottom, #aa3c3b); } + .primary-toolbar .entry.error:focus, .header-bar .entry.error:focus { + color: #ffffff; + background-image: linear-gradient(to bottom, #FC4138); } + .primary-toolbar .entry.error:selected, .header-bar .entry.error:selected, .primary-toolbar .entry.error:selected:focus, .header-bar .entry.error:selected:focus { + background-color: #ffffff; + color: #FC4138; } .primary-toolbar .button, .header-bar .button { color: rgba(207, 218, 231, 0.8); @@ -1182,11 +1262,34 @@ GtkComboBox { .primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry + .entry, .header-bar .linked:not(.vertical):not(.pathbar) > .entry + .entry { border-left-color: rgba(21, 23, 28, 0); } +.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry.error + .entry, +.header-bar .linked:not(.vertical):not(.pathbar) > .entry.error + .entry, +.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry + .entry.error, .header-bar .linked:not(.vertical):not(.pathbar) > .entry + .entry.error { + border-left-color: #FC4138; } + +.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry.warning + .entry, +.header-bar .linked:not(.vertical):not(.pathbar) > .entry.warning + .entry, +.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry + .entry.warning, .header-bar .linked:not(.vertical):not(.pathbar) > .entry + .entry.warning { + border-left-color: #F27835; } + +.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry.error + .entry.warning, .header-bar .linked:not(.vertical):not(.pathbar) > .entry.error + .entry.warning { + border-left-color: #FC4138; } + .primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry + .entry:focus:not(:last-child), .header-bar .linked:not(.vertical):not(.pathbar) > .entry + .entry:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry + .entry:focus:last-child, .header-bar .linked:not(.vertical):not(.pathbar) > .entry + .entry:focus:last-child { border-left-color: rgba(21, 23, 28, 0.4); } +.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry + .entry.warning:focus:not(:last-child), +.header-bar .linked:not(.vertical):not(.pathbar) > .entry + .entry.warning:focus:not(:last-child), +.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry + .entry.warning:focus:last-child, .header-bar .linked:not(.vertical):not(.pathbar) > .entry + .entry.warning:focus:last-child { + border-left-color: #F27835; } + +.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry + .entry.error:focus:not(:last-child), +.header-bar .linked:not(.vertical):not(.pathbar) > .entry + .entry.error:focus:not(:last-child), +.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry + .entry.error:focus:last-child, .header-bar .linked:not(.vertical):not(.pathbar) > .entry + .entry.error:focus:last-child { + border-left-color: #FC4138; } + .primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry:focus:not(:only-child) + .entry, .header-bar .linked:not(.vertical):not(.pathbar) > .entry:focus:not(:only-child) + .entry, .primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry:focus:not(:only-child) + .button, @@ -1196,6 +1299,24 @@ GtkComboBox { .primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox, .header-bar .linked:not(.vertical):not(.pathbar) > .entry:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox { border-left-color: rgba(21, 23, 28, 0.4); } +.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry.warning:focus:not(:only-child) + .entry, +.header-bar .linked:not(.vertical):not(.pathbar) > .entry.warning:focus:not(:only-child) + .entry, +.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry.warning:focus:not(:only-child) + .button, +.header-bar .linked:not(.vertical):not(.pathbar) > .entry.warning:focus:not(:only-child) + .button, +.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry.warning:focus:not(:only-child) + GtkComboBox > .the-button-in-the-combobox, +.header-bar .linked:not(.vertical):not(.pathbar) > .entry.warning:focus:not(:only-child) + GtkComboBox > .the-button-in-the-combobox, +.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry.warning:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox, .header-bar .linked:not(.vertical):not(.pathbar) > .entry.warning:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox { + border-left-color: #F27835; } + +.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry.error:focus:not(:only-child) + .entry, +.header-bar .linked:not(.vertical):not(.pathbar) > .entry.error:focus:not(:only-child) + .entry, +.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry.error:focus:not(:only-child) + .button, +.header-bar .linked:not(.vertical):not(.pathbar) > .entry.error:focus:not(:only-child) + .button, +.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry.error:focus:not(:only-child) + GtkComboBox > .the-button-in-the-combobox, +.header-bar .linked:not(.vertical):not(.pathbar) > .entry.error:focus:not(:only-child) + GtkComboBox > .the-button-in-the-combobox, +.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry.error:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox, .header-bar .linked:not(.vertical):not(.pathbar) > .entry.error:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox { + border-left-color: #FC4138; } + .primary-toolbar .button.suggested-action, .header-bar .button.suggested-action { background-clip: border-box; color: #ffffff; diff --git a/common/gtk-3.0/3.18/gtk-contained-solid.css b/common/gtk-3.0/3.18/gtk-contained-solid.css index 6132f3c..4ccf914 100644 --- a/common/gtk-3.0/3.18/gtk-contained-solid.css +++ b/common/gtk-3.0/3.18/gtk-contained-solid.css @@ -183,32 +183,30 @@ GtkTextView { background-image: none; background-color: transparent; box-shadow: none; } - .entry.error { - color: white; - border-color: #FC4138; - background-image: linear-gradient(to bottom, #fd6760); } - .entry.error:focus { - background-image: linear-gradient(to bottom, #FC4138); - color: white; } - .entry.error:selected, .entry.error:selected:focus { - background-color: white; - color: #FC4138; } .entry.warning { - color: white; + color: #ffffff; border-color: #F27835; - background-image: linear-gradient(to bottom, #f5935d); } + background-image: linear-gradient(to bottom, #f7ae86); } .entry.warning:focus { + color: #ffffff; background-image: linear-gradient(to bottom, #F27835); - color: white; } + box-shadow: none; } .entry.warning:selected, .entry.warning:selected:focus { - background-color: white; + background-color: #ffffff; color: #F27835; } + .entry.error { + color: #ffffff; + border-color: #FC4138; + background-image: linear-gradient(to bottom, #fd8d88); } + .entry.error:focus { + color: #ffffff; + background-image: linear-gradient(to bottom, #FC4138); + box-shadow: none; } + .entry.error:selected, .entry.error:selected:focus { + background-color: #ffffff; + color: #FC4138; } .entry.image { color: #7d8189; } - .entry.image:hover { - color: #5c616c; } - .entry.image:active { - color: #5294E2; } .osd .entry { color: #BAC3CF; border-color: rgba(26, 28, 34, 0.4); @@ -520,10 +518,29 @@ GtkSearchEntry.entry { .linked:not(.vertical):not(.pathbar) > .entry + .entry { border-left-color: rgba(207, 214, 230, 0.3); } +.linked:not(.vertical):not(.pathbar) > .entry.error + .entry, +.linked:not(.vertical):not(.pathbar) > .entry + .entry.error { + border-left-color: #FC4138; } + +.linked:not(.vertical):not(.pathbar) > .entry.warning + .entry, +.linked:not(.vertical):not(.pathbar) > .entry + .entry.warning { + border-left-color: #F27835; } + +.linked:not(.vertical):not(.pathbar) > .entry.error + .entry.warning { + border-left-color: #FC4138; } + .linked:not(.vertical):not(.pathbar) > .entry + .entry:focus:not(:last-child), .linked:not(.vertical):not(.pathbar) > .entry + .entry:focus:last-child { border-left-color: #5294E2; } +.linked:not(.vertical):not(.pathbar) > .entry + .entry.warning:focus:not(:last-child), +.linked:not(.vertical):not(.pathbar) > .entry + .entry.warning:focus:last-child { + border-left-color: #F27835; } + +.linked:not(.vertical):not(.pathbar) > .entry + .entry.error:focus:not(:last-child), +.linked:not(.vertical):not(.pathbar) > .entry + .entry.error:focus:last-child { + border-left-color: #FC4138; } + .linked:not(.vertical):not(.pathbar) > .entry + .button, .linked:not(.vertical):not(.pathbar) > .entry + .button:hover, .linked:not(.vertical):not(.pathbar) > .entry + .button:active, @@ -537,6 +554,18 @@ GtkSearchEntry.entry { .linked:not(.vertical):not(.pathbar) > .entry:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox { border-left-color: #5294E2; } +.linked:not(.vertical):not(.pathbar) > .entry.warning:focus:not(:only-child) + .entry, +.linked:not(.vertical):not(.pathbar) > .entry.warning:focus:not(:only-child) + .button, +.linked:not(.vertical):not(.pathbar) > .entry.warning:focus:not(:only-child) + GtkComboBox > .the-button-in-the-combobox, +.linked:not(.vertical):not(.pathbar) > .entry.warning:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox { + border-left-color: #F27835; } + +.linked:not(.vertical):not(.pathbar) > .entry.error:focus:not(:only-child) + .entry, +.linked:not(.vertical):not(.pathbar) > .entry.error:focus:not(:only-child) + .button, +.linked:not(.vertical):not(.pathbar) > .entry.error:focus:not(:only-child) + GtkComboBox > .the-button-in-the-combobox, +.linked:not(.vertical):not(.pathbar) > .entry.error:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox { + border-left-color: #FC4138; } + .linked:not(.vertical):not(.pathbar) > .button:hover:not(:checked):not(:active):not(:only-child), .linked:not(.vertical):not(.pathbar) > .button:hover:not(:checked):not(:active) + .button:not(:checked):not(:active) { box-shadow: -1px 0 #cfd6e6; } @@ -565,10 +594,29 @@ GtkSearchEntry.entry { .linked.vertical > .entry + .entry { border-top-color: rgba(207, 214, 230, 0.3); } +.linked.vertical > .entry.error + .entry, +.linked.vertical > .entry + .entry.error { + border-top-color: #FC4138; } + +.linked.vertical > .entry.warning + .entry, +.linked.vertical > .entry + .entry.warning { + border-top-color: #F27835; } + +.linked.vertical > .entry.error + .entry.warning { + border-top-color: #FC4138; } + .linked.vertical > .entry + .entry:focus:not(:last-child), .linked.vertical > .entry + .entry:focus:last-child { border-top-color: #5294E2; } +.linked.vertical > .entry + .entry.warning:focus:not(:last-child), +.linked.vertical > .entry + .entry.warning:focus:last-child { + border-top-color: #F27835; } + +.linked.vertical > .entry + .entry.error:focus:not(:last-child), +.linked.vertical > .entry + .entry.error:focus:last-child { + border-top-color: #FC4138; } + .linked.vertical > .entry + .button, .linked.vertical > .entry + .button:hover, .linked.vertical > .entry + .button:active, @@ -582,6 +630,18 @@ GtkSearchEntry.entry { .linked.vertical > .entry:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox { border-top-color: #5294E2; } +.linked.vertical > .entry.warning:focus:not(:only-child) + .entry, +.linked.vertical > .entry.warning:focus:not(:only-child) + .button, +.linked.vertical > .entry.warning:focus:not(:only-child) + GtkComboBox > .the-button-in-the-combobox, +.linked.vertical > .entry.warning:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox { + border-top-color: #F27835; } + +.linked.vertical > .entry.error:focus:not(:only-child) + .entry, +.linked.vertical > .entry.error:focus:not(:only-child) + .button, +.linked.vertical > .entry.error:focus:not(:only-child) + GtkComboBox > .the-button-in-the-combobox, +.linked.vertical > .entry.error:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox { + border-top-color: #FC4138; } + .linked.vertical > .button:hover:not(:checked):not(:active):not(:only-child), .linked.vertical > .button:hover:not(:checked):not(:active) + .button:not(:checked):not(:active) { box-shadow: 0 -1px #cfd6e6; } @@ -1087,6 +1147,26 @@ GtkComboBox { border-color: #5294E2; background-image: none; background-color: transparent; } + .primary-toolbar .entry.warning, .header-bar .entry.warning { + color: #ffffff; + border-color: #F27835; + background-image: linear-gradient(to bottom, #eea57e); } + .primary-toolbar .entry.warning:focus, .header-bar .entry.warning:focus { + color: #ffffff; + background-image: linear-gradient(to bottom, #F27835); } + .primary-toolbar .entry.warning:selected, .header-bar .entry.warning:selected, .primary-toolbar .entry.warning:selected:focus, .header-bar .entry.warning:selected:focus { + background-color: #ffffff; + color: #F27835; } + .primary-toolbar .entry.error, .header-bar .entry.error { + color: #ffffff; + border-color: #FC4138; + background-image: linear-gradient(to bottom, #f48480); } + .primary-toolbar .entry.error:focus, .header-bar .entry.error:focus { + color: #ffffff; + background-image: linear-gradient(to bottom, #FC4138); } + .primary-toolbar .entry.error:selected, .header-bar .entry.error:selected, .primary-toolbar .entry.error:selected:focus, .header-bar .entry.error:selected:focus { + background-color: #ffffff; + color: #FC4138; } .primary-toolbar .button, .header-bar .button { color: rgba(82, 93, 118, 0.8); @@ -1182,11 +1262,34 @@ GtkComboBox { .primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry + .entry, .header-bar .linked:not(.vertical):not(.pathbar) > .entry + .entry { border-left-color: rgba(82, 93, 118, 0); } +.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry.error + .entry, +.header-bar .linked:not(.vertical):not(.pathbar) > .entry.error + .entry, +.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry + .entry.error, .header-bar .linked:not(.vertical):not(.pathbar) > .entry + .entry.error { + border-left-color: #FC4138; } + +.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry.warning + .entry, +.header-bar .linked:not(.vertical):not(.pathbar) > .entry.warning + .entry, +.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry + .entry.warning, .header-bar .linked:not(.vertical):not(.pathbar) > .entry + .entry.warning { + border-left-color: #F27835; } + +.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry.error + .entry.warning, .header-bar .linked:not(.vertical):not(.pathbar) > .entry.error + .entry.warning { + border-left-color: #FC4138; } + .primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry + .entry:focus:not(:last-child), .header-bar .linked:not(.vertical):not(.pathbar) > .entry + .entry:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry + .entry:focus:last-child, .header-bar .linked:not(.vertical):not(.pathbar) > .entry + .entry:focus:last-child { border-left-color: #5294E2; } +.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry + .entry.warning:focus:not(:last-child), +.header-bar .linked:not(.vertical):not(.pathbar) > .entry + .entry.warning:focus:not(:last-child), +.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry + .entry.warning:focus:last-child, .header-bar .linked:not(.vertical):not(.pathbar) > .entry + .entry.warning:focus:last-child { + border-left-color: #F27835; } + +.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry + .entry.error:focus:not(:last-child), +.header-bar .linked:not(.vertical):not(.pathbar) > .entry + .entry.error:focus:not(:last-child), +.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry + .entry.error:focus:last-child, .header-bar .linked:not(.vertical):not(.pathbar) > .entry + .entry.error:focus:last-child { + border-left-color: #FC4138; } + .primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry:focus:not(:only-child) + .entry, .header-bar .linked:not(.vertical):not(.pathbar) > .entry:focus:not(:only-child) + .entry, .primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry:focus:not(:only-child) + .button, @@ -1196,6 +1299,24 @@ GtkComboBox { .primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox, .header-bar .linked:not(.vertical):not(.pathbar) > .entry:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox { border-left-color: #5294E2; } +.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry.warning:focus:not(:only-child) + .entry, +.header-bar .linked:not(.vertical):not(.pathbar) > .entry.warning:focus:not(:only-child) + .entry, +.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry.warning:focus:not(:only-child) + .button, +.header-bar .linked:not(.vertical):not(.pathbar) > .entry.warning:focus:not(:only-child) + .button, +.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry.warning:focus:not(:only-child) + GtkComboBox > .the-button-in-the-combobox, +.header-bar .linked:not(.vertical):not(.pathbar) > .entry.warning:focus:not(:only-child) + GtkComboBox > .the-button-in-the-combobox, +.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry.warning:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox, .header-bar .linked:not(.vertical):not(.pathbar) > .entry.warning:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox { + border-left-color: #F27835; } + +.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry.error:focus:not(:only-child) + .entry, +.header-bar .linked:not(.vertical):not(.pathbar) > .entry.error:focus:not(:only-child) + .entry, +.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry.error:focus:not(:only-child) + .button, +.header-bar .linked:not(.vertical):not(.pathbar) > .entry.error:focus:not(:only-child) + .button, +.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry.error:focus:not(:only-child) + GtkComboBox > .the-button-in-the-combobox, +.header-bar .linked:not(.vertical):not(.pathbar) > .entry.error:focus:not(:only-child) + GtkComboBox > .the-button-in-the-combobox, +.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry.error:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox, .header-bar .linked:not(.vertical):not(.pathbar) > .entry.error:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox { + border-left-color: #FC4138; } + .primary-toolbar .button.suggested-action, .header-bar .button.suggested-action { background-clip: border-box; color: #ffffff; diff --git a/common/gtk-3.0/3.18/gtk-contained.css b/common/gtk-3.0/3.18/gtk-contained.css index 053164c..e47ec44 100644 --- a/common/gtk-3.0/3.18/gtk-contained.css +++ b/common/gtk-3.0/3.18/gtk-contained.css @@ -183,32 +183,30 @@ GtkTextView { background-image: none; background-color: transparent; box-shadow: none; } - .entry.error { - color: white; - border-color: #FC4138; - background-image: linear-gradient(to bottom, #fd6760); } - .entry.error:focus { - background-image: linear-gradient(to bottom, #FC4138); - color: white; } - .entry.error:selected, .entry.error:selected:focus { - background-color: white; - color: #FC4138; } .entry.warning { - color: white; + color: #ffffff; border-color: #F27835; - background-image: linear-gradient(to bottom, #f5935d); } + background-image: linear-gradient(to bottom, #f7ae86); } .entry.warning:focus { + color: #ffffff; background-image: linear-gradient(to bottom, #F27835); - color: white; } + box-shadow: none; } .entry.warning:selected, .entry.warning:selected:focus { - background-color: white; + background-color: #ffffff; color: #F27835; } + .entry.error { + color: #ffffff; + border-color: #FC4138; + background-image: linear-gradient(to bottom, #fd8d88); } + .entry.error:focus { + color: #ffffff; + background-image: linear-gradient(to bottom, #FC4138); + box-shadow: none; } + .entry.error:selected, .entry.error:selected:focus { + background-color: #ffffff; + color: #FC4138; } .entry.image { color: #7d8189; } - .entry.image:hover { - color: #5c616c; } - .entry.image:active { - color: #5294E2; } .osd .entry { color: #BAC3CF; border-color: rgba(26, 28, 34, 0.35); @@ -520,10 +518,29 @@ GtkSearchEntry.entry { .linked:not(.vertical):not(.pathbar) > .entry + .entry { border-left-color: rgba(207, 214, 230, 0.3); } +.linked:not(.vertical):not(.pathbar) > .entry.error + .entry, +.linked:not(.vertical):not(.pathbar) > .entry + .entry.error { + border-left-color: #FC4138; } + +.linked:not(.vertical):not(.pathbar) > .entry.warning + .entry, +.linked:not(.vertical):not(.pathbar) > .entry + .entry.warning { + border-left-color: #F27835; } + +.linked:not(.vertical):not(.pathbar) > .entry.error + .entry.warning { + border-left-color: #FC4138; } + .linked:not(.vertical):not(.pathbar) > .entry + .entry:focus:not(:last-child), .linked:not(.vertical):not(.pathbar) > .entry + .entry:focus:last-child { border-left-color: #5294E2; } +.linked:not(.vertical):not(.pathbar) > .entry + .entry.warning:focus:not(:last-child), +.linked:not(.vertical):not(.pathbar) > .entry + .entry.warning:focus:last-child { + border-left-color: #F27835; } + +.linked:not(.vertical):not(.pathbar) > .entry + .entry.error:focus:not(:last-child), +.linked:not(.vertical):not(.pathbar) > .entry + .entry.error:focus:last-child { + border-left-color: #FC4138; } + .linked:not(.vertical):not(.pathbar) > .entry + .button, .linked:not(.vertical):not(.pathbar) > .entry + .button:hover, .linked:not(.vertical):not(.pathbar) > .entry + .button:active, @@ -537,6 +554,18 @@ GtkSearchEntry.entry { .linked:not(.vertical):not(.pathbar) > .entry:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox { border-left-color: #5294E2; } +.linked:not(.vertical):not(.pathbar) > .entry.warning:focus:not(:only-child) + .entry, +.linked:not(.vertical):not(.pathbar) > .entry.warning:focus:not(:only-child) + .button, +.linked:not(.vertical):not(.pathbar) > .entry.warning:focus:not(:only-child) + GtkComboBox > .the-button-in-the-combobox, +.linked:not(.vertical):not(.pathbar) > .entry.warning:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox { + border-left-color: #F27835; } + +.linked:not(.vertical):not(.pathbar) > .entry.error:focus:not(:only-child) + .entry, +.linked:not(.vertical):not(.pathbar) > .entry.error:focus:not(:only-child) + .button, +.linked:not(.vertical):not(.pathbar) > .entry.error:focus:not(:only-child) + GtkComboBox > .the-button-in-the-combobox, +.linked:not(.vertical):not(.pathbar) > .entry.error:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox { + border-left-color: #FC4138; } + .linked:not(.vertical):not(.pathbar) > .button:hover:not(:checked):not(:active):not(:only-child), .linked:not(.vertical):not(.pathbar) > .button:hover:not(:checked):not(:active) + .button:not(:checked):not(:active) { box-shadow: -1px 0 #cfd6e6; } @@ -565,10 +594,29 @@ GtkSearchEntry.entry { .linked.vertical > .entry + .entry { border-top-color: rgba(207, 214, 230, 0.3); } +.linked.vertical > .entry.error + .entry, +.linked.vertical > .entry + .entry.error { + border-top-color: #FC4138; } + +.linked.vertical > .entry.warning + .entry, +.linked.vertical > .entry + .entry.warning { + border-top-color: #F27835; } + +.linked.vertical > .entry.error + .entry.warning { + border-top-color: #FC4138; } + .linked.vertical > .entry + .entry:focus:not(:last-child), .linked.vertical > .entry + .entry:focus:last-child { border-top-color: #5294E2; } +.linked.vertical > .entry + .entry.warning:focus:not(:last-child), +.linked.vertical > .entry + .entry.warning:focus:last-child { + border-top-color: #F27835; } + +.linked.vertical > .entry + .entry.error:focus:not(:last-child), +.linked.vertical > .entry + .entry.error:focus:last-child { + border-top-color: #FC4138; } + .linked.vertical > .entry + .button, .linked.vertical > .entry + .button:hover, .linked.vertical > .entry + .button:active, @@ -582,6 +630,18 @@ GtkSearchEntry.entry { .linked.vertical > .entry:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox { border-top-color: #5294E2; } +.linked.vertical > .entry.warning:focus:not(:only-child) + .entry, +.linked.vertical > .entry.warning:focus:not(:only-child) + .button, +.linked.vertical > .entry.warning:focus:not(:only-child) + GtkComboBox > .the-button-in-the-combobox, +.linked.vertical > .entry.warning:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox { + border-top-color: #F27835; } + +.linked.vertical > .entry.error:focus:not(:only-child) + .entry, +.linked.vertical > .entry.error:focus:not(:only-child) + .button, +.linked.vertical > .entry.error:focus:not(:only-child) + GtkComboBox > .the-button-in-the-combobox, +.linked.vertical > .entry.error:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox { + border-top-color: #FC4138; } + .linked.vertical > .button:hover:not(:checked):not(:active):not(:only-child), .linked.vertical > .button:hover:not(:checked):not(:active) + .button:not(:checked):not(:active) { box-shadow: 0 -1px #cfd6e6; } @@ -1087,6 +1147,26 @@ GtkComboBox { border-color: #5294E2; background-image: none; background-color: transparent; } + .primary-toolbar .entry.warning, .header-bar .entry.warning { + color: #ffffff; + border-color: #F27835; + background-image: linear-gradient(to bottom, rgba(238, 162, 121, 0.98)); } + .primary-toolbar .entry.warning:focus, .header-bar .entry.warning:focus { + color: #ffffff; + background-image: linear-gradient(to bottom, #F27835); } + .primary-toolbar .entry.warning:selected, .header-bar .entry.warning:selected, .primary-toolbar .entry.warning:selected:focus, .header-bar .entry.warning:selected:focus { + background-color: #ffffff; + color: #F27835; } + .primary-toolbar .entry.error, .header-bar .entry.error { + color: #ffffff; + border-color: #FC4138; + background-image: linear-gradient(to bottom, rgba(244, 128, 123, 0.98)); } + .primary-toolbar .entry.error:focus, .header-bar .entry.error:focus { + color: #ffffff; + background-image: linear-gradient(to bottom, #FC4138); } + .primary-toolbar .entry.error:selected, .header-bar .entry.error:selected, .primary-toolbar .entry.error:selected:focus, .header-bar .entry.error:selected:focus { + background-color: #ffffff; + color: #FC4138; } .primary-toolbar .button, .header-bar .button { color: rgba(82, 93, 118, 0.8); @@ -1182,11 +1262,34 @@ GtkComboBox { .primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry + .entry, .header-bar .linked:not(.vertical):not(.pathbar) > .entry + .entry { border-left-color: rgba(82, 93, 118, 0); } +.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry.error + .entry, +.header-bar .linked:not(.vertical):not(.pathbar) > .entry.error + .entry, +.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry + .entry.error, .header-bar .linked:not(.vertical):not(.pathbar) > .entry + .entry.error { + border-left-color: #FC4138; } + +.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry.warning + .entry, +.header-bar .linked:not(.vertical):not(.pathbar) > .entry.warning + .entry, +.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry + .entry.warning, .header-bar .linked:not(.vertical):not(.pathbar) > .entry + .entry.warning { + border-left-color: #F27835; } + +.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry.error + .entry.warning, .header-bar .linked:not(.vertical):not(.pathbar) > .entry.error + .entry.warning { + border-left-color: #FC4138; } + .primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry + .entry:focus:not(:last-child), .header-bar .linked:not(.vertical):not(.pathbar) > .entry + .entry:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry + .entry:focus:last-child, .header-bar .linked:not(.vertical):not(.pathbar) > .entry + .entry:focus:last-child { border-left-color: #5294E2; } +.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry + .entry.warning:focus:not(:last-child), +.header-bar .linked:not(.vertical):not(.pathbar) > .entry + .entry.warning:focus:not(:last-child), +.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry + .entry.warning:focus:last-child, .header-bar .linked:not(.vertical):not(.pathbar) > .entry + .entry.warning:focus:last-child { + border-left-color: #F27835; } + +.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry + .entry.error:focus:not(:last-child), +.header-bar .linked:not(.vertical):not(.pathbar) > .entry + .entry.error:focus:not(:last-child), +.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry + .entry.error:focus:last-child, .header-bar .linked:not(.vertical):not(.pathbar) > .entry + .entry.error:focus:last-child { + border-left-color: #FC4138; } + .primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry:focus:not(:only-child) + .entry, .header-bar .linked:not(.vertical):not(.pathbar) > .entry:focus:not(:only-child) + .entry, .primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry:focus:not(:only-child) + .button, @@ -1196,6 +1299,24 @@ GtkComboBox { .primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox, .header-bar .linked:not(.vertical):not(.pathbar) > .entry:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox { border-left-color: #5294E2; } +.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry.warning:focus:not(:only-child) + .entry, +.header-bar .linked:not(.vertical):not(.pathbar) > .entry.warning:focus:not(:only-child) + .entry, +.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry.warning:focus:not(:only-child) + .button, +.header-bar .linked:not(.vertical):not(.pathbar) > .entry.warning:focus:not(:only-child) + .button, +.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry.warning:focus:not(:only-child) + GtkComboBox > .the-button-in-the-combobox, +.header-bar .linked:not(.vertical):not(.pathbar) > .entry.warning:focus:not(:only-child) + GtkComboBox > .the-button-in-the-combobox, +.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry.warning:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox, .header-bar .linked:not(.vertical):not(.pathbar) > .entry.warning:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox { + border-left-color: #F27835; } + +.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry.error:focus:not(:only-child) + .entry, +.header-bar .linked:not(.vertical):not(.pathbar) > .entry.error:focus:not(:only-child) + .entry, +.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry.error:focus:not(:only-child) + .button, +.header-bar .linked:not(.vertical):not(.pathbar) > .entry.error:focus:not(:only-child) + .button, +.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry.error:focus:not(:only-child) + GtkComboBox > .the-button-in-the-combobox, +.header-bar .linked:not(.vertical):not(.pathbar) > .entry.error:focus:not(:only-child) + GtkComboBox > .the-button-in-the-combobox, +.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry.error:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox, .header-bar .linked:not(.vertical):not(.pathbar) > .entry.error:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox { + border-left-color: #FC4138; } + .primary-toolbar .button.suggested-action, .header-bar .button.suggested-action { background-clip: border-box; color: #ffffff; diff --git a/common/gtk-3.0/3.18/sass/_common.scss b/common/gtk-3.0/3.18/sass/_common.scss index 06a7c08..eb4fb53 100644 --- a/common/gtk-3.0/3.18/sass/_common.scss +++ b/common/gtk-3.0/3.18/sass/_common.scss @@ -255,38 +255,27 @@ GtkTextView { // This will get overridden by .view, needed by gedit line numbers box-shadow: none; } - &.error { - color: white; - border-color: $error_color; - background-image: linear-gradient(to bottom, mix($error_color, $base_color, 80%)); - &:focus { - background-image: linear-gradient(to bottom, $error_color); - color: white; - } - &:selected, &:selected:focus { - background-color: white; - color: $error_color; - } - } + @each $e_type, $e_color in (warning, $warning_color), + (error, $error_color) { + &.#{$e_type} { + color: $selected_fg_color; + border-color: if($variant=='light', $e_color, $entry_border); + background-image: linear-gradient(to bottom, mix($e_color, $base_color, 60%)); - &.warning { - color: white; - border-color: $warning_color; - background-image: linear-gradient(to bottom, mix($warning_color, $base_color, 80%)); - &:focus { - background-image: linear-gradient(to bottom, $warning_color); - color: white; - } - &:selected, &:selected:focus { - background-color: white; - color: $warning_color; + &:focus { + color: $selected_fg_color; + background-image: linear-gradient(to bottom, $e_color); + box-shadow: none; + } + &:selected, &:selected:focus { + background-color: $selected_fg_color; + color: $e_color; + } } } &.image { // entry icons colors color: mix($fg_color,$base_color,80%); - &:hover { color: $fg_color; } - &:active { color: $selected_bg_color; } } .osd & { @@ -601,20 +590,50 @@ $_dot_color: $selected_bg_color; .linked:not(.vertical):not(.pathbar) { > .entry { @extend %linked; } + > .entry + .entry { border-left-color: transparentize($entry_border, 0.7); } + + > .entry.error + .entry, + > .entry + .entry.error { border-left-color: if($variant=='light', $error_color, transparentize($entry_border, 0.7)); } + + > .entry.warning + .entry, + > .entry + .entry.warning { border-left-color: if($variant=='light', $warning_color, transparentize($entry_border, 0.7)); } + + > .entry.error + .entry.warning { border-left-color: if($variant=='light', $error_color, transparentize($entry_border, 0.7));} + + > .entry + .entry:focus:not(:last-child), > .entry + .entry:focus:last-child { border-left-color: if($variant=='light', $selected_bg_color, $entry_border); } + > .entry + .entry.warning:focus:not(:last-child), + > .entry + .entry.warning:focus:last-child { border-left-color: if($variant=='light', $warning_color, $entry_border); } + + > .entry + .entry.error:focus:not(:last-child), + > .entry + .entry.error:focus:last-child { border-left-color: if($variant=='light', $error_color, $entry_border); } + + > .entry + .button, > .entry + .button:hover, > .entry + .button:active, > .entry + .button:checked, > .entry + .button:insensitive { border-left-style: solid; } + > .entry:focus:not(:only-child) + .entry, > .entry:focus:not(:only-child) + .button, > .entry:focus:not(:only-child) + GtkComboBox > .the-button-in-the-combobox, - > .entry:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox { border-left-color: if($variant=='light', $selected_bg_color, $entry_border); } + > .entry:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox { border-left-color: if($variant=='light', $selected_bg_color, $entry_border); } + + > .entry.warning:focus:not(:only-child) + .entry, + > .entry.warning:focus:not(:only-child) + .button, + > .entry.warning:focus:not(:only-child) + GtkComboBox > .the-button-in-the-combobox, + > .entry.warning:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox { border-left-color: if($variant=='light', $warning_color, $entry_border); } + + > .entry.error:focus:not(:only-child) + .entry, + > .entry.error:focus:not(:only-child) + .button, + > .entry.error:focus:not(:only-child) + GtkComboBox > .the-button-in-the-combobox, + > .entry.error:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox { border-left-color: if($variant=='light', $error_color, $entry_border); } + > .button:hover:not(:checked):not(:active):not(:only-child), > .button:hover:not(:checked):not(:active) + .button:not(:checked):not(:active) { box-shadow: -1px 0 $button_border; } @@ -644,21 +663,51 @@ $_linked_separator_color: if($variant=='light', transparentize($button_border, 0 .linked.vertical { > .entry { @extend %linked_vertical; } + > .entry + .entry { border-top-color: transparentize($entry_border, 0.7); } + + > .entry.error + .entry, + > .entry + .entry.error { border-top-color: if($variant=='light', $error_color, transparentize($entry_border, 0.7)); } + + > .entry.warning + .entry, + > .entry + .entry.warning { border-top-color: if($variant=='light', $warning_color, transparentize($entry_border, 0.7)); } + + > .entry.error + .entry.warning { border-top-color: if($variant=='light', $error_color, transparentize($entry_border, 0.7));} + + > .entry + .entry:focus:not(:last-child), > .entry + .entry:focus:last-child { border-top-color: if($variant=='light', $selected_bg_color, $entry_border); } + > .entry + .entry.warning:focus:not(:last-child), + > .entry + .entry.warning:focus:last-child { border-top-color: if($variant=='light', $warning_color, $entry_border); } + + > .entry + .entry.error:focus:not(:last-child), + > .entry + .entry.error:focus:last-child { border-top-color: if($variant=='light', $error_color, $entry_border); } + + > .entry + .button, > .entry + .button:hover, > .entry + .button:active, > .entry + .button:checked, > .entry + .button:insensitive { border-top-style: solid; } + > .entry:focus:not(:only-child) + .entry, > .entry:focus:not(:only-child) + .button, > .entry:focus:not(:only-child) + GtkComboBox > .the-button-in-the-combobox, > .entry:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox { border-top-color: if($variant=='light', $selected_bg_color, $entry_border); } + > .entry.warning:focus:not(:only-child) + .entry, + > .entry.warning:focus:not(:only-child) + .button, + > .entry.warning:focus:not(:only-child) + GtkComboBox > .the-button-in-the-combobox, + > .entry.warning:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox { border-top-color: if($variant=='light', $warning_color, $entry_border); } + + > .entry.error:focus:not(:only-child) + .entry, + > .entry.error:focus:not(:only-child) + .button, + > .entry.error:focus:not(:only-child) + GtkComboBox > .the-button-in-the-combobox, + > .entry.error:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox { border-top-color: if($variant=='light', $error_color, $entry_border); } + + > .button:hover:not(:checked):not(:active):not(:only-child), > .button:hover:not(:checked):not(:active) + .button:not(:checked):not(:active) { box-shadow: 0 -1px $button_border; } > .button:first-child:hover:not(:checked):not(:active) { box-shadow: none; } @@ -1209,6 +1258,24 @@ GtkComboBox { background-image: none; background-color: transparent; } + + @each $e_type, $e_color in (warning, $warning_color), + (error, $error_color) { + &.#{$e_type} { + color: $selected_fg_color; + border-color: if($darker=='false' and $variant=='light', $e_color, $header_entry_border); + background-image: linear-gradient(to bottom, mix($e_color, $header_bg, 60%)); + + &:focus { + color: $selected_fg_color; + background-image: linear-gradient(to bottom, $e_color); + } + &:selected, &:selected:focus { + background-color: $selected_fg_color; + color: $e_color; + } + } + } } // Header-bar Buttons @@ -1284,14 +1351,43 @@ GtkComboBox { } .linked:not(.vertical):not(.pathbar) { + > .entry + .entry { border-left-color: transparentize($header_entry_border, 0.5); } + + > .entry.error + .entry, + > .entry + .entry.error { border-left-color: if($variant=='light', $error_color, transparentize($header_entry_border, 0.5)); } + + > .entry.warning + .entry, + > .entry + .entry.warning { border-left-color: if($variant=='light', $warning_color, transparentize($header_entry_border, 0.5)); } + + > .entry.error + .entry.warning { border-left-color: if($variant=='light', $error_color, transparentize($header_entry_border, 0.5));} + + > .entry + .entry:focus:not(:last-child), > .entry + .entry:focus:last-child { border-left-color: if($darker=='false' and $variant=='light', $selected_bg_color, $header_entry_border); } + > .entry + .entry.warning:focus:not(:last-child), + > .entry + .entry.warning:focus:last-child { border-left-color: if($variant=='light', $warning_color, $header_entry_border); } + + > .entry + .entry.error:focus:not(:last-child), + > .entry + .entry.error:focus:last-child { border-left-color: if($variant=='light', $error_color, $header_entry_border); } + + > .entry:focus:not(:only-child) + .entry, > .entry:focus:not(:only-child) + .button, > .entry:focus:not(:only-child) + GtkComboBox > .the-button-in-the-combobox, > .entry:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox { border-left-color: if($darker=='false' and $variant=='light', $selected_bg_color, $header_entry_border); } + + > .entry.warning:focus:not(:only-child) + .entry, + > .entry.warning:focus:not(:only-child) + .button, + > .entry.warning:focus:not(:only-child) + GtkComboBox > .the-button-in-the-combobox, + > .entry.warning:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox { border-left-color: if($variant=='light', $warning_color, $header_entry_border); } + + > .entry.error:focus:not(:only-child) + .entry, + > .entry.error:focus:not(:only-child) + .button, + > .entry.error:focus:not(:only-child) + GtkComboBox > .the-button-in-the-combobox, + > .entry.error:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox { border-left-color: if($variant=='light', $error_color, $header_entry_border); } + } // Header-bar Suggested and Destructive Action buttons |