AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-11-09 10:20:07 +00:00
Code Issues Projects Releases Wiki Activity

gtk: Replace -gtk-icon-effect with -gtk-icon-filter

Browse Source 
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.
This commit is contained in:
Benjamin Otte 2016-12-31 01:29:14 +01:00
parent 2645b5a7d7
commit 5b33127692
8 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gtk/theme/Adwaita/_common.scss
View File

@ -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%); }

10
gtk/theme/Adwaita/gtk-contained-dark.css
View File

@ -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; }

10
gtk/theme/Adwaita/gtk-contained.css
View File

@ -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; }

6
gtk/theme/HighContrast/_common.scss
View File

@ -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); }

6
gtk/theme/HighContrast/gtk-contained-inverse.css
View File

@ -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;

6
gtk/theme/HighContrast/gtk-contained.css
View File

@ -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;

6
testsuite/reftests/gtk-image-effect-inherit.css
View File

@ -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);
}

6
testsuite/reftests/icon-effect-missing.css
View File

@ -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);
}