[gtk/wip/jimmac/push-my-buttons-too: 5/9] Adwaita:dark buttons
- From: Jakub Steiner <jimmac src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/wip/jimmac/push-my-buttons-too: 5/9] Adwaita:dark buttons
- Date: Thu, 18 Oct 2018 13:54:15 +0000 (UTC)
commit 2411f80694ab8d87e28e28aabf0bee7d17d1c5f2
Author: Jakub Steiner <jimmac gmail com>
Date: Mon Oct 1 21:33:02 2018 +0200
Adwaita:dark buttons
- dark variant needs less dramatic darkening for fills and borders
gtk/theme/Adwaita/_drawing.scss | 18 ++++++----
gtk/theme/Adwaita/gtk-contained-dark.css | 60 ++++++++++++++++----------------
gtk/theme/Adwaita/gtk-contained.css | 60 ++++++++++++++++----------------
3 files changed, 72 insertions(+), 66 deletions(-)
---
diff --git a/gtk/theme/Adwaita/_drawing.scss b/gtk/theme/Adwaita/_drawing.scss
index c0c3a8b92d..1580411635 100644
--- a/gtk/theme/Adwaita/_drawing.scss
+++ b/gtk/theme/Adwaita/_drawing.scss
@@ -192,19 +192,24 @@
//
// normal button
//
+ $_bg: if($variant == 'light', lighten($c, 3%), lighten($c, 1%));
+ $_bc: if($variant == 'light', darken($c,25%), darken($c,10%));
+ $_sc: if($variant == 'light', mix($c, darken($c,15%), 65%), mix($c, darken($c,5%), 65%));
color: $tc;
- border-color: darken($c,25%);
- background-image: image(lighten($c, 3%));
- box-shadow: inset 0 -2px mix($c, darken($c,25%), 65%);
+ border-color: $_bc;
+ background-image: image($_bg);
+ box-shadow: inset 0 -2px $_sc;
}
@else if $t==hover {
//
// hovered button
//
- background-image: image(lighten($c, 2%));
- box-shadow: inset 0 -2px mix($c, darken($c,25%), 70%);
+ $_sc: if($variant == 'light', mix($c, darken($c,15%), 70%), mix($c, darken($c,2%), 70%));
+
+ background-image: image(lighten($c, 6%));
+ box-shadow: inset 0 -2px $_sc;
}
@@ -212,8 +217,9 @@
//
// pushed button
//
+ $_bg: if($variant == 'light', darken(mix($c, $base_color, 85%), 8%), darken(mix($c, $base_color, 85%),
4%));
- background-image: image(mix($c, darken($c,25%), 55%));
+ background-image: image($_bg);
box-shadow: none;
}
diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index 81284e69d6..ef10e0fb0e 100644
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -200,7 +200,7 @@ treeview entry.flat:focus, treeview entry:focus { border-color: #215d9c; }
@keyframes needs_attention { from { background-image: radial-gradient(farthest-side, #3583d5 0%, rgba(53,
131, 213, 0) 0%); }
to { background-image: radial-gradient(farthest-side, #3583d5 95%, rgba(53, 131, 213, 0)); } }
-notebook box > header > tabs > arrow, button.titlebutton, button { min-height: 24px; min-width: 16px;
padding: 4px 8px; border: 1px solid; border-radius: 3px; transition: all 200ms cubic-bezier(0.25, 0.46, 0.45,
0.94); color: #eeeeec; border-color: black; background-image: image(#3a4143); box-shadow: inset 0 -2px
#212526; }
+notebook box > header > tabs > arrow, button.titlebutton, button { min-height: 24px; min-width: 16px;
padding: 4px 8px; border: 1px solid; border-radius: 3px; transition: all 200ms cubic-bezier(0.25, 0.46, 0.45,
0.94); color: #eeeeec; border-color: #1b1f20; background-image: image(#353c3e); box-shadow: inset 0 -2px
#2f3436; }
notebook box > header > tabs > arrow, button.sidebar-button, button.titlebutton, button.flat { border-color:
transparent; background-color: transparent; background-image: none; box-shadow: inset 0 1px rgba(255, 255,
255, 0); text-shadow: none; -gtk-icon-shadow: none; transition: none; }
@@ -208,9 +208,9 @@ notebook box > header > tabs > arrow:hover, button.sidebar-button:hover, button.
notebook box > header > tabs > arrow:hover:active, button.sidebar-button:hover:active,
button.titlebutton:hover:active, button.flat:hover:active { transition: all 200ms cubic-bezier(0.25, 0.46,
0.45, 0.94); }
-notebook box > header > tabs > arrow:hover, button.titlebutton:hover, button:hover { background-image:
image(#383e40); box-shadow: inset 0 -2px #242829; -gtk-icon-filter: brightness(1.2); }
+notebook box > header > tabs > arrow:hover, button.titlebutton:hover, button:hover { background-image:
image(#41494b); box-shadow: inset 0 -2px #323739; -gtk-icon-filter: brightness(1.2); }
-notebook box > header > tabs > arrow:active, button.titlebutton:active, notebook box > header > tabs >
arrow:checked, button.titlebutton:checked, button:active, button:checked { background-image: image(#1c1f20);
box-shadow: none; transition-duration: 50ms; }
+notebook box > header > tabs > arrow:active, button.titlebutton:active, notebook box > header > tabs >
arrow:checked, button.titlebutton:checked, button:active, button:checked { background-image: image(#272c2d);
box-shadow: none; transition-duration: 50ms; }
notebook box > header > tabs > arrow:backdrop, button.sidebar-button:backdrop, button.titlebutton:backdrop,
notebook box > header > tabs > arrow:backdrop, button.titlebutton:backdrop, button:backdrop.flat,
button:backdrop { border-color: #202425; background-image: image(#33393b); text-shadow: none;
-gtk-icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); transition: 200ms ease-out;
-gtk-icon-filter: none; }
@@ -284,13 +284,13 @@ button.osd:backdrop { color: #eeeeec; border-color: rgba(0, 0, 0, 0.7); backgrou
.csd popover > contents.background.touch-selection button.flat:active, .csd popover >
contents.background.magnifier button.flat:active, popover > contents.background.touch-selection
button.flat:active, popover > contents.background.magnifier button.flat:active, .app-notification
button.flat:active, .csd popover > contents.background.touch-selection button.flat:checked, .csd popover >
contents.background.magnifier button.flat:checked, popover > contents.background.touch-selection
button.flat:checked, popover > contents.background.magnifier button.flat:checked, .app-notification
button.flat:checked, .osd button.flat:active, .osd button.flat:checked { color: white; border-color: rgba(0,
0, 0, 0.7); background-color: transparent; background-image: image(rgba(0, 0, 0, 0.7)); background-clip:
padding-box; box-shadow: none; text-shadow: none; -gtk-icon-shadow: none; outline-color: rgba(238, 238, 236,
0.3); }
-button.suggested-action { color: white; border-color: #0b1e33; background-image: image(#2365a9); box-shadow:
inset 0 -2px #194777; }
+button.suggested-action { color: white; border-color: #184472; background-image: image(#2260a0); box-shadow:
inset 0 -2px #1f5995; }
.selection-mode button.titlebutton, button.suggested-action.flat { border-color: transparent;
background-color: transparent; background-image: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0);
text-shadow: none; -gtk-icon-shadow: none; color: #215d9c; }
-button.suggested-action:hover { background-image: image(#2362a5); box-shadow: inset 0 -2px #1a4a7d; }
+button.suggested-action:hover { background-image: image(#266cb5); box-shadow: inset 0 -2px #205c9a; }
-button.suggested-action:active, button.suggested-action:checked { background-image: image(#17416d);
box-shadow: none; }
+button.suggested-action:active, button.suggested-action:checked { background-image: image(#1d4b7b);
box-shadow: none; }
.selection-mode button.titlebutton:backdrop, button.suggested-action:backdrop,
button.suggested-action.flat:backdrop { border-color: #0f2b48; background-image: image(#215d9c); text-shadow:
none; -gtk-icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
@@ -328,13 +328,13 @@ button.suggested-action:disabled:active label, button.suggested-action:disabled:
.osd button.suggested-action:backdrop { color: #eeeeec; border-color: rgba(0, 0, 0, 0.7); background-color:
transparent; background-image: image(rgba(33, 93, 156, 0.5)); background-clip: padding-box; box-shadow: none;
text-shadow: none; -gtk-icon-shadow: none; }
-button.destructive-action { color: white; border-color: #5e0707; background-image: image(#e31111);
box-shadow: inset 0 -2px #ac0d0d; }
+button.destructive-action { color: white; border-color: #a60c0c; background-image: image(#da1010);
box-shadow: inset 0 -2px #cd0f0f; }
button.destructive-action.flat { border-color: transparent; background-color: transparent; background-image:
none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; color:
#d51010; }
-button.destructive-action:hover { background-image: image(#df1111); box-shadow: inset 0 -2px #b10d0d; }
+button.destructive-action:hover { background-image: image(#ee1616); box-shadow: inset 0 -2px #d21010; }
-button.destructive-action:active, button.destructive-action:checked { background-image: image(#a00c0c);
box-shadow: none; }
+button.destructive-action:active, button.destructive-action:checked { background-image: image(#a71112);
box-shadow: none; }
button.destructive-action:backdrop, button.destructive-action.flat:backdrop { border-color: #760909;
background-image: image(#d51010); text-shadow: none; -gtk-icon-shadow: none; box-shadow: inset 0 1px
rgba(255, 255, 255, 0); }
@@ -402,11 +402,11 @@ button.circular label { padding: 0; }
.stack-switcher > button.needs-attention > label:dir(rtl), .stack-switcher > button.needs-attention >
image:dir(rtl), stacksidebar row.needs-attention > label:dir(rtl) { background-position: left 3px, left 2px; }
-.inline-toolbar toolbutton > button { color: #eeeeec; border-color: black; background-image: image(#3a4143);
box-shadow: inset 0 -2px #212526; }
+.inline-toolbar toolbutton > button { color: #eeeeec; border-color: #1b1f20; background-image:
image(#353c3e); box-shadow: inset 0 -2px #2f3436; }
-.inline-toolbar toolbutton > button:hover { background-image: image(#383e40); box-shadow: inset 0 -2px
#242829; }
+.inline-toolbar toolbutton > button:hover { background-image: image(#41494b); box-shadow: inset 0 -2px
#323739; }
-.inline-toolbar toolbutton > button:active, .inline-toolbar toolbutton > button:checked { background-image:
image(#1c1f20); box-shadow: none; }
+.inline-toolbar toolbutton > button:active, .inline-toolbar toolbutton > button:checked { background-image:
image(#272c2d); box-shadow: none; }
.inline-toolbar toolbutton > button:disabled { border-color: #1b1f20; background-image: image(#2d3234);
text-shadow: none; -gtk-icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
@@ -608,13 +608,13 @@ searchbar > revealer > box { padding: 6px; border-width: 0 0 1px; }
.selection-mode .titlebar:backdrop:not(headerbar), .selection-mode.titlebar:backdrop:not(headerbar),
.selection-mode headerbar:backdrop, headerbar.selection-mode:backdrop { background-color: #215d9c;
background-image: none; box-shadow: inset 0 1px rgba(43, 101, 160, 0.442); }
-.selection-mode .titlebar:not(headerbar) button, .selection-mode.titlebar:not(headerbar) button,
.selection-mode headerbar button, headerbar.selection-mode button { color: #ffffff; border-color: #0b1e33;
background-image: image(#2365a9); box-shadow: inset 0 -2px #194777; }
+.selection-mode .titlebar:not(headerbar) button, .selection-mode.titlebar:not(headerbar) button,
.selection-mode headerbar button, headerbar.selection-mode button { color: #ffffff; border-color: #184472;
background-image: image(#2260a0); box-shadow: inset 0 -2px #1f5995; }
.selection-mode .titlebar:not(headerbar) button.flat, .selection-mode.titlebar:not(headerbar) button.flat,
.selection-mode headerbar button.flat, headerbar.selection-mode button.flat { border-color: transparent;
background-color: transparent; background-image: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0);
text-shadow: none; -gtk-icon-shadow: none; }
-.selection-mode .titlebar:not(headerbar) button:hover, .selection-mode.titlebar:not(headerbar) button:hover,
.selection-mode headerbar button:hover, headerbar.selection-mode button:hover { background-image:
image(#2362a5); box-shadow: inset 0 -2px #1a4a7d; }
+.selection-mode .titlebar:not(headerbar) button:hover, .selection-mode.titlebar:not(headerbar) button:hover,
.selection-mode headerbar button:hover, headerbar.selection-mode button:hover { background-image:
image(#266cb5); box-shadow: inset 0 -2px #205c9a; }
-.selection-mode .titlebar:not(headerbar) button:active, .selection-mode .titlebar:not(headerbar)
button:checked, .selection-mode.titlebar:not(headerbar) button:active,
.selection-mode.titlebar:not(headerbar) button:checked, .selection-mode headerbar button:active,
.selection-mode headerbar button:checked, headerbar.selection-mode button:active, headerbar.selection-mode
button:checked { background-image: image(#17416d); box-shadow: none; }
+.selection-mode .titlebar:not(headerbar) button:active, .selection-mode .titlebar:not(headerbar)
button:checked, .selection-mode.titlebar:not(headerbar) button:active,
.selection-mode.titlebar:not(headerbar) button:checked, .selection-mode headerbar button:active,
.selection-mode headerbar button:checked, headerbar.selection-mode button:active, headerbar.selection-mode
button:checked { background-image: image(#1d4b7b); box-shadow: none; }
.selection-mode .titlebar:not(headerbar) button:backdrop.flat, .selection-mode .titlebar:not(headerbar)
button:backdrop, .selection-mode.titlebar:not(headerbar) button:backdrop.flat,
.selection-mode.titlebar:not(headerbar) button:backdrop, .selection-mode headerbar button:backdrop.flat,
.selection-mode headerbar button:backdrop, headerbar.selection-mode button:backdrop.flat,
headerbar.selection-mode button:backdrop { border-color: #0f2b48; background-image: image(#215d9c);
text-shadow: none; -gtk-icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); -gtk-icon-filter:
none; border-color: #0f2b48; }
@@ -642,11 +642,11 @@ searchbar > revealer > box { padding: 6px; border-width: 0 0 1px; }
.selection-mode .titlebar:not(headerbar) button:disabled:active label, .selection-mode
.titlebar:not(headerbar) button:disabled:active, .selection-mode .titlebar:not(headerbar)
button:disabled:checked label, .selection-mode .titlebar:not(headerbar) button:disabled:checked,
.selection-mode.titlebar:not(headerbar) button:disabled:active label, .selection-mode.titlebar:not(headerbar)
button:disabled:active, .selection-mode.titlebar:not(headerbar) button:disabled:checked label,
.selection-mode.titlebar:not(headerbar) button:disabled:checked, .selection-mode headerbar
button:disabled:active label, .selection-mode headerbar button:disabled:active, .selection-mode headerbar
button:disabled:checked label, .selection-mode headerbar button:disabled:checked, headerbar.selection-mode
button:disabled:active label, headerbar.selection-mode button:disabled:active, headerbar.selection-mode
button:disabled:checked label, headerbar.selection-mode button:disabled:checked { color: #a4b5c7; }
-.selection-mode .titlebar:not(headerbar) button.suggested-action, .selection-mode.titlebar:not(headerbar)
button.suggested-action, .selection-mode headerbar button.suggested-action, headerbar.selection-mode
button.suggested-action { color: #eeeeec; border-color: black; background-image: image(#3a4143); box-shadow:
inset 0 -2px #212526; border-color: #0f2b48; }
+.selection-mode .titlebar:not(headerbar) button.suggested-action, .selection-mode.titlebar:not(headerbar)
button.suggested-action, .selection-mode headerbar button.suggested-action, headerbar.selection-mode
button.suggested-action { color: #eeeeec; border-color: #1b1f20; background-image: image(#353c3e);
box-shadow: inset 0 -2px #2f3436; border-color: #0f2b48; }
-.selection-mode .titlebar:not(headerbar) button.suggested-action:hover,
.selection-mode.titlebar:not(headerbar) button.suggested-action:hover, .selection-mode headerbar
button.suggested-action:hover, headerbar.selection-mode button.suggested-action:hover { background-image:
image(#383e40); box-shadow: inset 0 -2px #242829; border-color: #0f2b48; }
+.selection-mode .titlebar:not(headerbar) button.suggested-action:hover,
.selection-mode.titlebar:not(headerbar) button.suggested-action:hover, .selection-mode headerbar
button.suggested-action:hover, headerbar.selection-mode button.suggested-action:hover { background-image:
image(#41494b); box-shadow: inset 0 -2px #323739; border-color: #0f2b48; }
-.selection-mode .titlebar:not(headerbar) button.suggested-action:active,
.selection-mode.titlebar:not(headerbar) button.suggested-action:active, .selection-mode headerbar
button.suggested-action:active, headerbar.selection-mode button.suggested-action:active { background-image:
image(#1c1f20); box-shadow: none; border-color: #0f2b48; }
+.selection-mode .titlebar:not(headerbar) button.suggested-action:active,
.selection-mode.titlebar:not(headerbar) button.suggested-action:active, .selection-mode headerbar
button.suggested-action:active, headerbar.selection-mode button.suggested-action:active { background-image:
image(#272c2d); box-shadow: none; border-color: #0f2b48; }
.selection-mode .titlebar:not(headerbar) button.suggested-action:disabled,
.selection-mode.titlebar:not(headerbar) button.suggested-action:disabled, .selection-mode headerbar
button.suggested-action:disabled, headerbar.selection-mode button.suggested-action:disabled { border-color:
#1b1f20; background-image: image(#2d3234); text-shadow: none; -gtk-icon-shadow: none; box-shadow: inset 0 1px
rgba(255, 255, 255, 0); border-color: #0f2b48; }
@@ -1077,9 +1077,9 @@ switch:backdrop:checked { border-color: #0f2b48; background-color: #215d9c; }
switch:backdrop:disabled { color: #566164; border-color: #202425; background-color: #2d3234; }
-switch slider { margin: -1px; min-width: 44px; min-height: 26px; border: 1px solid; border-radius: 3px;
transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); color: #eeeeec; border-color: black;
background-image: image(#3a4143); box-shadow: inset 0 -2px #212526; }
+switch slider { margin: -1px; min-width: 44px; min-height: 26px; border: 1px solid; border-radius: 3px;
transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); color: #eeeeec; border-color: #1b1f20;
background-image: image(#353c3e); box-shadow: inset 0 -2px #2f3436; }
-switch:hover slider { background-image: image(#383e40); box-shadow: inset 0 -2px #242829; }
+switch:hover slider { background-image: image(#41494b); box-shadow: inset 0 -2px #323739; }
switch:checked slider { border: 1px solid #0f2b48; }
@@ -1120,7 +1120,7 @@ checkbutton.text-button label:not(:only-child):first-child, radiobutton.text-but
checkbutton.text-button label:not(:only-child):last-child, radiobutton.text-button
label:not(:only-child):last-child { margin-right: 4px; }
-check, radio { margin: 0 4px; min-height: 14px; min-width: 14px; border: 1px solid; -gtk-icon-source: none;
color: #eeeeec; border-color: black; background-image: image(#3a4143); box-shadow: inset 0 -2px #212526; }
+check, radio { margin: 0 4px; min-height: 14px; min-width: 14px; border: 1px solid; -gtk-icon-source: none;
color: #eeeeec; border-color: #1b1f20; background-image: image(#353c3e); box-shadow: inset 0 -2px #2f3436; }
check:only-child, radio:only-child { margin: 0; }
@@ -1128,9 +1128,9 @@ popover check.left:dir(rtl), popover radio.left:dir(rtl) { margin-left: 0; margi
popover check.right:dir(ltr), popover radio.right:dir(ltr) { margin-left: 12px; margin-right: 0; }
-check:hover, radio:hover { background-image: image(#383e40); box-shadow: inset 0 -2px #242829; }
+check:hover, radio:hover { background-image: image(#41494b); box-shadow: inset 0 -2px #323739; }
-check:active, radio:active { background-image: image(#1c1f20); box-shadow: none; }
+check:active, radio:active { background-image: image(#272c2d); box-shadow: none; }
check:disabled, radio:disabled { border-color: #1b1f20; background-image: image(#2d3234); text-shadow: none;
-gtk-icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
@@ -1243,9 +1243,9 @@ scale fill:disabled:backdrop, scale fill:disabled { border-color: transparent; b
.osd scale fill:disabled:backdrop, .osd scale fill:disabled { border-color: transparent; background-color:
transparent; }
-scale slider { color: #eeeeec; border-color: black; background-image: image(#3a4143); box-shadow: inset 0
-2px #212526; border: 1px solid #040404; border-radius: 100%; transition: all 200ms cubic-bezier(0.25, 0.46,
0.45, 0.94); transition-property: background, border, box-shadow; }
+scale slider { color: #eeeeec; border-color: #1b1f20; background-image: image(#353c3e); box-shadow: inset 0
-2px #2f3436; border: 1px solid #040404; border-radius: 100%; transition: all 200ms cubic-bezier(0.25, 0.46,
0.45, 0.94); transition-property: background, border, box-shadow; }
-scale slider:hover { background-image: image(#383e40); box-shadow: inset 0 -2px #242829; }
+scale slider:hover { background-image: image(#41494b); box-shadow: inset 0 -2px #323739; }
scale slider:active { border-color: #0f2b48; }
@@ -1773,11 +1773,11 @@ infobar.info:backdrop label, infobar.info:backdrop, infobar.info label, infobar.
infobar.info:backdrop, infobar.question:backdrop, infobar.warning:backdrop, infobar.error:backdrop {
text-shadow: none; }
-infobar.info button, infobar.question button, infobar.warning button, infobar.error button { color: #ffffff;
border-color: #0b1e33; background-image: image(#2365a9); box-shadow: inset 0 -2px #194777; }
+infobar.info button, infobar.question button, infobar.warning button, infobar.error button { color: #ffffff;
border-color: #184472; background-image: image(#2260a0); box-shadow: inset 0 -2px #1f5995; }
-infobar.info button:hover, infobar.question button:hover, infobar.warning button:hover, infobar.error
button:hover { background-image: image(#2362a5); box-shadow: inset 0 -2px #1a4a7d; }
+infobar.info button:hover, infobar.question button:hover, infobar.warning button:hover, infobar.error
button:hover { background-image: image(#266cb5); box-shadow: inset 0 -2px #205c9a; }
-infobar.info button:active, infobar.info button:checked, infobar.question button:active, infobar.question
button:checked, infobar.warning button:active, infobar.warning button:checked, infobar.error button:active,
infobar.error button:checked { background-image: image(#17416d); box-shadow: none; }
+infobar.info button:active, infobar.info button:checked, infobar.question button:active, infobar.question
button:checked, infobar.warning button:active, infobar.warning button:checked, infobar.error button:active,
infobar.error button:checked { background-image: image(#1d4b7b); box-shadow: none; }
infobar.info button:disabled, infobar.question button:disabled, infobar.warning button:disabled,
infobar.error button:disabled { border-color: #0f2b48; background-image: image(#21558b); text-shadow: none;
-gtk-icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
@@ -1853,9 +1853,9 @@ colorswatch#add-color-button { border-radius: 5px 5px 0 0; }
colorswatch#add-color-button:only-child { border-radius: 5px; }
-colorswatch#add-color-button overlay { color: #eeeeec; border-color: black; background-image:
image(#3a4143); box-shadow: inset 0 -2px #212526; }
+colorswatch#add-color-button overlay { color: #eeeeec; border-color: #1b1f20; background-image:
image(#353c3e); box-shadow: inset 0 -2px #2f3436; }
-colorswatch#add-color-button overlay:hover { background-image: image(#383e40); box-shadow: inset 0 -2px
#242829; }
+colorswatch#add-color-button overlay:hover { background-image: image(#41494b); box-shadow: inset 0 -2px
#323739; }
colorswatch#add-color-button overlay:backdrop { border-color: #202425; background-image: image(#33393b);
text-shadow: none; -gtk-icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index 4af4a27835..33d48411ea 100644
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -200,7 +200,7 @@ treeview entry.flat:focus, treeview entry:focus { border-color: #4a90d9; }
@keyframes needs_attention { from { background-image: radial-gradient(farthest-side, #4a90d9 0%, rgba(74,
144, 217, 0) 0%); }
to { background-image: radial-gradient(farthest-side, #4a90d9 95%, rgba(74, 144, 217, 0)); } }
-notebook box > header > tabs > arrow, button.titlebutton, button { min-height: 24px; min-width: 16px;
padding: 4px 8px; border: 1px solid; border-radius: 3px; transition: all 200ms cubic-bezier(0.25, 0.46, 0.45,
0.94); color: #2e3436; border-color: #aaaaa6; background-image: image(#efefef); box-shadow: inset 0 -2px
#d2d2d0; }
+notebook box > header > tabs > arrow, button.titlebutton, button { min-height: 24px; min-width: 16px;
padding: 4px 8px; border: 1px solid; border-radius: 3px; transition: all 200ms cubic-bezier(0.25, 0.46, 0.45,
0.94); color: #2e3436; border-color: #aaaaa6; background-image: image(#efefef); box-shadow: inset 0 -2px
#dbdbd9; }
notebook box > header > tabs > arrow, button.sidebar-button, button.titlebutton, button.flat { border-color:
transparent; background-color: transparent; background-image: none; box-shadow: inset 0 1px rgba(255, 255,
255, 0); text-shadow: none; -gtk-icon-shadow: none; transition: none; }
@@ -208,9 +208,9 @@ notebook box > header > tabs > arrow:hover, button.sidebar-button:hover, button.
notebook box > header > tabs > arrow:hover:active, button.sidebar-button:hover:active,
button.titlebutton:hover:active, button.flat:hover:active { transition: all 200ms cubic-bezier(0.25, 0.46,
0.45, 0.94); }
-notebook box > header > tabs > arrow:hover, button.titlebutton:hover, button:hover { background-image:
image(#ededec); box-shadow: inset 0 -2px #d5d5d3; -gtk-icon-filter: brightness(1.2); }
+notebook box > header > tabs > arrow:hover, button.titlebutton:hover, button:hover { background-image:
image(#f7f7f7); box-shadow: inset 0 -2px #dddddb; -gtk-icon-filter: brightness(1.2); }
-notebook box > header > tabs > arrow:active, button.titlebutton:active, notebook box > header > tabs >
arrow:checked, button.titlebutton:checked, button:active, button:checked { background-image: image(#ccccca);
box-shadow: none; transition-duration: 50ms; }
+notebook box > header > tabs > arrow:active, button.titlebutton:active, notebook box > header > tabs >
arrow:checked, button.titlebutton:checked, button:active, button:checked { background-image: image(#d7d7d7);
box-shadow: none; transition-duration: 50ms; }
notebook box > header > tabs > arrow:backdrop, button.sidebar-button:backdrop, button.titlebutton:backdrop,
notebook box > header > tabs > arrow:backdrop, button.titlebutton:backdrop, button:backdrop.flat,
button:backdrop { border-color: #c0c0bd; background-image: image(#e8e8e7); text-shadow: none;
-gtk-icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); transition: 200ms ease-out;
-gtk-icon-filter: none; }
@@ -286,13 +286,13 @@ button.osd:backdrop { color: #eeeeec; border-color: rgba(0, 0, 0, 0.7); backgrou
.csd popover > contents.background.touch-selection button.flat:active, .csd popover >
contents.background.magnifier button.flat:active, popover > contents.background.touch-selection
button.flat:active, popover > contents.background.magnifier button.flat:active, .app-notification
button.flat:active, .csd popover > contents.background.touch-selection button.flat:checked, .csd popover >
contents.background.magnifier button.flat:checked, popover > contents.background.touch-selection
button.flat:checked, popover > contents.background.magnifier button.flat:checked, .app-notification
button.flat:checked, .osd button.flat:active, .osd button.flat:checked { color: white; border-color: rgba(0,
0, 0, 0.7); background-color: transparent; background-image: image(rgba(0, 0, 0, 0.7)); background-clip:
padding-box; box-shadow: none; text-shadow: none; -gtk-icon-shadow: none; outline-color: rgba(238, 238, 236,
0.3); }
-button.suggested-action { color: white; border-color: #1c5187; background-image: image(#5798dc); box-shadow:
inset 0 -2px #3a7abc; }
+button.suggested-action { color: white; border-color: #1c5187; background-image: image(#5798dc); box-shadow:
inset 0 -2px #3d83cb; }
.selection-mode button.titlebutton, button.suggested-action.flat { border-color: transparent;
background-color: transparent; background-image: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0);
text-shadow: none; -gtk-icon-shadow: none; color: #4a90d9; }
-button.suggested-action:hover { background-image: image(#5295db); box-shadow: inset 0 -2px #3c7dc0; }
+button.suggested-action:hover { background-image: image(#63a0de); box-shadow: inset 0 -2px #3f85cd; }
-button.suggested-action:active, button.suggested-action:checked { background-image: image(#3573b4);
box-shadow: none; }
+button.suggested-action:active, button.suggested-action:checked { background-image: image(#438cd8);
box-shadow: none; }
.selection-mode button.titlebutton:backdrop, button.suggested-action:backdrop,
button.suggested-action.flat:backdrop { border-color: #4a90d9; background-image: image(#4a90d9); text-shadow:
none; -gtk-icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
@@ -330,13 +330,13 @@ button.suggested-action:disabled:active label, button.suggested-action:disabled:
.osd button.suggested-action:backdrop { color: #eeeeec; border-color: rgba(0, 0, 0, 0.7); background-color:
transparent; background-image: image(rgba(74, 144, 217, 0.5)); background-clip: padding-box; box-shadow:
none; text-shadow: none; -gtk-icon-shadow: none; }
-button.destructive-action { color: white; border-color: #8e0b0b; background-image: image(#f03737);
box-shadow: inset 0 -2px #cd1e1e; }
+button.destructive-action { color: white; border-color: #8e0b0b; background-image: image(#f03737);
box-shadow: inset 0 -2px #de2020; }
button.destructive-action.flat { border-color: transparent; background-color: transparent; background-image:
none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; color:
#ef2929; }
-button.destructive-action:hover { background-image: image(#f03232); box-shadow: inset 0 -2px #d22020; }
+button.destructive-action:hover { background-image: image(#f14545); box-shadow: inset 0 -2px #e02121; }
-button.destructive-action:active, button.destructive-action:checked { background-image: image(#c31b1b);
box-shadow: none; }
+button.destructive-action:active, button.destructive-action:checked { background-image: image(#ee2323);
box-shadow: none; }
button.destructive-action:backdrop, button.destructive-action.flat:backdrop { border-color: #ef2929;
background-image: image(#ef2929); text-shadow: none; -gtk-icon-shadow: none; box-shadow: inset 0 1px
rgba(255, 255, 255, 0); }
@@ -404,11 +404,11 @@ button.circular label { padding: 0; }
.stack-switcher > button.needs-attention > label:dir(rtl), .stack-switcher > button.needs-attention >
image:dir(rtl), stacksidebar row.needs-attention > label:dir(rtl) { background-position: left 3px, left 4px; }
-.inline-toolbar toolbutton > button { color: #2e3436; border-color: #aaaaa6; background-image:
image(#efefef); box-shadow: inset 0 -2px #d2d2d0; }
+.inline-toolbar toolbutton > button { color: #2e3436; border-color: #aaaaa6; background-image:
image(#efefef); box-shadow: inset 0 -2px #dbdbd9; }
-.inline-toolbar toolbutton > button:hover { background-image: image(#ededec); box-shadow: inset 0 -2px
#d5d5d3; }
+.inline-toolbar toolbutton > button:hover { background-image: image(#f7f7f7); box-shadow: inset 0 -2px
#dddddb; }
-.inline-toolbar toolbutton > button:active, .inline-toolbar toolbutton > button:checked { background-image:
image(#ccccca); box-shadow: none; }
+.inline-toolbar toolbutton > button:active, .inline-toolbar toolbutton > button:checked { background-image:
image(#d7d7d7); box-shadow: none; }
.inline-toolbar toolbutton > button:disabled { border-color: #b6b6b3; background-image: image(#f1f1f1);
text-shadow: none; -gtk-icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
@@ -616,13 +616,13 @@ searchbar > revealer > box { padding: 6px; border-width: 0 0 1px; }
.selection-mode .titlebar:backdrop:not(headerbar), .selection-mode.titlebar:backdrop:not(headerbar),
.selection-mode headerbar:backdrop, headerbar.selection-mode:backdrop { background-color: #4a90d9;
background-image: none; box-shadow: inset 0 1px rgba(165, 200, 236, 0.88); }
-.selection-mode .titlebar:not(headerbar) button, .selection-mode.titlebar:not(headerbar) button,
.selection-mode headerbar button, headerbar.selection-mode button { color: #ffffff; border-color: #1c5187;
background-image: image(#5798dc); box-shadow: inset 0 -2px #3a7abc; }
+.selection-mode .titlebar:not(headerbar) button, .selection-mode.titlebar:not(headerbar) button,
.selection-mode headerbar button, headerbar.selection-mode button { color: #ffffff; border-color: #1c5187;
background-image: image(#5798dc); box-shadow: inset 0 -2px #3d83cb; }
.selection-mode .titlebar:not(headerbar) button.flat, .selection-mode.titlebar:not(headerbar) button.flat,
.selection-mode headerbar button.flat, headerbar.selection-mode button.flat { border-color: transparent;
background-color: transparent; background-image: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0);
text-shadow: none; -gtk-icon-shadow: none; }
-.selection-mode .titlebar:not(headerbar) button:hover, .selection-mode.titlebar:not(headerbar) button:hover,
.selection-mode headerbar button:hover, headerbar.selection-mode button:hover { background-image:
image(#5295db); box-shadow: inset 0 -2px #3c7dc0; }
+.selection-mode .titlebar:not(headerbar) button:hover, .selection-mode.titlebar:not(headerbar) button:hover,
.selection-mode headerbar button:hover, headerbar.selection-mode button:hover { background-image:
image(#63a0de); box-shadow: inset 0 -2px #3f85cd; }
-.selection-mode .titlebar:not(headerbar) button:active, .selection-mode .titlebar:not(headerbar)
button:checked, .selection-mode.titlebar:not(headerbar) button:active,
.selection-mode.titlebar:not(headerbar) button:checked, .selection-mode headerbar button:active,
.selection-mode headerbar button:checked, headerbar.selection-mode button:active, headerbar.selection-mode
button:checked { background-image: image(#3573b4); box-shadow: none; }
+.selection-mode .titlebar:not(headerbar) button:active, .selection-mode .titlebar:not(headerbar)
button:checked, .selection-mode.titlebar:not(headerbar) button:active,
.selection-mode.titlebar:not(headerbar) button:checked, .selection-mode headerbar button:active,
.selection-mode headerbar button:checked, headerbar.selection-mode button:active, headerbar.selection-mode
button:checked { background-image: image(#438cd8); box-shadow: none; }
.selection-mode .titlebar:not(headerbar) button:backdrop.flat, .selection-mode .titlebar:not(headerbar)
button:backdrop, .selection-mode.titlebar:not(headerbar) button:backdrop.flat,
.selection-mode.titlebar:not(headerbar) button:backdrop, .selection-mode headerbar button:backdrop.flat,
.selection-mode headerbar button:backdrop, headerbar.selection-mode button:backdrop.flat,
headerbar.selection-mode button:backdrop { border-color: #4a90d9; background-image: image(#4a90d9);
text-shadow: none; -gtk-icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); -gtk-icon-filter:
none; border-color: #184472; }
@@ -650,11 +650,11 @@ searchbar > revealer > box { padding: 6px; border-width: 0 0 1px; }
.selection-mode .titlebar:not(headerbar) button:disabled:active label, .selection-mode
.titlebar:not(headerbar) button:disabled:active, .selection-mode .titlebar:not(headerbar)
button:disabled:checked label, .selection-mode .titlebar:not(headerbar) button:disabled:checked,
.selection-mode.titlebar:not(headerbar) button:disabled:active label, .selection-mode.titlebar:not(headerbar)
button:disabled:active, .selection-mode.titlebar:not(headerbar) button:disabled:checked label,
.selection-mode.titlebar:not(headerbar) button:disabled:checked, .selection-mode headerbar
button:disabled:active label, .selection-mode headerbar button:disabled:active, .selection-mode headerbar
button:disabled:checked label, .selection-mode headerbar button:disabled:checked, headerbar.selection-mode
button:disabled:active label, headerbar.selection-mode button:disabled:active, headerbar.selection-mode
button:disabled:checked label, headerbar.selection-mode button:disabled:checked { color: #b4d1ef; }
-.selection-mode .titlebar:not(headerbar) button.suggested-action, .selection-mode.titlebar:not(headerbar)
button.suggested-action, .selection-mode headerbar button.suggested-action, headerbar.selection-mode
button.suggested-action { color: #2e3436; border-color: #aaaaa6; background-image: image(#efefef);
box-shadow: inset 0 -2px #d2d2d0; border-color: #184472; }
+.selection-mode .titlebar:not(headerbar) button.suggested-action, .selection-mode.titlebar:not(headerbar)
button.suggested-action, .selection-mode headerbar button.suggested-action, headerbar.selection-mode
button.suggested-action { color: #2e3436; border-color: #aaaaa6; background-image: image(#efefef);
box-shadow: inset 0 -2px #dbdbd9; border-color: #184472; }
-.selection-mode .titlebar:not(headerbar) button.suggested-action:hover,
.selection-mode.titlebar:not(headerbar) button.suggested-action:hover, .selection-mode headerbar
button.suggested-action:hover, headerbar.selection-mode button.suggested-action:hover { background-image:
image(#ededec); box-shadow: inset 0 -2px #d5d5d3; border-color: #184472; }
+.selection-mode .titlebar:not(headerbar) button.suggested-action:hover,
.selection-mode.titlebar:not(headerbar) button.suggested-action:hover, .selection-mode headerbar
button.suggested-action:hover, headerbar.selection-mode button.suggested-action:hover { background-image:
image(#f7f7f7); box-shadow: inset 0 -2px #dddddb; border-color: #184472; }
-.selection-mode .titlebar:not(headerbar) button.suggested-action:active,
.selection-mode.titlebar:not(headerbar) button.suggested-action:active, .selection-mode headerbar
button.suggested-action:active, headerbar.selection-mode button.suggested-action:active { background-image:
image(#ccccca); box-shadow: none; border-color: #184472; }
+.selection-mode .titlebar:not(headerbar) button.suggested-action:active,
.selection-mode.titlebar:not(headerbar) button.suggested-action:active, .selection-mode headerbar
button.suggested-action:active, headerbar.selection-mode button.suggested-action:active { background-image:
image(#d7d7d7); box-shadow: none; border-color: #184472; }
.selection-mode .titlebar:not(headerbar) button.suggested-action:disabled,
.selection-mode.titlebar:not(headerbar) button.suggested-action:disabled, .selection-mode headerbar
button.suggested-action:disabled, headerbar.selection-mode button.suggested-action:disabled { border-color:
#b6b6b3; background-image: image(#f1f1f1); text-shadow: none; -gtk-icon-shadow: none; box-shadow: inset 0 1px
rgba(255, 255, 255, 0); border-color: #184472; }
@@ -1085,9 +1085,9 @@ switch:backdrop:checked { color: #e8e8e7; border-color: #4a90d9; background-colo
switch:backdrop:disabled { color: #c3c3c0; border-color: #c0c0bd; background-color: #f1f1f1; }
-switch slider { margin: -1px; min-width: 44px; min-height: 26px; border: 1px solid; border-radius: 3px;
transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); color: #2e3436; border-color: #aaaaa6;
background-image: image(#efefef); box-shadow: inset 0 -2px #d2d2d0; }
+switch slider { margin: -1px; min-width: 44px; min-height: 26px; border: 1px solid; border-radius: 3px;
transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); color: #2e3436; border-color: #aaaaa6;
background-image: image(#efefef); box-shadow: inset 0 -2px #dbdbd9; }
-switch:hover slider { background-image: image(#ededec); box-shadow: inset 0 -2px #d5d5d3; }
+switch:hover slider { background-image: image(#f7f7f7); box-shadow: inset 0 -2px #dddddb; }
switch:checked slider { border: 1px solid #184472; }
@@ -1138,7 +1138,7 @@ checkbutton.text-button label:not(:only-child):first-child, radiobutton.text-but
checkbutton.text-button label:not(:only-child):last-child, radiobutton.text-button
label:not(:only-child):last-child { margin-right: 4px; }
-check, radio { margin: 0 4px; min-height: 14px; min-width: 14px; border: 1px solid; -gtk-icon-source: none;
color: #2e3436; border-color: #aaaaa6; background-image: image(#efefef); box-shadow: inset 0 -2px #d2d2d0; }
+check, radio { margin: 0 4px; min-height: 14px; min-width: 14px; border: 1px solid; -gtk-icon-source: none;
color: #2e3436; border-color: #aaaaa6; background-image: image(#efefef); box-shadow: inset 0 -2px #dbdbd9; }
check:only-child, radio:only-child { margin: 0; }
@@ -1146,9 +1146,9 @@ popover check.left:dir(rtl), popover radio.left:dir(rtl) { margin-left: 0; margi
popover check.right:dir(ltr), popover radio.right:dir(ltr) { margin-left: 12px; margin-right: 0; }
-check:hover, radio:hover { background-image: image(#ededec); box-shadow: inset 0 -2px #d5d5d3; }
+check:hover, radio:hover { background-image: image(#f7f7f7); box-shadow: inset 0 -2px #dddddb; }
-check:active, radio:active { background-image: image(#ccccca); box-shadow: none; }
+check:active, radio:active { background-image: image(#d7d7d7); box-shadow: none; }
check:disabled, radio:disabled { border-color: #b6b6b3; background-image: image(#f1f1f1); text-shadow: none;
-gtk-icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
@@ -1263,9 +1263,9 @@ scale fill:disabled:backdrop, scale fill:disabled { border-color: transparent; b
.osd scale fill:disabled:backdrop, .osd scale fill:disabled { border-color: transparent; background-color:
transparent; }
-scale slider { color: #2e3436; border-color: #aaaaa6; background-image: image(#efefef); box-shadow: inset 0
-2px #d2d2d0; border: 1px solid #898984; border-radius: 100%; transition: all 200ms cubic-bezier(0.25, 0.46,
0.45, 0.94); transition-property: background, border, box-shadow; }
+scale slider { color: #2e3436; border-color: #aaaaa6; background-image: image(#efefef); box-shadow: inset 0
-2px #dbdbd9; border: 1px solid #898984; border-radius: 100%; transition: all 200ms cubic-bezier(0.25, 0.46,
0.45, 0.94); transition-property: background, border, box-shadow; }
-scale slider:hover { background-image: image(#ededec); box-shadow: inset 0 -2px #d5d5d3; }
+scale slider:hover { background-image: image(#f7f7f7); box-shadow: inset 0 -2px #dddddb; }
scale slider:active { border-color: #184472; }
@@ -1793,11 +1793,11 @@ infobar.info:backdrop label, infobar.info:backdrop, infobar.info label, infobar.
infobar.info:backdrop, infobar.question:backdrop, infobar.warning:backdrop, infobar.error:backdrop {
text-shadow: none; }
-infobar.info button, infobar.question button, infobar.warning button, infobar.error button { color: #ffffff;
border-color: #1c5187; background-image: image(#5798dc); box-shadow: inset 0 -2px #3a7abc; }
+infobar.info button, infobar.question button, infobar.warning button, infobar.error button { color: #ffffff;
border-color: #1c5187; background-image: image(#5798dc); box-shadow: inset 0 -2px #3d83cb; }
-infobar.info button:hover, infobar.question button:hover, infobar.warning button:hover, infobar.error
button:hover { background-image: image(#5295db); box-shadow: inset 0 -2px #3c7dc0; }
+infobar.info button:hover, infobar.question button:hover, infobar.warning button:hover, infobar.error
button:hover { background-image: image(#63a0de); box-shadow: inset 0 -2px #3f85cd; }
-infobar.info button:active, infobar.info button:checked, infobar.question button:active, infobar.question
button:checked, infobar.warning button:active, infobar.warning button:checked, infobar.error button:active,
infobar.error button:checked { background-image: image(#3573b4); box-shadow: none; }
+infobar.info button:active, infobar.info button:checked, infobar.question button:active, infobar.question
button:checked, infobar.warning button:active, infobar.warning button:checked, infobar.error button:active,
infobar.error button:checked { background-image: image(#438cd8); box-shadow: none; }
infobar.info button:disabled, infobar.question button:disabled, infobar.warning button:disabled,
infobar.error button:disabled { border-color: #215d9c; background-image: image(#65a1df); text-shadow: none;
-gtk-icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
@@ -1873,9 +1873,9 @@ colorswatch#add-color-button { border-radius: 5px 5px 0 0; }
colorswatch#add-color-button:only-child { border-radius: 5px; }
-colorswatch#add-color-button overlay { color: #2e3436; border-color: #aaaaa6; background-image:
image(#efefef); box-shadow: inset 0 -2px #d2d2d0; }
+colorswatch#add-color-button overlay { color: #2e3436; border-color: #aaaaa6; background-image:
image(#efefef); box-shadow: inset 0 -2px #dbdbd9; }
-colorswatch#add-color-button overlay:hover { background-image: image(#ededec); box-shadow: inset 0 -2px
#d5d5d3; }
+colorswatch#add-color-button overlay:hover { background-image: image(#f7f7f7); box-shadow: inset 0 -2px
#dddddb; }
colorswatch#add-color-button overlay:backdrop { border-color: #c0c0bd; background-image: image(#e8e8e7);
text-shadow: none; -gtk-icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]