forked from AuroraMiddleware/gtk
Adwaita: use -gtk-icon-shadow
The name icon-shadow has been deprecated and causes warnings.
This commit is contained in:
Matthias Clasen
parent
5f73e8a720
commit
b1f0283630
@ -57,7 +57,7 @@ $asset_suffix: if($variant=='dark', '-dark', '');
|
||||
|
||||
&:backdrop {
|
||||
text-shadow: none;
|
||||
icon-shadow: none;
|
||||
-gtk-icon-shadow: none;
|
||||
color: $backdrop_fg_color;
|
||||
background-color: $backdrop_bg_color;
|
||||
}
|
||||
@ -198,7 +198,7 @@ popover.magnifier,
|
||||
outline-color: transparentize($osd_fg_color, 0.7);
|
||||
box-shadow: none;
|
||||
text-shadow: 0 1px black;
|
||||
icon-shadow: 0 1px black;
|
||||
-gtk-icon-shadow: 0 1px black;
|
||||
&:backdrop { text-shadow: none; }
|
||||
}
|
||||
|
||||
@ -468,7 +468,7 @@ button {
|
||||
@include button(undecorated);
|
||||
box-shadow: none; //FIXME respect no edge on the button mixin
|
||||
text-shadow: 0 1px black;
|
||||
icon-shadow: 0 1px black;
|
||||
-gtk-icon-shadow: 0 1px black;
|
||||
&:hover {
|
||||
@include button(osd-hover);
|
||||
background-clip: padding-box;
|
||||
@ -602,7 +602,7 @@ button {
|
||||
@extend %linked;
|
||||
}
|
||||
|
||||
.primary-toolbar & { icon-shadow: none; } // tango icons don't need shadows
|
||||
.primary-toolbar & { -gtk-icon-shadow: none; } // tango icons don't need shadows
|
||||
|
||||
.linked > &,
|
||||
.linked > &:hover,
|
||||
@ -723,7 +723,7 @@ toolbar.inline-toolbar toolbutton:backdrop {
|
||||
box-shadow: inset 0 1px transparentize(white,1),
|
||||
0 1px transparentize(white, 1);
|
||||
text-shadow: none;
|
||||
icon-shadow: none;
|
||||
-gtk-icon-shadow: none;
|
||||
}
|
||||
|
||||
/* menu buttons */
|
||||
@ -845,28 +845,28 @@ spinbutton {
|
||||
border-color: transparentize($osd_borders_color, 0.3);
|
||||
border-radius: 0;
|
||||
box-shadow: none;
|
||||
icon-shadow: 0 1px black;
|
||||
-gtk-icon-shadow: 0 1px black;
|
||||
&:dir(rtl) { border-style: none solid none none; }
|
||||
&:hover {
|
||||
@include button(undecorated);
|
||||
color: $osd_fg_color;
|
||||
border-color: transparentize(opacify($osd_borders_color, 1), 0.5);
|
||||
background-color: transparentize($osd_fg_color, 0.9);
|
||||
icon-shadow: 0 1px black;
|
||||
-gtk-icon-shadow: 0 1px black;
|
||||
box-shadow: none;
|
||||
}
|
||||
&:backdrop {
|
||||
@include button(undecorated);
|
||||
color: $osd_fg_color;
|
||||
border-color: transparentize(opacify($osd_borders_color, 1), 0.5);
|
||||
icon-shadow: none;
|
||||
-gtk-icon-shadow: none;
|
||||
box-shadow: none;
|
||||
}
|
||||
&:insensitive {
|
||||
@include button(undecorated);
|
||||
color: $osd_insensitive_fg_color;
|
||||
border-color: transparentize(opacify($osd_borders_color, 1), 0.5);
|
||||
icon-shadow: none;
|
||||
-gtk-icon-shadow: none;
|
||||
box-shadow: none;
|
||||
}
|
||||
&:last-child { border-radius: 0 3px 3px 0; }
|
||||
@ -951,12 +951,12 @@ combobox {
|
||||
&:insensitive {
|
||||
color: $insensitive_fg_color;
|
||||
text-shadow: none;
|
||||
icon-shadow: none;
|
||||
-gtk-icon-shadow: none;
|
||||
}
|
||||
&:backdrop {
|
||||
color: $backdrop_fg_color;
|
||||
text-shadow: none;
|
||||
icon-shadow: none;
|
||||
-gtk-icon-shadow: none;
|
||||
}
|
||||
&:backdrop:insensitive {
|
||||
color: $backdrop_insensitive_color;
|
||||
@ -1226,7 +1226,7 @@ headerbar {
|
||||
.arrow {
|
||||
-gtk-icon-source: -gtk-icontheme('pan-down-symbolic');
|
||||
color: transparentize($selected_fg_color,0.5);
|
||||
icon-shadow: none;
|
||||
-gtk-icon-shadow: none;
|
||||
}
|
||||
|
||||
&:backdrop { @extend .selection-menu };
|
||||
@ -1756,7 +1756,7 @@ notebook {
|
||||
padding: 0;
|
||||
border: 1px solid transparent;
|
||||
@extend %undecorated_button;
|
||||
icon-shadow: none;
|
||||
-gtk-icon-shadow: none;
|
||||
transition: none;
|
||||
color: transparentize($fg_color,0.7);
|
||||
&:hover {
|
||||
@ -2049,8 +2049,8 @@ switch {
|
||||
#{$w}#{$s} {
|
||||
-gtk-icon-source: -gtk-scaled(url("assets/#{$a}#{$as}#{$asset_suffix}.png"),
|
||||
url("assets/#{$a}#{$as}#{$asset_suffix}@2.png"));
|
||||
icon-shadow: if(str-index($s,"backdrop"), none, 0 1px 0 $borders_edge); //no edge highlight for :backdrop
|
||||
& button.flat { icon-shadow: none; }
|
||||
-gtk-icon-shadow: if(str-index($s,"backdrop"), none, 0 1px 0 $borders_edge); //no edge highlight for :backdrop
|
||||
& button.flat { -gtk-icon-shadow: none; }
|
||||
}
|
||||
@if $variant == 'light' {
|
||||
// the borders of the light variant versions of checks and radios are
|
||||
@ -2068,7 +2068,7 @@ switch {
|
||||
menu menuitem.#{$w} {
|
||||
-gtk-icon-source: -gtk-icontheme('#{$a}-symbolic');
|
||||
color: mix($fg_color, $bg_color, 60%);
|
||||
icon-shadow: none;
|
||||
-gtk-icon-shadow: none;
|
||||
&:active, &:checked {
|
||||
-gtk-icon-source: -gtk-icontheme('#{$a}-checked-symbolic');
|
||||
}
|
||||
@ -2083,8 +2083,8 @@ switch {
|
||||
//treeview and rows
|
||||
.view.check, .view.radio,
|
||||
row .check, row .radio {
|
||||
icon-shadow: none;
|
||||
&:selected, &:hover { icon-shadow: none; }
|
||||
-gtk-icon-shadow: none;
|
||||
&:selected, &:hover { -gtk-icon-shadow: none; }
|
||||
}
|
||||
|
||||
//selection-mode
|
||||
@ -2097,7 +2097,7 @@ row .check, row .radio {
|
||||
(':checked:active', '-checked-active-selectionmode'),
|
||||
(':backdrop:checked', '-checked-backdrop-selectionmode') {
|
||||
.view.content-view.check#{$s}:not(list) {
|
||||
icon-shadow: none;
|
||||
-gtk-icon-shadow: none;
|
||||
-gtk-icon-source: -gtk-scaled(url("assets/checkbox#{$as}.png"),
|
||||
url("assets/checkbox#{$as}@2.png"));
|
||||
background-color: transparent;
|
||||
@ -2675,7 +2675,7 @@ row {
|
||||
@include button(osd);
|
||||
&.flat {
|
||||
@extend %undecorated_button;
|
||||
icon-shadow: 0 1px black;
|
||||
-gtk-icon-shadow: 0 1px black;
|
||||
text-shadow: 0 1px black;
|
||||
&:backdrop,
|
||||
&:insensitive,
|
||||
@ -3304,13 +3304,13 @@ headerbar button.titlebutton,
|
||||
@extend button.flat;
|
||||
@extend .image-button;
|
||||
@include _button_text_shadow;
|
||||
&:backdrop { icon-shadow: none; }
|
||||
&:backdrop { -gtk-icon-shadow: none; }
|
||||
}
|
||||
|
||||
headerbar.selection-mode button.titlebutton,
|
||||
.titlebar.selection-mode button.titlebutton {
|
||||
@include _button_text_shadow(white, $selected_bg_color);
|
||||
&:backdrop { icon-shadow: none; }
|
||||
&:backdrop { -gtk-icon-shadow: none; }
|
||||
}
|
||||
|
||||
|
||||
@ -3382,7 +3382,7 @@ popover.touch-selection {
|
||||
outline-color: transparentize($osd_fg_color, 0.7);
|
||||
box-shadow: none;
|
||||
text-shadow: 0 1px black;
|
||||
icon-shadow: 0 1px black;
|
||||
-gtk-icon-shadow: 0 1px black;
|
||||
&:backdrop { text-shadow: none; }
|
||||
button {
|
||||
@include button(osd);
|
||||
@ -3408,7 +3408,7 @@ popover.touch-selection {
|
||||
(':checked:active', '-checked-active'),
|
||||
(':backdrop:checked', '-checked-backdrop') {
|
||||
.#{$w}#{$s} {
|
||||
icon-shadow: none;
|
||||
-gtk-icon-shadow: none;
|
||||
-gtk-icon-source: -gtk-scaled(url("assets/#{$a}#{$as}-dark.png"),
|
||||
url("assets/#{$a}#{$as}-dark@2.png"));
|
||||
}
|
||||
|
||||
@ -91,7 +91,7 @@
|
||||
background-clip: padding-box;
|
||||
box-shadow: none;
|
||||
text-shadow: 0 1px black;
|
||||
icon-shadow: 0 1px black;
|
||||
-gtk-icon-shadow: 0 1px black;
|
||||
}
|
||||
@if $t==osd-focus {
|
||||
color: $osd_text_color;
|
||||
@ -100,7 +100,7 @@
|
||||
background-clip: padding-box;
|
||||
box-shadow: entry_focus_shadow($fc);
|
||||
text-shadow: 0 1px black;
|
||||
icon-shadow: 0 1px black;
|
||||
-gtk-icon-shadow: 0 1px black;
|
||||
}
|
||||
@if $t==osd-insensitive {
|
||||
color: $osd_insensitive_fg_color;
|
||||
@ -109,7 +109,7 @@
|
||||
background-clip: padding-box;
|
||||
box-shadow: none;
|
||||
text-shadow: none;
|
||||
icon-shadow: none;
|
||||
-gtk-icon-shadow: none;
|
||||
}
|
||||
@if $t==osd-backdrop {
|
||||
color: $osd_text_color;
|
||||
@ -118,7 +118,7 @@
|
||||
background-clip: padding-box;
|
||||
box-shadow: none;
|
||||
text-shadow: none;
|
||||
icon-shadow: none;
|
||||
-gtk-icon-shadow: none;
|
||||
}
|
||||
}
|
||||
|
||||
@ -166,11 +166,11 @@
|
||||
|
||||
@if lightness($tc)<50% {
|
||||
text-shadow: 0 1px $_shadow;
|
||||
icon-shadow: 0 1px $_shadow;
|
||||
-gtk-icon-shadow: 0 1px $_shadow;
|
||||
}
|
||||
@else {
|
||||
text-shadow: 0 -1px $_shadow;
|
||||
icon-shadow: 0 -1px $_shadow;
|
||||
-gtk-icon-shadow: 0 -1px $_shadow;
|
||||
}
|
||||
}
|
||||
|
||||
@ -253,7 +253,7 @@
|
||||
$insensitive_borders_color);
|
||||
background-image: linear-gradient(to bottom, $_bg);
|
||||
text-shadow: none;
|
||||
icon-shadow: none;
|
||||
-gtk-icon-shadow: none;
|
||||
// white with 0 alpha to avoid an ugly transition, since no color means
|
||||
// black with 0 alpha
|
||||
@include _shadows(inset 0 1px transparentize(white,1), $_button_edge);
|
||||
@ -287,7 +287,7 @@
|
||||
border-color: if($c!=$bg_color, $_bc, $backdrop_borders_color);
|
||||
background-image: linear-gradient(to bottom, $_bg);
|
||||
text-shadow: none;
|
||||
icon-shadow: none;
|
||||
-gtk-icon-shadow: none;
|
||||
@include _shadows(inset 0 1px transparentize(white,1),
|
||||
$_blank_edge);
|
||||
}
|
||||
@ -318,7 +318,7 @@
|
||||
border-color: if($c!=$bg_color, $_bc, $backdrop_borders_color);
|
||||
background-image: linear-gradient(to bottom, $_bg);
|
||||
text-shadow: none;
|
||||
icon-shadow: none;
|
||||
-gtk-icon-shadow: none;
|
||||
// white with 0 alpha to avoid an ugly transition, since no color means
|
||||
// black with 0 alpha
|
||||
@include _shadows(inset 0 1px transparentize(white,1),
|
||||
@ -356,7 +356,7 @@
|
||||
background-clip: padding-box;
|
||||
box-shadow: inset 0 1px transparentize(white, 0.9);
|
||||
text-shadow: 0 1px black;
|
||||
icon-shadow: 0 1px black;
|
||||
-gtk-icon-shadow: 0 1px black;
|
||||
outline-color: transparentize($osd_fg_color, 0.7);
|
||||
}
|
||||
@else if $t==osd-hover {
|
||||
@ -372,7 +372,7 @@
|
||||
background-clip: padding-box;
|
||||
box-shadow: inset 0 1px transparentize(white, 0.9);
|
||||
text-shadow: 0 1px black;
|
||||
icon-shadow: 0 1px black;
|
||||
-gtk-icon-shadow: 0 1px black;
|
||||
outline-color: transparentize($osd_fg_color, 0.7);
|
||||
}
|
||||
@else if $t==osd-active {
|
||||
@ -387,7 +387,7 @@
|
||||
background-clip: padding-box;
|
||||
box-shadow: none;
|
||||
text-shadow: none;
|
||||
icon-shadow: none;
|
||||
-gtk-icon-shadow: none;
|
||||
outline-color: transparentize($osd_fg_color, 0.7);
|
||||
}
|
||||
@else if $t==osd-insensitive {
|
||||
@ -400,7 +400,7 @@
|
||||
background-clip: padding-box;
|
||||
box-shadow: none;
|
||||
text-shadow: none;
|
||||
icon-shadow: none;
|
||||
-gtk-icon-shadow: none;
|
||||
}
|
||||
@else if $t==osd-backdrop {
|
||||
//
|
||||
@ -415,7 +415,7 @@
|
||||
background-clip: padding-box;
|
||||
box-shadow: none;
|
||||
text-shadow: none;
|
||||
icon-shadow: none;
|
||||
-gtk-icon-shadow: none;
|
||||
}
|
||||
@else if $t==undecorated {
|
||||
//
|
||||
@ -429,7 +429,7 @@
|
||||
$_blank_edge);
|
||||
|
||||
text-shadow: none;
|
||||
icon-shadow: none;
|
||||
-gtk-icon-shadow: none;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user