[gtk+] Adwaita: centralize outline-color
- From: Lapo Calamandrei <lapo src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] Adwaita: centralize outline-color
- Date: Wed, 8 Jun 2016 11:30:21 +0000 (UTC)
commit a0ee8f7f0a511f251da050a430da5ec93d7a1396
Author: Lapo Calamandrei <calamandrei gmail com>
Date: Wed Jun 8 13:28:07 2016 +0200
Adwaita: centralize outline-color
define outline-color generally using alpha(currentColor, 0.3),
which avoids setting it in a bunch of different places.
gtk/theme/Adwaita/_common.scss | 7 +------
gtk/theme/Adwaita/gtk-contained-dark.css | 7 ++-----
gtk/theme/Adwaita/gtk-contained.css | 10 +++-------
3 files changed, 6 insertions(+), 18 deletions(-)
---
diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index 0b37b2b..0b43829 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -31,7 +31,7 @@ $button_transition: all 200ms $ease-out-quad;
// to the adwaita engine: using real CSS properties is faster,
// and we don't use any outlines for now.
- outline-color: transparentize($fg_color, 0.7);
+ outline-color: gtkalpha(currentColor, 0.3);
outline-style: dashed;
outline-offset: -3px;
outline-width: 1px;
@@ -206,7 +206,6 @@ assistant {
border: none;
background-color: $osd_bg_color;
background-clip: padding-box;
- outline-color: transparentize($osd_fg_color, 0.7);
text-shadow: 0 1px black;
-gtk-icon-shadow: 0 1px black;
@@ -557,7 +556,6 @@ button {
color: $osd_fg_color;
border-radius: 5px;
- outline-color: transparentize($osd_fg_color, 0.7); //FIXME: define a color var?
@include button(osd);
@@ -2736,7 +2734,6 @@ treeview.view radio:selected { &:focus, & { @extend %radio; }} // This is a work
.osd & {
border-color: $osd_borders_color;
background-color: transparentize($osd_borders_color, 0.2);
- outline-color: transparentize($osd_fg_color, 0.8);
&:disabled { background-color: $osd_insensitive_bg_color; }
}
@@ -4219,8 +4216,6 @@ headerbar.selection-mode button.titlebutton,
@at-root %nobg_selected_items, & {
color: $selected_fg_color;
- @if $variant == 'light' { outline-color: transparentize($selected_fg_color, 0.7); }
-
&:disabled { color: mix($selected_fg_color, $selected_bg_color, 50%); }
&:backdrop {
diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index 80e02c0..257f9a0 100644
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -8,7 +8,7 @@
-GtkWidget-text-handle-height: 24;
-GtkDialog-button-spacing: 4;
-GtkDialog-action-area-border: 0;
- outline-color: rgba(238, 238, 236, 0.3);
+ outline-color: alpha(currentColor,0.3);
outline-style: dashed;
outline-offset: -3px;
outline-width: 1px;
@@ -131,7 +131,6 @@ assistant .sidebar label.highlight {
border: none;
background-color: rgba(28, 31, 32, 0.7);
background-clip: padding-box;
- outline-color: rgba(238, 238, 236, 0.3);
text-shadow: 0 1px black;
-gtk-icon-shadow: 0 1px black; }
popover.background.touch-selection:backdrop, popover.background.magnifier:backdrop,
popover.background.osd:backdrop, .app-notification:backdrop, .osd .scale-popup:backdrop,
@@ -594,7 +593,6 @@ button.osd {
min-height: 32px;
color: #eeeeec;
border-radius: 5px;
- outline-color: rgba(238, 238, 236, 0.3);
color: #eeeeec;
border-color: rgba(0, 0, 0, 0.7);
background-color: transparent;
@@ -3091,8 +3089,7 @@ scale trough, scale fill, progressbar trough {
border-color: #0f2b48; }
.osd scale trough, scale .osd trough, .osd scale fill, scale .osd fill, .osd progressbar trough,
progressbar .osd trough {
border-color: rgba(0, 0, 0, 0.7);
- background-color: rgba(0, 0, 0, 0.5);
- outline-color: rgba(238, 238, 236, 0.2); }
+ background-color: rgba(0, 0, 0, 0.5); }
.osd scale trough:disabled, scale .osd trough:disabled, .osd scale fill:disabled, scale .osd
fill:disabled, .osd progressbar trough:disabled, progressbar .osd trough:disabled {
background-color: rgba(49, 52, 52, 0.5); }
diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index 75dd874..25e454d 100644
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -8,7 +8,7 @@
-GtkWidget-text-handle-height: 24;
-GtkDialog-button-spacing: 4;
-GtkDialog-action-area-border: 0;
- outline-color: rgba(46, 52, 54, 0.3);
+ outline-color: alpha(currentColor,0.3);
outline-style: dashed;
outline-offset: -3px;
outline-width: 1px;
@@ -131,7 +131,6 @@ assistant .sidebar label.highlight {
border: none;
background-color: rgba(28, 31, 32, 0.7);
background-clip: padding-box;
- outline-color: rgba(238, 238, 236, 0.3);
text-shadow: 0 1px black;
-gtk-icon-shadow: 0 1px black; }
popover.background.touch-selection:backdrop, popover.background.magnifier:backdrop,
popover.background.osd:backdrop, .app-notification:backdrop, .osd .scale-popup:backdrop,
@@ -597,7 +596,6 @@ button.osd {
min-height: 32px;
color: #eeeeec;
border-radius: 5px;
- outline-color: rgba(238, 238, 236, 0.3);
color: #eeeeec;
border-color: rgba(0, 0, 0, 0.7);
background-color: transparent;
@@ -3120,8 +3118,7 @@ scale trough, scale fill, progressbar trough {
border-color: #184472; }
.osd scale trough, scale .osd trough, .osd scale fill, scale .osd fill, .osd progressbar trough,
progressbar .osd trough {
border-color: rgba(0, 0, 0, 0.7);
- background-color: rgba(0, 0, 0, 0.5);
- outline-color: rgba(238, 238, 236, 0.2); }
+ background-color: rgba(0, 0, 0, 0.5); }
.osd scale trough:disabled, scale .osd trough:disabled, .osd scale fill:disabled, scale .osd
fill:disabled, .osd progressbar trough:disabled, progressbar .osd trough:disabled {
background-color: rgba(49, 52, 52, 0.5); }
@@ -4642,8 +4639,7 @@ popover.background radiobutton:selected,
entry selection, modelbutton.flat:selected, popover.background checkbutton:selected,
popover.background radiobutton:selected,
.menuitem.button.flat:selected, treeview.view:selected:focus, treeview.view:selected, row:selected,
calendar:selected {
- color: #ffffff;
- outline-color: rgba(255, 255, 255, 0.3); }
+ color: #ffffff; }
row:selected label:disabled, label:disabled:selected, .selection-mode button.titlebutton:disabled,
iconview:disabled:selected:focus, .view:disabled:selected, iconview:disabled:selected,
iconview text:disabled:selected:focus,
textview text:disabled:selected:focus,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]