From f442529bbc2495b7e635607810c8a1b355645ad9 Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Mon, 21 Sep 2015 17:50:44 +0200 Subject: [PATCH] button and entry drawing tweaks --- common/gnome-shell/3.16/gnome-shell-dark.css | 60 +++++++++++-------- common/gnome-shell/3.16/gnome-shell.css | 54 ++++++++++------- common/gnome-shell/3.16/sass/_drawing.scss | 20 ++++--- common/gnome-shell/3.18/sass/_drawing.scss | 20 ++++--- common/gtk-3.0/3.14/gtk-contained-dark.css | 16 ++--- common/gtk-3.0/3.14/gtk-contained-darker.css | 16 ++--- .../gtk-3.0/3.14/gtk-contained-solid-dark.css | 16 ++--- .../3.14/gtk-contained-solid-darker.css | 16 ++--- common/gtk-3.0/3.14/gtk-contained-solid.css | 16 ++--- common/gtk-3.0/3.14/gtk-contained.css | 16 ++--- common/gtk-3.0/3.14/sass/_drawing.scss | 4 +- common/gtk-3.0/3.16/gtk-contained-dark.css | 16 ++--- common/gtk-3.0/3.16/gtk-contained-darker.css | 16 ++--- .../gtk-3.0/3.16/gtk-contained-solid-dark.css | 16 ++--- .../3.16/gtk-contained-solid-darker.css | 16 ++--- common/gtk-3.0/3.16/gtk-contained-solid.css | 16 ++--- common/gtk-3.0/3.16/gtk-contained.css | 16 ++--- common/gtk-3.0/3.16/sass/_drawing.scss | 4 +- common/gtk-3.0/3.18/gtk-contained-dark.css | 18 +++--- common/gtk-3.0/3.18/gtk-contained-darker.css | 18 +++--- .../gtk-3.0/3.18/gtk-contained-solid-dark.css | 18 +++--- .../3.18/gtk-contained-solid-darker.css | 18 +++--- common/gtk-3.0/3.18/gtk-contained-solid.css | 18 +++--- common/gtk-3.0/3.18/gtk-contained.css | 18 +++--- common/gtk-3.0/3.18/sass/_drawing.scss | 4 +- 25 files changed, 247 insertions(+), 219 deletions(-) diff --git a/common/gnome-shell/3.16/gnome-shell-dark.css b/common/gnome-shell/3.16/gnome-shell-dark.css index 8d1fc4c..e85a580 100644 --- a/common/gnome-shell/3.16/gnome-shell-dark.css +++ b/common/gnome-shell/3.16/gnome-shell-dark.css @@ -34,35 +34,35 @@ stage { color: #D3DAE3; background-color: #444a58; border: 1px solid #2b2e39; - box-shadow: inset 0 2px 4px rgba(68, 74, 88, 0.05); } + box-shadow: inset 0 1px rgba(68, 74, 88, 0.05); } .button:focus, .notification-banner .notification-button:focus, .hotplug-notification-item:focus { text-shadow: 0 1px rgba(64, 69, 82, 0); color: #D3DAE3; background-color: #444a58; border: 1px solid #5294E2; - box-shadow: inset 0 2px 4px rgba(68, 74, 88, 0.05); } + box-shadow: inset 0 1px rgba(68, 74, 88, 0.05); } .button:hover, .notification-banner .notification-button:hover, .hotplug-notification-item:hover { text-shadow: 0 1px rgba(64, 69, 82, 0); color: #D3DAE3; background-color: #505666; border: 1px solid #2b2e39; - box-shadow: inset 0 2px 4px rgba(80, 86, 102, 0.05); } + box-shadow: inset 0 1px rgba(80, 86, 102, 0.05); } .button:hover:focus, .notification-banner .notification-button:hover:focus, .hotplug-notification-item:hover:focus { text-shadow: 0 1px rgba(64, 69, 82, 0); color: #D3DAE3; background-color: #444a58; border: 1px solid #5294E2; - box-shadow: inset 0 2px 4px rgba(68, 74, 88, 0.05); } + box-shadow: inset 0 1px rgba(68, 74, 88, 0.05); } .button:active, .notification-banner .notification-button:active, .hotplug-notification-item:active, .button:active:focus, .notification-banner .notification-button:active:focus, .hotplug-notification-item:active:focus { text-shadow: 0 1px rgba(64, 69, 82, 0); color: #ffffff; background-color: #5294E2; - border: 1px solid #5294E2; + border: 1px solid #2b2e39; box-shadow: inset 0 1px rgba(82, 148, 226, 0.05); } .button:insensitive, .notification-banner .notification-button:insensitive, .hotplug-notification-item:insensitive { @@ -70,30 +70,34 @@ stage { color: rgba(211, 218, 227, 0.45); border: 1px solid rgba(43, 46, 57, 0.55); background-color: rgba(68, 74, 88, 0.55); - box-shadow: inset 0 2px 4px rgba(68, 74, 88, 0.05); } + box-shadow: inset 0 1px rgba(68, 74, 88, 0.05); } .modal-dialog-button-box .button { text-shadow: 0 1px rgba(64, 69, 82, 0); color: #BAC3CF; border: 1px solid rgba(26, 28, 34, 0.35); - background-color: rgba(102, 109, 132, 0.35); } + background-color: rgba(102, 109, 132, 0.35); + box-shadow: inset 0 1px rgba(0, 0, 0, 0.05); } .modal-dialog-button-box .button:hover { text-shadow: 0 1px rgba(64, 69, 82, 0); color: #BAC3CF; border: 1px solid rgba(26, 28, 34, 0.35); - background-color: rgba(119, 127, 151, 0.45); } + background-color: rgba(119, 127, 151, 0.45); + box-shadow: inset 0 1px rgba(0, 0, 0, 0.05); } .modal-dialog-button-box .button:focus { color: #5294E2; } .modal-dialog-button-box .button:active { text-shadow: 0 1px rgba(64, 69, 82, 0); color: #ffffff; - border: 1px solid #5294E2; - background-color: #5294E2; } + border: 1px solid rgba(26, 28, 34, 0.35); + background-color: #5294E2; + box-shadow: inset 0 1px rgba(82, 148, 226, 0.05); } .modal-dialog-button-box .button:insensitive { text-shadow: 0 1px rgba(64, 69, 82, 0); color: #5d626e; border: 1px solid rgba(26, 28, 34, 0.35); - background-color: rgba(102, 109, 132, 0.2); } + background-color: rgba(102, 109, 132, 0.2); + box-shadow: inset 0 1px rgba(0, 0, 0, 0.05); } StEntry { padding: 7px; @@ -767,14 +771,14 @@ StScrollBar { color: #D3DAE3; background-color: #505666; border: 1px solid #2b2e39; - box-shadow: inset 0 2px 4px rgba(80, 86, 102, 0.05); } + box-shadow: inset 0 1px rgba(80, 86, 102, 0.05); } .datemenu-today-button:active, .world-clocks-button:active, .message-list-section-title:active { text-shadow: 0 1px rgba(64, 69, 82, 0); color: #ffffff; background-color: #5294E2; - border: 1px solid #5294E2; + border: 1px solid #2b2e39; box-shadow: inset 0 1px rgba(82, 148, 226, 0.05); } .datemenu-today-button .date-label { @@ -1235,12 +1239,14 @@ StScrollBar { text-shadow: 0 1px rgba(64, 69, 82, 0); color: #BAC3CF; border: 1px solid rgba(26, 28, 34, 0.35); - background-color: rgba(102, 109, 132, 0.35); } + background-color: rgba(102, 109, 132, 0.35); + box-shadow: inset 0 1px rgba(0, 0, 0, 0.05); } .app-view-control:hover { text-shadow: 0 1px rgba(64, 69, 82, 0); color: #BAC3CF; border: 1px solid rgba(26, 28, 34, 0.35); - background-color: rgba(119, 127, 151, 0.45); } + background-color: rgba(119, 127, 151, 0.45); + box-shadow: inset 0 1px rgba(0, 0, 0, 0.05); } .app-view-control:checked { color: #ffffff; background-color: #5294E2; } @@ -1560,22 +1566,26 @@ StScrollBar { text-shadow: 0 1px rgba(64, 69, 82, 0); color: #BAC3CF; border: 1px solid rgba(26, 28, 34, 0.35); - background-color: rgba(102, 109, 132, 0.35); } + background-color: rgba(102, 109, 132, 0.35); + box-shadow: inset 0 1px rgba(0, 0, 0, 0.05); } .keyboard-key:hover { text-shadow: 0 1px rgba(64, 69, 82, 0); color: #BAC3CF; border: 1px solid rgba(26, 28, 34, 0.35); - background-color: rgba(119, 127, 151, 0.45); } + background-color: rgba(119, 127, 151, 0.45); + box-shadow: inset 0 1px rgba(0, 0, 0, 0.05); } .keyboard-key:active, .keyboard-key:checked { text-shadow: 0 1px rgba(64, 69, 82, 0); color: #ffffff; - border: 1px solid #5294E2; - background-color: #5294E2; } + border: 1px solid rgba(26, 28, 34, 0.35); + background-color: #5294E2; + box-shadow: inset 0 1px rgba(82, 148, 226, 0.05); } .keyboard-key:grayed { text-shadow: 0 1px rgba(64, 69, 82, 0); color: #5d626e; border: 1px solid rgba(26, 28, 34, 0.35); - background-color: rgba(102, 109, 132, 0.2); } + background-color: rgba(102, 109, 132, 0.2); + box-shadow: inset 0 1px rgba(0, 0, 0, 0.05); } .keyboard-subkeys { color: #BAC3CF; @@ -1651,25 +1661,25 @@ StScrollBar { color: #D3DAE3; background-color: #444a58; border: 1px solid #2b2e39; - box-shadow: inset 0 2px 4px rgba(68, 74, 88, 0.05); } + box-shadow: inset 0 1px rgba(68, 74, 88, 0.05); } .login-dialog .modal-dialog-button:default:hover, .login-dialog .modal-dialog-button:default:focus { text-shadow: 0 1px rgba(64, 69, 82, 0); color: #D3DAE3; background-color: #505666; border: 1px solid #2b2e39; - box-shadow: inset 0 2px 4px rgba(80, 86, 102, 0.05); } + box-shadow: inset 0 1px rgba(80, 86, 102, 0.05); } .login-dialog .modal-dialog-button:default:active { text-shadow: 0 1px rgba(64, 69, 82, 0); color: #ffffff; background-color: #5294E2; - border: 1px solid #5294E2; + border: 1px solid #2b2e39; box-shadow: inset 0 1px rgba(82, 148, 226, 0.05); } .login-dialog .modal-dialog-button:default:insensitive { text-shadow: 0 1px rgba(64, 69, 82, 0); color: rgba(211, 218, 227, 0.45); border: 1px solid rgba(43, 46, 57, 0.55); background-color: rgba(68, 74, 88, 0.55); - box-shadow: inset 0 2px 4px rgba(68, 74, 88, 0.05); } + box-shadow: inset 0 1px rgba(68, 74, 88, 0.05); } .login-dialog-logo-bin { padding: 24px 0px; } @@ -1880,7 +1890,7 @@ StScrollBar { .lg-dialog StEntry:focus { color: #ffffff; background-color: #5294E2; - border: 1px solid #5294E2; + border: 1px solid rgba(26, 28, 34, 0.35); box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.05); } .lg-dialog .shell-link { diff --git a/common/gnome-shell/3.16/gnome-shell.css b/common/gnome-shell/3.16/gnome-shell.css index a7f19aa..7c174b3 100644 --- a/common/gnome-shell/3.16/gnome-shell.css +++ b/common/gnome-shell/3.16/gnome-shell.css @@ -34,28 +34,28 @@ stage { color: #5c616c; background-color: #fbfbfc; border: 1px solid #cfd6e6; - box-shadow: inset 0 2px 4px rgba(251, 251, 252, 0.05); } + box-shadow: inset 0 1px rgba(251, 251, 252, 0.05); } .button:focus, .notification-banner .notification-button:focus, .hotplug-notification-item:focus { text-shadow: 0 1px rgba(255, 255, 255, 0); color: #5c616c; background-color: #fbfbfc; border: 1px solid #5294E2; - box-shadow: inset 0 2px 4px rgba(251, 251, 252, 0.05); } + box-shadow: inset 0 1px rgba(251, 251, 252, 0.05); } .button:hover, .notification-banner .notification-button:hover, .hotplug-notification-item:hover { text-shadow: 0 1px rgba(255, 255, 255, 0); color: #5c616c; background-color: white; border: 1px solid #cfd6e6; - box-shadow: inset 0 2px 4px rgba(255, 255, 255, 0.05); } + box-shadow: inset 0 1px rgba(255, 255, 255, 0.05); } .button:hover:focus, .notification-banner .notification-button:hover:focus, .hotplug-notification-item:hover:focus { text-shadow: 0 1px rgba(255, 255, 255, 0); color: #5c616c; background-color: #fbfbfc; border: 1px solid #5294E2; - box-shadow: inset 0 2px 4px rgba(251, 251, 252, 0.05); } + box-shadow: inset 0 1px rgba(251, 251, 252, 0.05); } .button:active, .notification-banner .notification-button:active, .hotplug-notification-item:active, .button:active:focus, .notification-banner .notification-button:active:focus, .hotplug-notification-item:active:focus { @@ -70,30 +70,34 @@ stage { color: rgba(92, 97, 108, 0.55); border: 1px solid rgba(207, 214, 230, 0.55); background-color: rgba(251, 251, 252, 0.55); - box-shadow: inset 0 2px 4px rgba(251, 251, 252, 0.05); } + box-shadow: inset 0 1px rgba(251, 251, 252, 0.05); } .modal-dialog-button-box .button { text-shadow: 0 1px rgba(255, 255, 255, 0); color: #BAC3CF; border: 1px solid rgba(26, 28, 34, 0.35); - background-color: rgba(102, 109, 132, 0.35); } + background-color: rgba(102, 109, 132, 0.35); + box-shadow: inset 0 1px rgba(0, 0, 0, 0.05); } .modal-dialog-button-box .button:hover { text-shadow: 0 1px rgba(255, 255, 255, 0); color: #BAC3CF; border: 1px solid rgba(26, 28, 34, 0.35); - background-color: rgba(119, 127, 151, 0.45); } + background-color: rgba(119, 127, 151, 0.45); + box-shadow: inset 0 1px rgba(0, 0, 0, 0.05); } .modal-dialog-button-box .button:focus { color: #5294E2; } .modal-dialog-button-box .button:active { text-shadow: 0 1px rgba(255, 255, 255, 0); color: #ffffff; - border: 1px solid #5294E2; - background-color: #5294E2; } + border: 1px solid rgba(26, 28, 34, 0.35); + background-color: #5294E2; + box-shadow: inset 0 1px rgba(82, 148, 226, 0.05); } .modal-dialog-button-box .button:insensitive { text-shadow: 0 1px rgba(255, 255, 255, 0); color: #5d626e; border: 1px solid rgba(26, 28, 34, 0.35); - background-color: rgba(102, 109, 132, 0.2); } + background-color: rgba(102, 109, 132, 0.2); + box-shadow: inset 0 1px rgba(0, 0, 0, 0.05); } StEntry { padding: 7px; @@ -767,7 +771,7 @@ StScrollBar { color: #5c616c; background-color: white; border: 1px solid #cfd6e6; - box-shadow: inset 0 2px 4px rgba(255, 255, 255, 0.05); } + box-shadow: inset 0 1px rgba(255, 255, 255, 0.05); } .datemenu-today-button:active, .world-clocks-button:active, .message-list-section-title:active { @@ -1235,12 +1239,14 @@ StScrollBar { text-shadow: 0 1px rgba(255, 255, 255, 0); color: #BAC3CF; border: 1px solid rgba(26, 28, 34, 0.35); - background-color: rgba(102, 109, 132, 0.35); } + background-color: rgba(102, 109, 132, 0.35); + box-shadow: inset 0 1px rgba(0, 0, 0, 0.05); } .app-view-control:hover { text-shadow: 0 1px rgba(255, 255, 255, 0); color: #BAC3CF; border: 1px solid rgba(26, 28, 34, 0.35); - background-color: rgba(119, 127, 151, 0.45); } + background-color: rgba(119, 127, 151, 0.45); + box-shadow: inset 0 1px rgba(0, 0, 0, 0.05); } .app-view-control:checked { color: #ffffff; background-color: #5294E2; } @@ -1560,22 +1566,26 @@ StScrollBar { text-shadow: 0 1px rgba(255, 255, 255, 0); color: #BAC3CF; border: 1px solid rgba(26, 28, 34, 0.35); - background-color: rgba(102, 109, 132, 0.35); } + background-color: rgba(102, 109, 132, 0.35); + box-shadow: inset 0 1px rgba(0, 0, 0, 0.05); } .keyboard-key:hover { text-shadow: 0 1px rgba(255, 255, 255, 0); color: #BAC3CF; border: 1px solid rgba(26, 28, 34, 0.35); - background-color: rgba(119, 127, 151, 0.45); } + background-color: rgba(119, 127, 151, 0.45); + box-shadow: inset 0 1px rgba(0, 0, 0, 0.05); } .keyboard-key:active, .keyboard-key:checked { text-shadow: 0 1px rgba(255, 255, 255, 0); color: #ffffff; - border: 1px solid #5294E2; - background-color: #5294E2; } + border: 1px solid rgba(26, 28, 34, 0.35); + background-color: #5294E2; + box-shadow: inset 0 1px rgba(82, 148, 226, 0.05); } .keyboard-key:grayed { text-shadow: 0 1px rgba(255, 255, 255, 0); color: #5d626e; border: 1px solid rgba(26, 28, 34, 0.35); - background-color: rgba(102, 109, 132, 0.2); } + background-color: rgba(102, 109, 132, 0.2); + box-shadow: inset 0 1px rgba(0, 0, 0, 0.05); } .keyboard-subkeys { color: #BAC3CF; @@ -1651,13 +1661,13 @@ StScrollBar { color: #5c616c; background-color: #fbfbfc; border: 1px solid #cfd6e6; - box-shadow: inset 0 2px 4px rgba(251, 251, 252, 0.05); } + box-shadow: inset 0 1px rgba(251, 251, 252, 0.05); } .login-dialog .modal-dialog-button:default:hover, .login-dialog .modal-dialog-button:default:focus { text-shadow: 0 1px rgba(255, 255, 255, 0); color: #5c616c; background-color: white; border: 1px solid #cfd6e6; - box-shadow: inset 0 2px 4px rgba(255, 255, 255, 0.05); } + box-shadow: inset 0 1px rgba(255, 255, 255, 0.05); } .login-dialog .modal-dialog-button:default:active { text-shadow: 0 1px rgba(255, 255, 255, 0); color: #ffffff; @@ -1669,7 +1679,7 @@ StScrollBar { color: rgba(92, 97, 108, 0.55); border: 1px solid rgba(207, 214, 230, 0.55); background-color: rgba(251, 251, 252, 0.55); - box-shadow: inset 0 2px 4px rgba(251, 251, 252, 0.05); } + box-shadow: inset 0 1px rgba(251, 251, 252, 0.05); } .login-dialog-logo-bin { padding: 24px 0px; } @@ -1880,7 +1890,7 @@ StScrollBar { .lg-dialog StEntry:focus { color: #ffffff; background-color: #5294E2; - border: 1px solid #5294E2; + border: 1px solid rgba(26, 28, 34, 0.35); box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.05); } .lg-dialog .shell-link { diff --git a/common/gnome-shell/3.16/sass/_drawing.scss b/common/gnome-shell/3.16/sass/_drawing.scss index 7cf8812..c074950 100644 --- a/common/gnome-shell/3.16/sass/_drawing.scss +++ b/common/gnome-shell/3.16/sass/_drawing.scss @@ -47,7 +47,7 @@ @if $t==osd-focus { color: $selected_fg_color; background-color: $selected_bg_color; - border: 1px solid $selected_bg_color; + border: 1px solid $osd_entry_border; box-shadow: inset 0 2px 4px transparentize(black, 0.95); } @@ -76,7 +76,7 @@ color: $fg_color; background-color: $button_bg; border: 1px solid $button_border; - box-shadow: inset 0 2px 4px transparentize($button_bg, 0.95); + box-shadow: inset 0 1px transparentize($button_bg, 0.95); } @else if $t==focus { @@ -86,7 +86,7 @@ color: $fg_color; background-color: $button_bg; border: 1px solid $selected_bg_color; - box-shadow: inset 0 2px 4px transparentize($button_bg, 0.95); + box-shadow: inset 0 1px transparentize($button_bg, 0.95); } @else if $t==focus-hover { @@ -96,7 +96,7 @@ color: $fg_color; background-color: $button_bg; border: 1px solid $selected_bg_color; - box-shadow: inset 0 2px 4px transparentize($button_bg, 0.95); + box-shadow: inset 0 1px transparentize($button_bg, 0.95); } @else if $t==hover { @@ -106,7 +106,7 @@ color: $fg_color; background-color: lighten($button_bg, 5%); border: 1px solid $button_border; - box-shadow: inset 0 2px 4px transparentize(lighten($button_bg, 5%), 0.95); + box-shadow: inset 0 1px transparentize(lighten($button_bg, 5%), 0.95); } @else if $t==active { @@ -115,7 +115,7 @@ // color: $selected_fg_color; background-color: $selected_bg_color; - border: 1px solid $selected_bg_color; + border: 1px solid if($variant=='light', $selected_bg_color, $button_border); box-shadow: inset 0 1px transparentize($selected_bg_color, 0.95); } @@ -126,7 +126,7 @@ color: $insensitive_fg_color; border: 1px solid transparentize($button_border, 0.45); background-color: transparentize($button_bg, 0.45); - box-shadow: inset 0 2px 4px transparentize($button_bg, 0.95); + box-shadow: inset 0 1px transparentize($button_bg, 0.95); } @else if $t==osd { @@ -136,6 +136,7 @@ color: $osd_fg_color; border: 1px solid $osd_button_border; background-color: $osd_button_bg; + box-shadow: inset 0 1px transparentize(black, 0.95); } @else if $t==osd-hover { @@ -145,6 +146,7 @@ color: $osd_fg_color; border: 1px solid $osd_button_border; background-color: opacify(lighten($osd_button_bg, 7%), 0.1); + box-shadow: inset 0 1px transparentize(black, 0.95); } @else if $t==osd-active { @@ -152,8 +154,9 @@ // active osd button // color: $selected_fg_color; - border: 1px solid $selected_bg_color; + border: 1px solid $osd_button_border; background-color: $selected_bg_color; + box-shadow: inset 0 1px transparentize($selected_bg_color, 0.95); } @else if $t==osd-insensitive { @@ -163,5 +166,6 @@ color: $osd_insensitive_fg_color; border: 1px solid $osd_button_border; background-color: transparentize($osd_button_bg, 0.15); + box-shadow: inset 0 1px transparentize(black, 0.95); } } diff --git a/common/gnome-shell/3.18/sass/_drawing.scss b/common/gnome-shell/3.18/sass/_drawing.scss index 7cf8812..c074950 100644 --- a/common/gnome-shell/3.18/sass/_drawing.scss +++ b/common/gnome-shell/3.18/sass/_drawing.scss @@ -47,7 +47,7 @@ @if $t==osd-focus { color: $selected_fg_color; background-color: $selected_bg_color; - border: 1px solid $selected_bg_color; + border: 1px solid $osd_entry_border; box-shadow: inset 0 2px 4px transparentize(black, 0.95); } @@ -76,7 +76,7 @@ color: $fg_color; background-color: $button_bg; border: 1px solid $button_border; - box-shadow: inset 0 2px 4px transparentize($button_bg, 0.95); + box-shadow: inset 0 1px transparentize($button_bg, 0.95); } @else if $t==focus { @@ -86,7 +86,7 @@ color: $fg_color; background-color: $button_bg; border: 1px solid $selected_bg_color; - box-shadow: inset 0 2px 4px transparentize($button_bg, 0.95); + box-shadow: inset 0 1px transparentize($button_bg, 0.95); } @else if $t==focus-hover { @@ -96,7 +96,7 @@ color: $fg_color; background-color: $button_bg; border: 1px solid $selected_bg_color; - box-shadow: inset 0 2px 4px transparentize($button_bg, 0.95); + box-shadow: inset 0 1px transparentize($button_bg, 0.95); } @else if $t==hover { @@ -106,7 +106,7 @@ color: $fg_color; background-color: lighten($button_bg, 5%); border: 1px solid $button_border; - box-shadow: inset 0 2px 4px transparentize(lighten($button_bg, 5%), 0.95); + box-shadow: inset 0 1px transparentize(lighten($button_bg, 5%), 0.95); } @else if $t==active { @@ -115,7 +115,7 @@ // color: $selected_fg_color; background-color: $selected_bg_color; - border: 1px solid $selected_bg_color; + border: 1px solid if($variant=='light', $selected_bg_color, $button_border); box-shadow: inset 0 1px transparentize($selected_bg_color, 0.95); } @@ -126,7 +126,7 @@ color: $insensitive_fg_color; border: 1px solid transparentize($button_border, 0.45); background-color: transparentize($button_bg, 0.45); - box-shadow: inset 0 2px 4px transparentize($button_bg, 0.95); + box-shadow: inset 0 1px transparentize($button_bg, 0.95); } @else if $t==osd { @@ -136,6 +136,7 @@ color: $osd_fg_color; border: 1px solid $osd_button_border; background-color: $osd_button_bg; + box-shadow: inset 0 1px transparentize(black, 0.95); } @else if $t==osd-hover { @@ -145,6 +146,7 @@ color: $osd_fg_color; border: 1px solid $osd_button_border; background-color: opacify(lighten($osd_button_bg, 7%), 0.1); + box-shadow: inset 0 1px transparentize(black, 0.95); } @else if $t==osd-active { @@ -152,8 +154,9 @@ // active osd button // color: $selected_fg_color; - border: 1px solid $selected_bg_color; + border: 1px solid $osd_button_border; background-color: $selected_bg_color; + box-shadow: inset 0 1px transparentize($selected_bg_color, 0.95); } @else if $t==osd-insensitive { @@ -163,5 +166,6 @@ color: $osd_insensitive_fg_color; border: 1px solid $osd_button_border; background-color: transparentize($osd_button_bg, 0.15); + box-shadow: inset 0 1px transparentize(black, 0.95); } } 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 8274504..7061cde 100644 --- a/common/gtk-3.0/3.14/gtk-contained-dark.css +++ b/common/gtk-3.0/3.14/gtk-contained-dark.css @@ -251,7 +251,7 @@ GtkFlowBox .grid-child { color: inherit; } .osd .entry:focus { color: #ffffff; - border-color: transparent; + border-color: rgba(26, 28, 34, 0.35); background-image: linear-gradient(to bottom, #5294E2); } .osd .entry:insensitive { color: rgba(186, 195, 207, 0.55); @@ -338,7 +338,7 @@ GtkSearchEntry.entry { .button.osd:active, .button.osd:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: rgba(26, 28, 34, 0.35); background-color: #5294E2; } .button.osd:insensitive { color: #5d626e; @@ -375,7 +375,7 @@ GtkSearchEntry.entry { .osd .button:active, .osd .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: rgba(26, 28, 34, 0.35); background-color: #5294E2; } .osd .button:insensitive { color: #5d626e; @@ -399,7 +399,7 @@ GtkSearchEntry.entry { .osd .button.flat:active, .osd .button.flat:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: rgba(26, 28, 34, 0.35); background-color: #5294E2; } .button.suggested-action { background-clip: border-box; @@ -2129,7 +2129,7 @@ GtkScrolledWindow GtkViewport.frame { .app-notification.frame .button:active, .app-notification.frame .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: rgba(26, 28, 34, 0.35); background-color: #5294E2; } .app-notification .button:insensitive, .app-notification.frame .button:insensitive { @@ -3593,7 +3593,7 @@ GtkListBox .h4 { #buttonbox_frame .button:active, #buttonbox_frame .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: rgba(26, 28, 34, 0.35); background-color: #5294E2; } #buttonbox_frame .button:insensitive { color: #5d626e; @@ -3968,7 +3968,7 @@ GtkFileChooserDialog .dialog-vbox > .frame .button, GeditFileBrowserWidget .hori GtkFileChooserDialog .dialog-vbox > .frame .button:checked, GeditFileBrowserWidget .horizontal .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: rgba(26, 28, 34, 0.35); background-color: #5294E2; } GtkFileChooserDialog .action-bar.frame .button:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .button:insensitive, GeditFileBrowserWidget .horizontal .button:insensitive { @@ -3989,7 +3989,7 @@ GtkFileChooserDialog .dialog-vbox > .frame .entry { GtkFileChooserDialog .action-bar.frame .entry:focus, GtkFileChooserDialog .dialog-vbox > .frame .entry:focus { color: #ffffff; - border-color: transparent; + border-color: rgba(26, 28, 34, 0.35); background-image: linear-gradient(to bottom, #5294E2); } GtkFileChooserDialog .action-bar.frame .entry:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .entry:insensitive { 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 941db95..074e07c 100644 --- a/common/gtk-3.0/3.14/gtk-contained-darker.css +++ b/common/gtk-3.0/3.14/gtk-contained-darker.css @@ -250,7 +250,7 @@ GtkFlowBox .grid-child { color: inherit; } .osd .entry:focus { color: #ffffff; - border-color: transparent; + border-color: rgba(26, 28, 34, 0.35); background-image: linear-gradient(to bottom, #5294E2); } .osd .entry:insensitive { color: rgba(186, 195, 207, 0.55); @@ -337,7 +337,7 @@ GtkSearchEntry.entry { .button.osd:active, .button.osd:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: rgba(26, 28, 34, 0.35); background-color: #5294E2; } .button.osd:insensitive { color: #5d626e; @@ -374,7 +374,7 @@ GtkSearchEntry.entry { .osd .button:active, .osd .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: rgba(26, 28, 34, 0.35); background-color: #5294E2; } .osd .button:insensitive { color: #5d626e; @@ -398,7 +398,7 @@ GtkSearchEntry.entry { .osd .button.flat:active, .osd .button.flat:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: rgba(26, 28, 34, 0.35); background-color: #5294E2; } .button.suggested-action { background-clip: border-box; @@ -2132,7 +2132,7 @@ GtkScrolledWindow GtkViewport.frame { .app-notification.frame .button:active, .app-notification.frame .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: rgba(26, 28, 34, 0.35); background-color: #5294E2; } .app-notification .button:insensitive, .app-notification.frame .button:insensitive { @@ -3596,7 +3596,7 @@ GtkListBox .h4 { #buttonbox_frame .button:active, #buttonbox_frame .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: rgba(26, 28, 34, 0.35); background-color: #5294E2; } #buttonbox_frame .button:insensitive { color: #5d626e; @@ -3961,7 +3961,7 @@ GtkFileChooserDialog .dialog-vbox > .frame .button, GeditFileBrowserWidget .hori GtkFileChooserDialog .dialog-vbox > .frame .button:checked, GeditFileBrowserWidget .horizontal .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: rgba(26, 28, 34, 0.35); background-color: #5294E2; } GtkFileChooserDialog .action-bar.frame .button:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .button:insensitive, GeditFileBrowserWidget .horizontal .button:insensitive { @@ -3982,7 +3982,7 @@ GtkFileChooserDialog .dialog-vbox > .frame .entry { GtkFileChooserDialog .action-bar.frame .entry:focus, GtkFileChooserDialog .dialog-vbox > .frame .entry:focus { color: #ffffff; - border-color: transparent; + border-color: rgba(26, 28, 34, 0.35); background-image: linear-gradient(to bottom, #5294E2); } GtkFileChooserDialog .action-bar.frame .entry:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .entry:insensitive { 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 84ae28e..71f7e2a 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 @@ -251,7 +251,7 @@ GtkFlowBox .grid-child { color: inherit; } .osd .entry:focus { color: #ffffff; - border-color: transparent; + border-color: rgba(26, 28, 34, 0.4); background-image: linear-gradient(to bottom, #5294E2); } .osd .entry:insensitive { color: rgba(186, 195, 207, 0.55); @@ -338,7 +338,7 @@ GtkSearchEntry.entry { .button.osd:active, .button.osd:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: rgba(26, 28, 34, 0.4); background-color: #5294E2; } .button.osd:insensitive { color: #5d626e; @@ -375,7 +375,7 @@ GtkSearchEntry.entry { .osd .button:active, .osd .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: rgba(26, 28, 34, 0.4); background-color: #5294E2; } .osd .button:insensitive { color: #5d626e; @@ -399,7 +399,7 @@ GtkSearchEntry.entry { .osd .button.flat:active, .osd .button.flat:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: rgba(26, 28, 34, 0.4); background-color: #5294E2; } .button.suggested-action { background-clip: border-box; @@ -2129,7 +2129,7 @@ GtkScrolledWindow GtkViewport.frame { .app-notification.frame .button:active, .app-notification.frame .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: rgba(26, 28, 34, 0.4); background-color: #5294E2; } .app-notification .button:insensitive, .app-notification.frame .button:insensitive { @@ -3593,7 +3593,7 @@ GtkListBox .h4 { #buttonbox_frame .button:active, #buttonbox_frame .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: rgba(26, 28, 34, 0.4); background-color: #5294E2; } #buttonbox_frame .button:insensitive { color: #5d626e; @@ -3968,7 +3968,7 @@ GtkFileChooserDialog .dialog-vbox > .frame .button, GeditFileBrowserWidget .hori GtkFileChooserDialog .dialog-vbox > .frame .button:checked, GeditFileBrowserWidget .horizontal .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: rgba(26, 28, 34, 0.4); background-color: #5294E2; } GtkFileChooserDialog .action-bar.frame .button:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .button:insensitive, GeditFileBrowserWidget .horizontal .button:insensitive { @@ -3989,7 +3989,7 @@ GtkFileChooserDialog .dialog-vbox > .frame .entry { GtkFileChooserDialog .action-bar.frame .entry:focus, GtkFileChooserDialog .dialog-vbox > .frame .entry:focus { color: #ffffff; - border-color: transparent; + border-color: rgba(26, 28, 34, 0.4); background-image: linear-gradient(to bottom, #5294E2); } GtkFileChooserDialog .action-bar.frame .entry:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .entry:insensitive { 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 9391942..254d5b5 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 @@ -250,7 +250,7 @@ GtkFlowBox .grid-child { color: inherit; } .osd .entry:focus { color: #ffffff; - border-color: transparent; + border-color: rgba(26, 28, 34, 0.4); background-image: linear-gradient(to bottom, #5294E2); } .osd .entry:insensitive { color: rgba(186, 195, 207, 0.55); @@ -337,7 +337,7 @@ GtkSearchEntry.entry { .button.osd:active, .button.osd:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: rgba(26, 28, 34, 0.4); background-color: #5294E2; } .button.osd:insensitive { color: #5d626e; @@ -374,7 +374,7 @@ GtkSearchEntry.entry { .osd .button:active, .osd .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: rgba(26, 28, 34, 0.4); background-color: #5294E2; } .osd .button:insensitive { color: #5d626e; @@ -398,7 +398,7 @@ GtkSearchEntry.entry { .osd .button.flat:active, .osd .button.flat:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: rgba(26, 28, 34, 0.4); background-color: #5294E2; } .button.suggested-action { background-clip: border-box; @@ -2132,7 +2132,7 @@ GtkScrolledWindow GtkViewport.frame { .app-notification.frame .button:active, .app-notification.frame .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: rgba(26, 28, 34, 0.4); background-color: #5294E2; } .app-notification .button:insensitive, .app-notification.frame .button:insensitive { @@ -3596,7 +3596,7 @@ GtkListBox .h4 { #buttonbox_frame .button:active, #buttonbox_frame .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: rgba(26, 28, 34, 0.4); background-color: #5294E2; } #buttonbox_frame .button:insensitive { color: #5d626e; @@ -3961,7 +3961,7 @@ GtkFileChooserDialog .dialog-vbox > .frame .button, GeditFileBrowserWidget .hori GtkFileChooserDialog .dialog-vbox > .frame .button:checked, GeditFileBrowserWidget .horizontal .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: rgba(26, 28, 34, 0.4); background-color: #5294E2; } GtkFileChooserDialog .action-bar.frame .button:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .button:insensitive, GeditFileBrowserWidget .horizontal .button:insensitive { @@ -3982,7 +3982,7 @@ GtkFileChooserDialog .dialog-vbox > .frame .entry { GtkFileChooserDialog .action-bar.frame .entry:focus, GtkFileChooserDialog .dialog-vbox > .frame .entry:focus { color: #ffffff; - border-color: transparent; + border-color: rgba(26, 28, 34, 0.4); background-image: linear-gradient(to bottom, #5294E2); } GtkFileChooserDialog .action-bar.frame .entry:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .entry:insensitive { 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 3c21de8..1f801b8 100644 --- a/common/gtk-3.0/3.14/gtk-contained-solid.css +++ b/common/gtk-3.0/3.14/gtk-contained-solid.css @@ -250,7 +250,7 @@ GtkFlowBox .grid-child { color: inherit; } .osd .entry:focus { color: #ffffff; - border-color: #5294E2; + border-color: rgba(26, 28, 34, 0.4); background-image: linear-gradient(to bottom, #5294E2); } .osd .entry:insensitive { color: rgba(186, 195, 207, 0.55); @@ -337,7 +337,7 @@ GtkSearchEntry.entry { .button.osd:active, .button.osd:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: rgba(26, 28, 34, 0.4); background-color: #5294E2; } .button.osd:insensitive { color: #5d626e; @@ -374,7 +374,7 @@ GtkSearchEntry.entry { .osd .button:active, .osd .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: rgba(26, 28, 34, 0.4); background-color: #5294E2; } .osd .button:insensitive { color: #5d626e; @@ -398,7 +398,7 @@ GtkSearchEntry.entry { .osd .button.flat:active, .osd .button.flat:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: rgba(26, 28, 34, 0.4); background-color: #5294E2; } .button.suggested-action { background-clip: border-box; @@ -2132,7 +2132,7 @@ GtkScrolledWindow GtkViewport.frame { .app-notification.frame .button:active, .app-notification.frame .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: rgba(26, 28, 34, 0.4); background-color: #5294E2; } .app-notification .button:insensitive, .app-notification.frame .button:insensitive { @@ -3596,7 +3596,7 @@ GtkListBox .h4 { #buttonbox_frame .button:active, #buttonbox_frame .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: rgba(26, 28, 34, 0.4); background-color: #5294E2; } #buttonbox_frame .button:insensitive { color: #5d626e; @@ -3961,7 +3961,7 @@ GtkFileChooserDialog .dialog-vbox > .frame .button, GeditFileBrowserWidget .hori GtkFileChooserDialog .dialog-vbox > .frame .button:checked, GeditFileBrowserWidget .horizontal .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: rgba(26, 28, 34, 0.4); background-color: #5294E2; } GtkFileChooserDialog .action-bar.frame .button:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .button:insensitive, GeditFileBrowserWidget .horizontal .button:insensitive { @@ -3982,7 +3982,7 @@ GtkFileChooserDialog .dialog-vbox > .frame .entry { GtkFileChooserDialog .action-bar.frame .entry:focus, GtkFileChooserDialog .dialog-vbox > .frame .entry:focus { color: #ffffff; - border-color: #5294E2; + border-color: rgba(26, 28, 34, 0.4); background-image: linear-gradient(to bottom, #5294E2); } GtkFileChooserDialog .action-bar.frame .entry:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .entry:insensitive { diff --git a/common/gtk-3.0/3.14/gtk-contained.css b/common/gtk-3.0/3.14/gtk-contained.css index 2b41590..a07d201 100644 --- a/common/gtk-3.0/3.14/gtk-contained.css +++ b/common/gtk-3.0/3.14/gtk-contained.css @@ -250,7 +250,7 @@ GtkFlowBox .grid-child { color: inherit; } .osd .entry:focus { color: #ffffff; - border-color: #5294E2; + border-color: rgba(26, 28, 34, 0.35); background-image: linear-gradient(to bottom, #5294E2); } .osd .entry:insensitive { color: rgba(186, 195, 207, 0.55); @@ -337,7 +337,7 @@ GtkSearchEntry.entry { .button.osd:active, .button.osd:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: rgba(26, 28, 34, 0.35); background-color: #5294E2; } .button.osd:insensitive { color: #5d626e; @@ -374,7 +374,7 @@ GtkSearchEntry.entry { .osd .button:active, .osd .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: rgba(26, 28, 34, 0.35); background-color: #5294E2; } .osd .button:insensitive { color: #5d626e; @@ -398,7 +398,7 @@ GtkSearchEntry.entry { .osd .button.flat:active, .osd .button.flat:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: rgba(26, 28, 34, 0.35); background-color: #5294E2; } .button.suggested-action { background-clip: border-box; @@ -2132,7 +2132,7 @@ GtkScrolledWindow GtkViewport.frame { .app-notification.frame .button:active, .app-notification.frame .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: rgba(26, 28, 34, 0.35); background-color: #5294E2; } .app-notification .button:insensitive, .app-notification.frame .button:insensitive { @@ -3596,7 +3596,7 @@ GtkListBox .h4 { #buttonbox_frame .button:active, #buttonbox_frame .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: rgba(26, 28, 34, 0.35); background-color: #5294E2; } #buttonbox_frame .button:insensitive { color: #5d626e; @@ -3961,7 +3961,7 @@ GtkFileChooserDialog .dialog-vbox > .frame .button, GeditFileBrowserWidget .hori GtkFileChooserDialog .dialog-vbox > .frame .button:checked, GeditFileBrowserWidget .horizontal .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: rgba(26, 28, 34, 0.35); background-color: #5294E2; } GtkFileChooserDialog .action-bar.frame .button:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .button:insensitive, GeditFileBrowserWidget .horizontal .button:insensitive { @@ -3982,7 +3982,7 @@ GtkFileChooserDialog .dialog-vbox > .frame .entry { GtkFileChooserDialog .action-bar.frame .entry:focus, GtkFileChooserDialog .dialog-vbox > .frame .entry:focus { color: #ffffff; - border-color: #5294E2; + border-color: rgba(26, 28, 34, 0.35); background-image: linear-gradient(to bottom, #5294E2); } GtkFileChooserDialog .action-bar.frame .entry:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .entry:insensitive { diff --git a/common/gtk-3.0/3.14/sass/_drawing.scss b/common/gtk-3.0/3.14/sass/_drawing.scss index 6e5e43a..ab99a37 100644 --- a/common/gtk-3.0/3.14/sass/_drawing.scss +++ b/common/gtk-3.0/3.14/sass/_drawing.scss @@ -106,7 +106,7 @@ // active osd entry // color: $selected_fg_color; - border-color: if($darker=='false' and $variant=='light', $selected_bg_color, transparent); + border-color: $osd_entry_border; background-image: linear-gradient(to bottom, $selected_bg_color); } @@ -260,7 +260,7 @@ // color: $selected_fg_color; outline-color: transparentize($selected_fg_color, 0.7); - border-color: $selected_bg_color; + border-color: $osd_button_border; background-color: $selected_bg_color; } diff --git a/common/gtk-3.0/3.16/gtk-contained-dark.css b/common/gtk-3.0/3.16/gtk-contained-dark.css index 70202b1..a38eb96 100644 --- a/common/gtk-3.0/3.16/gtk-contained-dark.css +++ b/common/gtk-3.0/3.16/gtk-contained-dark.css @@ -251,7 +251,7 @@ GtkTextView { color: inherit; } .osd .entry:focus { color: #ffffff; - border-color: transparent; + border-color: rgba(26, 28, 34, 0.35); background-image: linear-gradient(to bottom, #5294E2); } .osd .entry:insensitive { color: rgba(186, 195, 207, 0.55); @@ -338,7 +338,7 @@ GtkSearchEntry.entry { .button.osd:active, .button.osd:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: rgba(26, 28, 34, 0.35); background-color: #5294E2; } .button.osd:insensitive { color: #5d626e; @@ -375,7 +375,7 @@ GtkSearchEntry.entry { .osd .button:active, .osd .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: rgba(26, 28, 34, 0.35); background-color: #5294E2; } .osd .button:insensitive { color: #5d626e; @@ -399,7 +399,7 @@ GtkSearchEntry.entry { .osd .button.flat:active, .osd .button.flat:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: rgba(26, 28, 34, 0.35); background-color: #5294E2; } .button.suggested-action { background-clip: border-box; @@ -2187,7 +2187,7 @@ GtkScrolledWindow GtkViewport.frame { .app-notification.frame .button:active, .app-notification.frame .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: rgba(26, 28, 34, 0.35); background-color: #5294E2; } .app-notification .button:insensitive, .app-notification.frame .button:insensitive { @@ -3559,7 +3559,7 @@ GtkListBox .h4 { #buttonbox_frame .button:active, #buttonbox_frame .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: rgba(26, 28, 34, 0.35); background-color: #5294E2; } #buttonbox_frame .button:insensitive { color: #5d626e; @@ -3911,7 +3911,7 @@ GtkFileChooserDialog .dialog-vbox > .frame .button, GeditFileBrowserWidget .hori GtkFileChooserDialog .dialog-vbox > .frame .button:checked, GeditFileBrowserWidget .horizontal .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: rgba(26, 28, 34, 0.35); background-color: #5294E2; } GtkFileChooserDialog .action-bar.frame .button:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .button:insensitive, GeditFileBrowserWidget .horizontal .button:insensitive { @@ -3932,7 +3932,7 @@ GtkFileChooserDialog .dialog-vbox > .frame .entry { GtkFileChooserDialog .action-bar.frame .entry:focus, GtkFileChooserDialog .dialog-vbox > .frame .entry:focus { color: #ffffff; - border-color: transparent; + border-color: rgba(26, 28, 34, 0.35); background-image: linear-gradient(to bottom, #5294E2); } GtkFileChooserDialog .action-bar.frame .entry:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .entry:insensitive { 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 dcd3fef..e57e5bf 100644 --- a/common/gtk-3.0/3.16/gtk-contained-darker.css +++ b/common/gtk-3.0/3.16/gtk-contained-darker.css @@ -250,7 +250,7 @@ GtkTextView { color: inherit; } .osd .entry:focus { color: #ffffff; - border-color: transparent; + border-color: rgba(26, 28, 34, 0.35); background-image: linear-gradient(to bottom, #5294E2); } .osd .entry:insensitive { color: rgba(186, 195, 207, 0.55); @@ -337,7 +337,7 @@ GtkSearchEntry.entry { .button.osd:active, .button.osd:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: rgba(26, 28, 34, 0.35); background-color: #5294E2; } .button.osd:insensitive { color: #5d626e; @@ -374,7 +374,7 @@ GtkSearchEntry.entry { .osd .button:active, .osd .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: rgba(26, 28, 34, 0.35); background-color: #5294E2; } .osd .button:insensitive { color: #5d626e; @@ -398,7 +398,7 @@ GtkSearchEntry.entry { .osd .button.flat:active, .osd .button.flat:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: rgba(26, 28, 34, 0.35); background-color: #5294E2; } .button.suggested-action { background-clip: border-box; @@ -2190,7 +2190,7 @@ GtkScrolledWindow GtkViewport.frame { .app-notification.frame .button:active, .app-notification.frame .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: rgba(26, 28, 34, 0.35); background-color: #5294E2; } .app-notification .button:insensitive, .app-notification.frame .button:insensitive { @@ -3562,7 +3562,7 @@ GtkListBox .h4 { #buttonbox_frame .button:active, #buttonbox_frame .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: rgba(26, 28, 34, 0.35); background-color: #5294E2; } #buttonbox_frame .button:insensitive { color: #5d626e; @@ -3904,7 +3904,7 @@ GtkFileChooserDialog .dialog-vbox > .frame .button, GeditFileBrowserWidget .hori GtkFileChooserDialog .dialog-vbox > .frame .button:checked, GeditFileBrowserWidget .horizontal .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: rgba(26, 28, 34, 0.35); background-color: #5294E2; } GtkFileChooserDialog .action-bar.frame .button:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .button:insensitive, GeditFileBrowserWidget .horizontal .button:insensitive { @@ -3925,7 +3925,7 @@ GtkFileChooserDialog .dialog-vbox > .frame .entry { GtkFileChooserDialog .action-bar.frame .entry:focus, GtkFileChooserDialog .dialog-vbox > .frame .entry:focus { color: #ffffff; - border-color: transparent; + border-color: rgba(26, 28, 34, 0.35); background-image: linear-gradient(to bottom, #5294E2); } GtkFileChooserDialog .action-bar.frame .entry:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .entry:insensitive { 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 3e3141b..80bd21f 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 @@ -251,7 +251,7 @@ GtkTextView { color: inherit; } .osd .entry:focus { color: #ffffff; - border-color: transparent; + border-color: rgba(26, 28, 34, 0.4); background-image: linear-gradient(to bottom, #5294E2); } .osd .entry:insensitive { color: rgba(186, 195, 207, 0.55); @@ -338,7 +338,7 @@ GtkSearchEntry.entry { .button.osd:active, .button.osd:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: rgba(26, 28, 34, 0.4); background-color: #5294E2; } .button.osd:insensitive { color: #5d626e; @@ -375,7 +375,7 @@ GtkSearchEntry.entry { .osd .button:active, .osd .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: rgba(26, 28, 34, 0.4); background-color: #5294E2; } .osd .button:insensitive { color: #5d626e; @@ -399,7 +399,7 @@ GtkSearchEntry.entry { .osd .button.flat:active, .osd .button.flat:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: rgba(26, 28, 34, 0.4); background-color: #5294E2; } .button.suggested-action { background-clip: border-box; @@ -2187,7 +2187,7 @@ GtkScrolledWindow GtkViewport.frame { .app-notification.frame .button:active, .app-notification.frame .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: rgba(26, 28, 34, 0.4); background-color: #5294E2; } .app-notification .button:insensitive, .app-notification.frame .button:insensitive { @@ -3559,7 +3559,7 @@ GtkListBox .h4 { #buttonbox_frame .button:active, #buttonbox_frame .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: rgba(26, 28, 34, 0.4); background-color: #5294E2; } #buttonbox_frame .button:insensitive { color: #5d626e; @@ -3911,7 +3911,7 @@ GtkFileChooserDialog .dialog-vbox > .frame .button, GeditFileBrowserWidget .hori GtkFileChooserDialog .dialog-vbox > .frame .button:checked, GeditFileBrowserWidget .horizontal .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: rgba(26, 28, 34, 0.4); background-color: #5294E2; } GtkFileChooserDialog .action-bar.frame .button:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .button:insensitive, GeditFileBrowserWidget .horizontal .button:insensitive { @@ -3932,7 +3932,7 @@ GtkFileChooserDialog .dialog-vbox > .frame .entry { GtkFileChooserDialog .action-bar.frame .entry:focus, GtkFileChooserDialog .dialog-vbox > .frame .entry:focus { color: #ffffff; - border-color: transparent; + border-color: rgba(26, 28, 34, 0.4); background-image: linear-gradient(to bottom, #5294E2); } GtkFileChooserDialog .action-bar.frame .entry:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .entry:insensitive { 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 02e949b..bb0841b 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 @@ -250,7 +250,7 @@ GtkTextView { color: inherit; } .osd .entry:focus { color: #ffffff; - border-color: transparent; + border-color: rgba(26, 28, 34, 0.4); background-image: linear-gradient(to bottom, #5294E2); } .osd .entry:insensitive { color: rgba(186, 195, 207, 0.55); @@ -337,7 +337,7 @@ GtkSearchEntry.entry { .button.osd:active, .button.osd:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: rgba(26, 28, 34, 0.4); background-color: #5294E2; } .button.osd:insensitive { color: #5d626e; @@ -374,7 +374,7 @@ GtkSearchEntry.entry { .osd .button:active, .osd .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: rgba(26, 28, 34, 0.4); background-color: #5294E2; } .osd .button:insensitive { color: #5d626e; @@ -398,7 +398,7 @@ GtkSearchEntry.entry { .osd .button.flat:active, .osd .button.flat:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: rgba(26, 28, 34, 0.4); background-color: #5294E2; } .button.suggested-action { background-clip: border-box; @@ -2190,7 +2190,7 @@ GtkScrolledWindow GtkViewport.frame { .app-notification.frame .button:active, .app-notification.frame .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: rgba(26, 28, 34, 0.4); background-color: #5294E2; } .app-notification .button:insensitive, .app-notification.frame .button:insensitive { @@ -3562,7 +3562,7 @@ GtkListBox .h4 { #buttonbox_frame .button:active, #buttonbox_frame .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: rgba(26, 28, 34, 0.4); background-color: #5294E2; } #buttonbox_frame .button:insensitive { color: #5d626e; @@ -3904,7 +3904,7 @@ GtkFileChooserDialog .dialog-vbox > .frame .button, GeditFileBrowserWidget .hori GtkFileChooserDialog .dialog-vbox > .frame .button:checked, GeditFileBrowserWidget .horizontal .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: rgba(26, 28, 34, 0.4); background-color: #5294E2; } GtkFileChooserDialog .action-bar.frame .button:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .button:insensitive, GeditFileBrowserWidget .horizontal .button:insensitive { @@ -3925,7 +3925,7 @@ GtkFileChooserDialog .dialog-vbox > .frame .entry { GtkFileChooserDialog .action-bar.frame .entry:focus, GtkFileChooserDialog .dialog-vbox > .frame .entry:focus { color: #ffffff; - border-color: transparent; + border-color: rgba(26, 28, 34, 0.4); background-image: linear-gradient(to bottom, #5294E2); } GtkFileChooserDialog .action-bar.frame .entry:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .entry:insensitive { 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 e49f787..ff99ac8 100644 --- a/common/gtk-3.0/3.16/gtk-contained-solid.css +++ b/common/gtk-3.0/3.16/gtk-contained-solid.css @@ -250,7 +250,7 @@ GtkTextView { color: inherit; } .osd .entry:focus { color: #ffffff; - border-color: #5294E2; + border-color: rgba(26, 28, 34, 0.4); background-image: linear-gradient(to bottom, #5294E2); } .osd .entry:insensitive { color: rgba(186, 195, 207, 0.55); @@ -337,7 +337,7 @@ GtkSearchEntry.entry { .button.osd:active, .button.osd:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: rgba(26, 28, 34, 0.4); background-color: #5294E2; } .button.osd:insensitive { color: #5d626e; @@ -374,7 +374,7 @@ GtkSearchEntry.entry { .osd .button:active, .osd .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: rgba(26, 28, 34, 0.4); background-color: #5294E2; } .osd .button:insensitive { color: #5d626e; @@ -398,7 +398,7 @@ GtkSearchEntry.entry { .osd .button.flat:active, .osd .button.flat:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: rgba(26, 28, 34, 0.4); background-color: #5294E2; } .button.suggested-action { background-clip: border-box; @@ -2190,7 +2190,7 @@ GtkScrolledWindow GtkViewport.frame { .app-notification.frame .button:active, .app-notification.frame .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: rgba(26, 28, 34, 0.4); background-color: #5294E2; } .app-notification .button:insensitive, .app-notification.frame .button:insensitive { @@ -3562,7 +3562,7 @@ GtkListBox .h4 { #buttonbox_frame .button:active, #buttonbox_frame .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: rgba(26, 28, 34, 0.4); background-color: #5294E2; } #buttonbox_frame .button:insensitive { color: #5d626e; @@ -3904,7 +3904,7 @@ GtkFileChooserDialog .dialog-vbox > .frame .button, GeditFileBrowserWidget .hori GtkFileChooserDialog .dialog-vbox > .frame .button:checked, GeditFileBrowserWidget .horizontal .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: rgba(26, 28, 34, 0.4); background-color: #5294E2; } GtkFileChooserDialog .action-bar.frame .button:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .button:insensitive, GeditFileBrowserWidget .horizontal .button:insensitive { @@ -3925,7 +3925,7 @@ GtkFileChooserDialog .dialog-vbox > .frame .entry { GtkFileChooserDialog .action-bar.frame .entry:focus, GtkFileChooserDialog .dialog-vbox > .frame .entry:focus { color: #ffffff; - border-color: #5294E2; + border-color: rgba(26, 28, 34, 0.4); background-image: linear-gradient(to bottom, #5294E2); } GtkFileChooserDialog .action-bar.frame .entry:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .entry:insensitive { diff --git a/common/gtk-3.0/3.16/gtk-contained.css b/common/gtk-3.0/3.16/gtk-contained.css index 232e0b1..5acf60b 100644 --- a/common/gtk-3.0/3.16/gtk-contained.css +++ b/common/gtk-3.0/3.16/gtk-contained.css @@ -250,7 +250,7 @@ GtkTextView { color: inherit; } .osd .entry:focus { color: #ffffff; - border-color: #5294E2; + border-color: rgba(26, 28, 34, 0.35); background-image: linear-gradient(to bottom, #5294E2); } .osd .entry:insensitive { color: rgba(186, 195, 207, 0.55); @@ -337,7 +337,7 @@ GtkSearchEntry.entry { .button.osd:active, .button.osd:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: rgba(26, 28, 34, 0.35); background-color: #5294E2; } .button.osd:insensitive { color: #5d626e; @@ -374,7 +374,7 @@ GtkSearchEntry.entry { .osd .button:active, .osd .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: rgba(26, 28, 34, 0.35); background-color: #5294E2; } .osd .button:insensitive { color: #5d626e; @@ -398,7 +398,7 @@ GtkSearchEntry.entry { .osd .button.flat:active, .osd .button.flat:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: rgba(26, 28, 34, 0.35); background-color: #5294E2; } .button.suggested-action { background-clip: border-box; @@ -2190,7 +2190,7 @@ GtkScrolledWindow GtkViewport.frame { .app-notification.frame .button:active, .app-notification.frame .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: rgba(26, 28, 34, 0.35); background-color: #5294E2; } .app-notification .button:insensitive, .app-notification.frame .button:insensitive { @@ -3562,7 +3562,7 @@ GtkListBox .h4 { #buttonbox_frame .button:active, #buttonbox_frame .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: rgba(26, 28, 34, 0.35); background-color: #5294E2; } #buttonbox_frame .button:insensitive { color: #5d626e; @@ -3904,7 +3904,7 @@ GtkFileChooserDialog .dialog-vbox > .frame .button, GeditFileBrowserWidget .hori GtkFileChooserDialog .dialog-vbox > .frame .button:checked, GeditFileBrowserWidget .horizontal .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: rgba(26, 28, 34, 0.35); background-color: #5294E2; } GtkFileChooserDialog .action-bar.frame .button:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .button:insensitive, GeditFileBrowserWidget .horizontal .button:insensitive { @@ -3925,7 +3925,7 @@ GtkFileChooserDialog .dialog-vbox > .frame .entry { GtkFileChooserDialog .action-bar.frame .entry:focus, GtkFileChooserDialog .dialog-vbox > .frame .entry:focus { color: #ffffff; - border-color: #5294E2; + border-color: rgba(26, 28, 34, 0.35); background-image: linear-gradient(to bottom, #5294E2); } GtkFileChooserDialog .action-bar.frame .entry:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .entry:insensitive { diff --git a/common/gtk-3.0/3.16/sass/_drawing.scss b/common/gtk-3.0/3.16/sass/_drawing.scss index 6e5e43a..ab99a37 100644 --- a/common/gtk-3.0/3.16/sass/_drawing.scss +++ b/common/gtk-3.0/3.16/sass/_drawing.scss @@ -106,7 +106,7 @@ // active osd entry // color: $selected_fg_color; - border-color: if($darker=='false' and $variant=='light', $selected_bg_color, transparent); + border-color: $osd_entry_border; background-image: linear-gradient(to bottom, $selected_bg_color); } @@ -260,7 +260,7 @@ // color: $selected_fg_color; outline-color: transparentize($selected_fg_color, 0.7); - border-color: $selected_bg_color; + border-color: $osd_button_border; background-color: $selected_bg_color; } 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 fbc31b9..f516296 100644 --- a/common/gtk-3.0/3.18/gtk-contained-dark.css +++ b/common/gtk-3.0/3.18/gtk-contained-dark.css @@ -217,7 +217,7 @@ GtkTextView { color: inherit; } .osd .entry:focus { color: #ffffff; - border-color: transparent; + border-color: rgba(26, 28, 34, 0.35); background-image: linear-gradient(to bottom, #5294E2); } .osd .entry:insensitive { color: rgba(186, 195, 207, 0.55); @@ -304,7 +304,7 @@ GtkSearchEntry.entry { .button.osd:active, .button.osd:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: rgba(26, 28, 34, 0.35); background-color: #5294E2; } .button.osd:insensitive { color: #5d626e; @@ -341,7 +341,7 @@ GtkSearchEntry.entry { .osd .button:active, .osd .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: rgba(26, 28, 34, 0.35); background-color: #5294E2; } .osd .button:insensitive { color: #5d626e; @@ -365,7 +365,7 @@ GtkSearchEntry.entry { .osd .button.flat:active, .osd .sidebar-button.button:active, .osd .button.flat:checked, .osd .sidebar-button.button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: rgba(26, 28, 34, 0.35); background-color: #5294E2; } .button.suggested-action { background-clip: border-box; @@ -2319,7 +2319,7 @@ GtkScrolledWindow GtkViewport.frame { .app-notification.frame .button:active, .app-notification.frame .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: rgba(26, 28, 34, 0.35); background-color: #5294E2; } .app-notification .button:insensitive, .app-notification.frame .button:insensitive { @@ -3762,7 +3762,7 @@ GtkListBox .h4 { #buttonbox_frame .button:active, #buttonbox_frame .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: rgba(26, 28, 34, 0.35); background-color: #5294E2; } #buttonbox_frame .button:insensitive { color: #5d626e; @@ -3898,7 +3898,7 @@ NautilusWindow .sidebar-button.button { NautilusWindow .sidebar-button.button:active { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: rgba(26, 28, 34, 0.35); background-color: #5294E2; } GtkFileChooserDialog .sidebar-button.button:not(:hover):not(:active) > GtkImage, NautilusWindow .sidebar-button.button:not(:hover):not(:active) > GtkImage { @@ -4116,7 +4116,7 @@ GtkFileChooserDialog .dialog-vbox > .frame .button, GeditFileBrowserWidget .hori GtkFileChooserDialog .dialog-vbox > .frame .button:checked, GeditFileBrowserWidget .horizontal .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: rgba(26, 28, 34, 0.35); background-color: #5294E2; } GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action-bar.frame .button:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .button:insensitive, GeditFileBrowserWidget .horizontal .button:insensitive { @@ -4137,7 +4137,7 @@ GtkFileChooserDialog .dialog-vbox > .frame .entry { GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action-bar.frame .entry:focus, GtkFileChooserDialog .dialog-vbox > .frame .entry:focus { color: #ffffff; - border-color: transparent; + border-color: rgba(26, 28, 34, 0.35); background-image: linear-gradient(to bottom, #5294E2); } GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action-bar.frame .entry:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .entry:insensitive { 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 6ec1299..888b382 100644 --- a/common/gtk-3.0/3.18/gtk-contained-darker.css +++ b/common/gtk-3.0/3.18/gtk-contained-darker.css @@ -216,7 +216,7 @@ GtkTextView { color: inherit; } .osd .entry:focus { color: #ffffff; - border-color: transparent; + border-color: rgba(26, 28, 34, 0.35); background-image: linear-gradient(to bottom, #5294E2); } .osd .entry:insensitive { color: rgba(186, 195, 207, 0.55); @@ -303,7 +303,7 @@ GtkSearchEntry.entry { .button.osd:active, .button.osd:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: rgba(26, 28, 34, 0.35); background-color: #5294E2; } .button.osd:insensitive { color: #5d626e; @@ -340,7 +340,7 @@ GtkSearchEntry.entry { .osd .button:active, .osd .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: rgba(26, 28, 34, 0.35); background-color: #5294E2; } .osd .button:insensitive { color: #5d626e; @@ -364,7 +364,7 @@ GtkSearchEntry.entry { .osd .button.flat:active, .osd .sidebar-button.button:active, .osd .button.flat:checked, .osd .sidebar-button.button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: rgba(26, 28, 34, 0.35); background-color: #5294E2; } .button.suggested-action { background-clip: border-box; @@ -2322,7 +2322,7 @@ GtkScrolledWindow GtkViewport.frame { .app-notification.frame .button:active, .app-notification.frame .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: rgba(26, 28, 34, 0.35); background-color: #5294E2; } .app-notification .button:insensitive, .app-notification.frame .button:insensitive { @@ -3765,7 +3765,7 @@ GtkListBox .h4 { #buttonbox_frame .button:active, #buttonbox_frame .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: rgba(26, 28, 34, 0.35); background-color: #5294E2; } #buttonbox_frame .button:insensitive { color: #5d626e; @@ -3891,7 +3891,7 @@ NautilusWindow .sidebar-button.button { NautilusWindow .sidebar-button.button:active { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: rgba(26, 28, 34, 0.35); background-color: #5294E2; } GtkFileChooserDialog .sidebar-button.button:not(:hover):not(:active) > GtkImage, NautilusWindow .sidebar-button.button:not(:hover):not(:active) > GtkImage { @@ -4109,7 +4109,7 @@ GtkFileChooserDialog .dialog-vbox > .frame .button, GeditFileBrowserWidget .hori GtkFileChooserDialog .dialog-vbox > .frame .button:checked, GeditFileBrowserWidget .horizontal .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: rgba(26, 28, 34, 0.35); background-color: #5294E2; } GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action-bar.frame .button:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .button:insensitive, GeditFileBrowserWidget .horizontal .button:insensitive { @@ -4130,7 +4130,7 @@ GtkFileChooserDialog .dialog-vbox > .frame .entry { GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action-bar.frame .entry:focus, GtkFileChooserDialog .dialog-vbox > .frame .entry:focus { color: #ffffff; - border-color: transparent; + border-color: rgba(26, 28, 34, 0.35); background-image: linear-gradient(to bottom, #5294E2); } GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action-bar.frame .entry:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .entry:insensitive { 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 005cbc8..76021a8 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 @@ -217,7 +217,7 @@ GtkTextView { color: inherit; } .osd .entry:focus { color: #ffffff; - border-color: transparent; + border-color: rgba(26, 28, 34, 0.4); background-image: linear-gradient(to bottom, #5294E2); } .osd .entry:insensitive { color: rgba(186, 195, 207, 0.55); @@ -304,7 +304,7 @@ GtkSearchEntry.entry { .button.osd:active, .button.osd:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: rgba(26, 28, 34, 0.4); background-color: #5294E2; } .button.osd:insensitive { color: #5d626e; @@ -341,7 +341,7 @@ GtkSearchEntry.entry { .osd .button:active, .osd .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: rgba(26, 28, 34, 0.4); background-color: #5294E2; } .osd .button:insensitive { color: #5d626e; @@ -365,7 +365,7 @@ GtkSearchEntry.entry { .osd .button.flat:active, .osd .sidebar-button.button:active, .osd .button.flat:checked, .osd .sidebar-button.button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: rgba(26, 28, 34, 0.4); background-color: #5294E2; } .button.suggested-action { background-clip: border-box; @@ -2319,7 +2319,7 @@ GtkScrolledWindow GtkViewport.frame { .app-notification.frame .button:active, .app-notification.frame .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: rgba(26, 28, 34, 0.4); background-color: #5294E2; } .app-notification .button:insensitive, .app-notification.frame .button:insensitive { @@ -3762,7 +3762,7 @@ GtkListBox .h4 { #buttonbox_frame .button:active, #buttonbox_frame .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: rgba(26, 28, 34, 0.4); background-color: #5294E2; } #buttonbox_frame .button:insensitive { color: #5d626e; @@ -3898,7 +3898,7 @@ NautilusWindow .sidebar-button.button { NautilusWindow .sidebar-button.button:active { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: rgba(26, 28, 34, 0.4); background-color: #5294E2; } GtkFileChooserDialog .sidebar-button.button:not(:hover):not(:active) > GtkImage, NautilusWindow .sidebar-button.button:not(:hover):not(:active) > GtkImage { @@ -4116,7 +4116,7 @@ GtkFileChooserDialog .dialog-vbox > .frame .button, GeditFileBrowserWidget .hori GtkFileChooserDialog .dialog-vbox > .frame .button:checked, GeditFileBrowserWidget .horizontal .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: rgba(26, 28, 34, 0.4); background-color: #5294E2; } GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action-bar.frame .button:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .button:insensitive, GeditFileBrowserWidget .horizontal .button:insensitive { @@ -4137,7 +4137,7 @@ GtkFileChooserDialog .dialog-vbox > .frame .entry { GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action-bar.frame .entry:focus, GtkFileChooserDialog .dialog-vbox > .frame .entry:focus { color: #ffffff; - border-color: transparent; + border-color: rgba(26, 28, 34, 0.4); background-image: linear-gradient(to bottom, #5294E2); } GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action-bar.frame .entry:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .entry:insensitive { 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 b18fb0d..43402eb 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 @@ -216,7 +216,7 @@ GtkTextView { color: inherit; } .osd .entry:focus { color: #ffffff; - border-color: transparent; + border-color: rgba(26, 28, 34, 0.4); background-image: linear-gradient(to bottom, #5294E2); } .osd .entry:insensitive { color: rgba(186, 195, 207, 0.55); @@ -303,7 +303,7 @@ GtkSearchEntry.entry { .button.osd:active, .button.osd:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: rgba(26, 28, 34, 0.4); background-color: #5294E2; } .button.osd:insensitive { color: #5d626e; @@ -340,7 +340,7 @@ GtkSearchEntry.entry { .osd .button:active, .osd .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: rgba(26, 28, 34, 0.4); background-color: #5294E2; } .osd .button:insensitive { color: #5d626e; @@ -364,7 +364,7 @@ GtkSearchEntry.entry { .osd .button.flat:active, .osd .sidebar-button.button:active, .osd .button.flat:checked, .osd .sidebar-button.button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: rgba(26, 28, 34, 0.4); background-color: #5294E2; } .button.suggested-action { background-clip: border-box; @@ -2322,7 +2322,7 @@ GtkScrolledWindow GtkViewport.frame { .app-notification.frame .button:active, .app-notification.frame .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: rgba(26, 28, 34, 0.4); background-color: #5294E2; } .app-notification .button:insensitive, .app-notification.frame .button:insensitive { @@ -3765,7 +3765,7 @@ GtkListBox .h4 { #buttonbox_frame .button:active, #buttonbox_frame .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: rgba(26, 28, 34, 0.4); background-color: #5294E2; } #buttonbox_frame .button:insensitive { color: #5d626e; @@ -3891,7 +3891,7 @@ NautilusWindow .sidebar-button.button { NautilusWindow .sidebar-button.button:active { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: rgba(26, 28, 34, 0.4); background-color: #5294E2; } GtkFileChooserDialog .sidebar-button.button:not(:hover):not(:active) > GtkImage, NautilusWindow .sidebar-button.button:not(:hover):not(:active) > GtkImage { @@ -4109,7 +4109,7 @@ GtkFileChooserDialog .dialog-vbox > .frame .button, GeditFileBrowserWidget .hori GtkFileChooserDialog .dialog-vbox > .frame .button:checked, GeditFileBrowserWidget .horizontal .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: rgba(26, 28, 34, 0.4); background-color: #5294E2; } GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action-bar.frame .button:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .button:insensitive, GeditFileBrowserWidget .horizontal .button:insensitive { @@ -4130,7 +4130,7 @@ GtkFileChooserDialog .dialog-vbox > .frame .entry { GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action-bar.frame .entry:focus, GtkFileChooserDialog .dialog-vbox > .frame .entry:focus { color: #ffffff; - border-color: transparent; + border-color: rgba(26, 28, 34, 0.4); background-image: linear-gradient(to bottom, #5294E2); } GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action-bar.frame .entry:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .entry:insensitive { 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 37a5420..0e1914c 100644 --- a/common/gtk-3.0/3.18/gtk-contained-solid.css +++ b/common/gtk-3.0/3.18/gtk-contained-solid.css @@ -216,7 +216,7 @@ GtkTextView { color: inherit; } .osd .entry:focus { color: #ffffff; - border-color: #5294E2; + border-color: rgba(26, 28, 34, 0.4); background-image: linear-gradient(to bottom, #5294E2); } .osd .entry:insensitive { color: rgba(186, 195, 207, 0.55); @@ -303,7 +303,7 @@ GtkSearchEntry.entry { .button.osd:active, .button.osd:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: rgba(26, 28, 34, 0.4); background-color: #5294E2; } .button.osd:insensitive { color: #5d626e; @@ -340,7 +340,7 @@ GtkSearchEntry.entry { .osd .button:active, .osd .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: rgba(26, 28, 34, 0.4); background-color: #5294E2; } .osd .button:insensitive { color: #5d626e; @@ -364,7 +364,7 @@ GtkSearchEntry.entry { .osd .button.flat:active, .osd .sidebar-button.button:active, .osd .button.flat:checked, .osd .sidebar-button.button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: rgba(26, 28, 34, 0.4); background-color: #5294E2; } .button.suggested-action { background-clip: border-box; @@ -2326,7 +2326,7 @@ GtkScrolledWindow GtkViewport.frame { .app-notification.frame .button:active, .app-notification.frame .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: rgba(26, 28, 34, 0.4); background-color: #5294E2; } .app-notification .button:insensitive, .app-notification.frame .button:insensitive { @@ -3769,7 +3769,7 @@ GtkListBox .h4 { #buttonbox_frame .button:active, #buttonbox_frame .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: rgba(26, 28, 34, 0.4); background-color: #5294E2; } #buttonbox_frame .button:insensitive { color: #5d626e; @@ -3895,7 +3895,7 @@ NautilusWindow .sidebar-button.button { NautilusWindow .sidebar-button.button:active { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: rgba(26, 28, 34, 0.4); background-color: #5294E2; } GtkFileChooserDialog .sidebar-button.button:not(:hover):not(:active) > GtkImage, NautilusWindow .sidebar-button.button:not(:hover):not(:active) > GtkImage { @@ -4113,7 +4113,7 @@ GtkFileChooserDialog .dialog-vbox > .frame .button, GeditFileBrowserWidget .hori GtkFileChooserDialog .dialog-vbox > .frame .button:checked, GeditFileBrowserWidget .horizontal .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: rgba(26, 28, 34, 0.4); background-color: #5294E2; } GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action-bar.frame .button:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .button:insensitive, GeditFileBrowserWidget .horizontal .button:insensitive { @@ -4134,7 +4134,7 @@ GtkFileChooserDialog .dialog-vbox > .frame .entry { GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action-bar.frame .entry:focus, GtkFileChooserDialog .dialog-vbox > .frame .entry:focus { color: #ffffff; - border-color: #5294E2; + border-color: rgba(26, 28, 34, 0.4); background-image: linear-gradient(to bottom, #5294E2); } GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action-bar.frame .entry:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .entry:insensitive { diff --git a/common/gtk-3.0/3.18/gtk-contained.css b/common/gtk-3.0/3.18/gtk-contained.css index 6e5b03d..1feae06 100644 --- a/common/gtk-3.0/3.18/gtk-contained.css +++ b/common/gtk-3.0/3.18/gtk-contained.css @@ -216,7 +216,7 @@ GtkTextView { color: inherit; } .osd .entry:focus { color: #ffffff; - border-color: #5294E2; + border-color: rgba(26, 28, 34, 0.35); background-image: linear-gradient(to bottom, #5294E2); } .osd .entry:insensitive { color: rgba(186, 195, 207, 0.55); @@ -303,7 +303,7 @@ GtkSearchEntry.entry { .button.osd:active, .button.osd:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: rgba(26, 28, 34, 0.35); background-color: #5294E2; } .button.osd:insensitive { color: #5d626e; @@ -340,7 +340,7 @@ GtkSearchEntry.entry { .osd .button:active, .osd .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: rgba(26, 28, 34, 0.35); background-color: #5294E2; } .osd .button:insensitive { color: #5d626e; @@ -364,7 +364,7 @@ GtkSearchEntry.entry { .osd .button.flat:active, .osd .sidebar-button.button:active, .osd .button.flat:checked, .osd .sidebar-button.button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: rgba(26, 28, 34, 0.35); background-color: #5294E2; } .button.suggested-action { background-clip: border-box; @@ -2326,7 +2326,7 @@ GtkScrolledWindow GtkViewport.frame { .app-notification.frame .button:active, .app-notification.frame .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: rgba(26, 28, 34, 0.35); background-color: #5294E2; } .app-notification .button:insensitive, .app-notification.frame .button:insensitive { @@ -3769,7 +3769,7 @@ GtkListBox .h4 { #buttonbox_frame .button:active, #buttonbox_frame .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: rgba(26, 28, 34, 0.35); background-color: #5294E2; } #buttonbox_frame .button:insensitive { color: #5d626e; @@ -3895,7 +3895,7 @@ NautilusWindow .sidebar-button.button { NautilusWindow .sidebar-button.button:active { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: rgba(26, 28, 34, 0.35); background-color: #5294E2; } GtkFileChooserDialog .sidebar-button.button:not(:hover):not(:active) > GtkImage, NautilusWindow .sidebar-button.button:not(:hover):not(:active) > GtkImage { @@ -4113,7 +4113,7 @@ GtkFileChooserDialog .dialog-vbox > .frame .button, GeditFileBrowserWidget .hori GtkFileChooserDialog .dialog-vbox > .frame .button:checked, GeditFileBrowserWidget .horizontal .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: rgba(26, 28, 34, 0.35); background-color: #5294E2; } GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action-bar.frame .button:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .button:insensitive, GeditFileBrowserWidget .horizontal .button:insensitive { @@ -4134,7 +4134,7 @@ GtkFileChooserDialog .dialog-vbox > .frame .entry { GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action-bar.frame .entry:focus, GtkFileChooserDialog .dialog-vbox > .frame .entry:focus { color: #ffffff; - border-color: #5294E2; + border-color: rgba(26, 28, 34, 0.35); background-image: linear-gradient(to bottom, #5294E2); } GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action-bar.frame .entry:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .entry:insensitive { diff --git a/common/gtk-3.0/3.18/sass/_drawing.scss b/common/gtk-3.0/3.18/sass/_drawing.scss index 6e5e43a..ab99a37 100644 --- a/common/gtk-3.0/3.18/sass/_drawing.scss +++ b/common/gtk-3.0/3.18/sass/_drawing.scss @@ -106,7 +106,7 @@ // active osd entry // color: $selected_fg_color; - border-color: if($darker=='false' and $variant=='light', $selected_bg_color, transparent); + border-color: $osd_entry_border; background-image: linear-gradient(to bottom, $selected_bg_color); } @@ -260,7 +260,7 @@ // color: $selected_fg_color; outline-color: transparentize($selected_fg_color, 0.7); - border-color: $selected_bg_color; + border-color: $osd_button_border; background-color: $selected_bg_color; }