From 5b33127692f50aa56c184d2f203f32294e6d61f4 Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Sat, 31 Dec 2016 01:29:14 +0100 Subject: [PATCH] gtk: Replace -gtk-icon-effect with -gtk-icon-filter Instead of -gtk-icon-effect: dim; -gtk-icon-effect: hilight; we now use -gtk-icon-filter: opacity(0.5); -gtk-icon-filter: brightness(1.2); respectively. --- gtk/theme/Adwaita/_common.scss | 10 +++++----- gtk/theme/Adwaita/gtk-contained-dark.css | 10 +++++----- gtk/theme/Adwaita/gtk-contained.css | 10 +++++----- gtk/theme/HighContrast/_common.scss | 6 +++--- gtk/theme/HighContrast/gtk-contained-inverse.css | 6 +++--- gtk/theme/HighContrast/gtk-contained.css | 6 +++--- testsuite/reftests/gtk-image-effect-inherit.css | 6 +++--- testsuite/reftests/icon-effect-missing.css | 6 +++--- 8 files changed, 30 insertions(+), 30 deletions(-) diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss index 7f94578903..c06fb5b89c 100644 --- a/gtk/theme/Adwaita/_common.scss +++ b/gtk/theme/Adwaita/_common.scss @@ -63,7 +63,7 @@ $button_transition: all 200ms $ease-out-quad; Everytime a wildcard is used a kitten dies, painfully. */ -*:disabled { -gtk-icon-effect: dim; } +*:disabled { -gtk-icon-filter: opacity(0.5); } .gtkstyle-fallback { color: $fg_color; @@ -454,7 +454,7 @@ button { &:hover { @include button(hover); - -gtk-icon-effect: highlight; + -gtk-icon-filter: brightness(1.2); } &:active, @@ -469,7 +469,7 @@ button { @include button(backdrop); transition: $backdrop_transition; - -gtk-icon-effect: none; + -gtk-icon-filter: none; &:active, &:checked { @include button(backdrop-active); } @@ -1410,7 +1410,7 @@ headerbar { &.flat, & { @include button(backdrop, $selected_bg_color, $selected_fg_color); - -gtk-icon-effect: none; + -gtk-icon-filter: none; border-color: $selected_borders_color; &:active, @@ -4083,7 +4083,7 @@ colorchooser .popover.osd { border-radius: 5px; } .content-view { background-color: darken($bg_color,7%); - &:hover { -gtk-icon-effect: highlight; } + &:hover { -gtk-icon-filter: brightness(1.2); } &:backdrop { background-color: darken($bg_color,7%); } diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css index 3df017f3c4..9a1dad985b 100644 --- a/gtk/theme/Adwaita/gtk-contained-dark.css +++ b/gtk/theme/Adwaita/gtk-contained-dark.css @@ -34,7 +34,7 @@ Everytime a wildcard is used a kitten dies, painfully. */ *:disabled { - -gtk-icon-effect: dim; } + -gtk-icon-filter: opacity(0.5); } .gtkstyle-fallback { color: #eeeeec; @@ -442,7 +442,7 @@ button { -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.77945); box-shadow: inset 0 1px rgba(255, 255, 255, 0.05); background-image: linear-gradient(to bottom, #353c3e, #2e3436 60%, #2a2e30); - -gtk-icon-effect: highlight; } + -gtk-icon-filter: brightness(1.2); } notebook > header > tabs > arrow:active, button.titlebutton:active, notebook > header > tabs > arrow:checked, button.titlebutton:checked, button:active, button:checked { @@ -463,7 +463,7 @@ button { -gtk-icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); transition: 200ms ease-out; - -gtk-icon-effect: none; } + -gtk-icon-filter: none; } notebook > header > tabs > arrow:backdrop label, button.sidebar-button:backdrop label, button.titlebutton:backdrop label, notebook > header > tabs > arrow:backdrop, button.sidebar-button:backdrop, button.titlebutton:backdrop, notebook > header > tabs > arrow:backdrop label, button.titlebutton:backdrop label, notebook > header > tabs > arrow:backdrop, button.titlebutton:backdrop, button:backdrop.flat label, button:backdrop.flat, @@ -1801,7 +1801,7 @@ headerbar { text-shadow: none; -gtk-icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); - -gtk-icon-effect: none; + -gtk-icon-filter: none; border-color: #0f2b48; } .selection-mode.titlebar:not(headerbar) button:backdrop.flat label, .selection-mode.titlebar:not(headerbar) button:backdrop.flat, .selection-mode.titlebar:not(headerbar) button:backdrop label, .selection-mode.titlebar:not(headerbar) button:backdrop, headerbar.selection-mode button:backdrop.flat label, @@ -4393,7 +4393,7 @@ colorchooser .popover.osd { .content-view { background-color: #222728; } .content-view:hover { - -gtk-icon-effect: highlight; } + -gtk-icon-filter: brightness(1.2); } .content-view:backdrop { background-color: #222728; } diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css index 411bfc9bb7..580af98c87 100644 --- a/gtk/theme/Adwaita/gtk-contained.css +++ b/gtk/theme/Adwaita/gtk-contained.css @@ -34,7 +34,7 @@ Everytime a wildcard is used a kitten dies, painfully. */ *:disabled { - -gtk-icon-effect: dim; } + -gtk-icon-filter: opacity(0.5); } .gtkstyle-fallback { color: #2e3436; @@ -442,7 +442,7 @@ button { -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.76923); box-shadow: inset 0 1px white; background-image: linear-gradient(to bottom, #f7f7f7, #e8e8e7 60%, #dededd); - -gtk-icon-effect: highlight; } + -gtk-icon-filter: brightness(1.2); } notebook > header > tabs > arrow:active, button.titlebutton:active, notebook > header > tabs > arrow:checked, button.titlebutton:checked, button:active, button:checked { @@ -463,7 +463,7 @@ button { -gtk-icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); transition: 200ms ease-out; - -gtk-icon-effect: none; } + -gtk-icon-filter: none; } notebook > header > tabs > arrow:backdrop label, button.sidebar-button:backdrop label, button.titlebutton:backdrop label, notebook > header > tabs > arrow:backdrop, button.sidebar-button:backdrop, button.titlebutton:backdrop, notebook > header > tabs > arrow:backdrop label, button.titlebutton:backdrop label, notebook > header > tabs > arrow:backdrop, button.titlebutton:backdrop, button:backdrop.flat label, button:backdrop.flat, @@ -1810,7 +1810,7 @@ headerbar { text-shadow: none; -gtk-icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); - -gtk-icon-effect: none; + -gtk-icon-filter: none; border-color: #184472; } .selection-mode.titlebar:not(headerbar) button:backdrop.flat label, .selection-mode.titlebar:not(headerbar) button:backdrop.flat, .selection-mode.titlebar:not(headerbar) button:backdrop label, .selection-mode.titlebar:not(headerbar) button:backdrop, headerbar.selection-mode button:backdrop.flat label, @@ -4424,7 +4424,7 @@ colorchooser .popover.osd { .content-view { background-color: #d7d7d5; } .content-view:hover { - -gtk-icon-effect: highlight; } + -gtk-icon-filter: brightness(1.2); } .content-view:backdrop { background-color: #d7d7d5; } diff --git a/gtk/theme/HighContrast/_common.scss b/gtk/theme/HighContrast/_common.scss index 986027282b..d36cb42c02 100644 --- a/gtk/theme/HighContrast/_common.scss +++ b/gtk/theme/HighContrast/_common.scss @@ -64,7 +64,7 @@ $ease-out-quad: cubic-bezier(0.25, 0.46, 0.45, 0.94); *:disabled { - -gtk-icon-effect: dim; + -gtk-icon-filter: opacity(0.5); } .gtkstyle-fallback { @@ -383,7 +383,7 @@ button { &:hover { @include button(hover); - -gtk-icon-effect: highlight; + -gtk-icon-filter: brightness(1.2); } &:active, @@ -396,7 +396,7 @@ button { &:backdrop { @include button(backdrop); - -gtk-icon-effect: none; + -gtk-icon-filter: none; &:active, &:checked { @include button(backdrop-active); } diff --git a/gtk/theme/HighContrast/gtk-contained-inverse.css b/gtk/theme/HighContrast/gtk-contained-inverse.css index da7a13d323..5f4e55f3ac 100644 --- a/gtk/theme/HighContrast/gtk-contained-inverse.css +++ b/gtk/theme/HighContrast/gtk-contained-inverse.css @@ -68,7 +68,7 @@ Everytime a wildcard is used a kitten dies, painfully. */ *:disabled { - -gtk-icon-effect: dim; } + -gtk-icon-filter: opacity(0.5); } .gtkstyle-fallback { background-color: #000; @@ -415,7 +415,7 @@ button.titlebutton, button { background-color: #000; border-color: gray; background-image: none; - -gtk-icon-effect: highlight; } + -gtk-icon-filter: brightness(1.2); } button.titlebutton:active, button.titlebutton:checked, button:active, button:checked { border-width: 2px; border-style: solid; @@ -431,7 +431,7 @@ button.titlebutton, button { background-color: #000; border-color: #737373; background-image: none; - -gtk-icon-effect: none; } + -gtk-icon-filter: none; } button.titlebutton:backdrop:active, button.titlebutton:backdrop:checked, button:backdrop:active, button:backdrop:checked { border-width: 2px; border-style: solid; diff --git a/gtk/theme/HighContrast/gtk-contained.css b/gtk/theme/HighContrast/gtk-contained.css index 9a338ded64..b580a3d863 100644 --- a/gtk/theme/HighContrast/gtk-contained.css +++ b/gtk/theme/HighContrast/gtk-contained.css @@ -68,7 +68,7 @@ Everytime a wildcard is used a kitten dies, painfully. */ *:disabled { - -gtk-icon-effect: dim; } + -gtk-icon-filter: opacity(0.5); } .gtkstyle-fallback { background-color: #fff; @@ -415,7 +415,7 @@ button.titlebutton, button { background-color: #fff; border-color: gray; background-image: none; - -gtk-icon-effect: highlight; } + -gtk-icon-filter: brightness(1.2); } button.titlebutton:active, button.titlebutton:checked, button:active, button:checked { border-width: 2px; border-style: solid; @@ -431,7 +431,7 @@ button.titlebutton, button { background-color: #fff; border-color: #8d8d8d; background-image: none; - -gtk-icon-effect: none; } + -gtk-icon-filter: none; } button.titlebutton:backdrop:active, button.titlebutton:backdrop:checked, button:backdrop:active, button:backdrop:checked { border-width: 2px; border-style: solid; diff --git a/testsuite/reftests/gtk-image-effect-inherit.css b/testsuite/reftests/gtk-image-effect-inherit.css index f59d33d667..a5d8b23e77 100644 --- a/testsuite/reftests/gtk-image-effect-inherit.css +++ b/testsuite/reftests/gtk-image-effect-inherit.css @@ -1,11 +1,11 @@ GtkBox > :nth-child(1) { - -gtk-icon-effect: none; + -gtk-icon-filter: none; } GtkBox > :nth-child(2) { - -gtk-icon-effect: highlight; + -gtk-icon-filter: brightness(1.2); } GtkBox > :nth-child(3) { - -gtk-icon-effect: dim; + -gtk-icon-filter: opacity(0.5); } diff --git a/testsuite/reftests/icon-effect-missing.css b/testsuite/reftests/icon-effect-missing.css index a3faf81738..286b56e785 100644 --- a/testsuite/reftests/icon-effect-missing.css +++ b/testsuite/reftests/icon-effect-missing.css @@ -1,11 +1,11 @@ * { - -gtk-icon-effect: none; + -gtk-icon-filter: none; } :nth-child(2) { - -gtk-icon-effect: dim; + -gtk-icon-filter: opacity(0.5); } :nth-child(3) { - -gtk-icon-effect: highlight; + -gtk-icon-filter: brightness(1.2); }