From 546cc1d03973abfcccefebd3701bfd89ee38a6c6 Mon Sep 17 00:00:00 2001 From: Narrat Date: Tue, 18 Oct 2016 19:54:48 +0200 Subject: [PATCH] GTK-3.20: Fix deprecations warnings Those were mentioned in #350. Closes #350 --- Paper/gtk-3.20/_common.scss | 4 ++-- Paper/gtk-3.20/apps/_budgie.scss | 8 ++++---- Paper/gtk-3.20/apps/_gnome.scss | 8 ++++---- Paper/gtk-3.20/gtk-dark.css | 13 ++++++------- Paper/gtk-3.20/gtk.css | 13 ++++++------- Paper/gtk-3.20/widgets/_header-bars.scss | 12 ++++++------ 6 files changed, 28 insertions(+), 30 deletions(-) diff --git a/Paper/gtk-3.20/_common.scss b/Paper/gtk-3.20/_common.scss index 07e0fd4..6f1de41 100644 --- a/Paper/gtk-3.20/_common.scss +++ b/Paper/gtk-3.20/_common.scss @@ -35,7 +35,7 @@ $button_transition: all 200ms $ease-out-quad; -GtkDialog-action-area-border: 0; - -GtkPaned-handle-size: 1; + //-GtkPaned-handle-size: 1; // deprecated // We use the outline properties to signal the focus properties // to the adwaita engine: using real CSS properties is faster, @@ -48,4 +48,4 @@ $button_transition: all 200ms $ease-out-quad; -gtk-outline-radius: 2px; -gtk-secondary-caret-color: $selected_bg_color -} \ No newline at end of file +} diff --git a/Paper/gtk-3.20/apps/_budgie.scss b/Paper/gtk-3.20/apps/_budgie.scss index 9809b1d..fd240f3 100644 --- a/Paper/gtk-3.20/apps/_budgie.scss +++ b/Paper/gtk-3.20/apps/_budgie.scss @@ -144,7 +144,7 @@ $asset_suffix: if($variant == 'default', '', '-hc'); padding-right: 2px; border-color: transparentize($budgie_panel_bg_color, 1.0); // fixes the transition - &:hover { -gtk-image-effect: highlight; } + &:hover { -gtk-icon-effect: highlight; } } .pinned, @@ -167,7 +167,7 @@ $asset_suffix: if($variant == 'default', '', '-hc'); padding: 4px; font: bold; text-shadow: 0 1px $shadow_color; - icon-shadow: 0 1px $shadow_color; + -gtk-icon-shadow: 0 1px $shadow_color; background-color: $bg_color; background-image: linear-gradient(to bottom, lighten($bg_color, 5%), @@ -248,7 +248,7 @@ $asset_suffix: if($variant == 'default', '', '-hc'); // MPRIS Applet .raven-mpris { text-shadow: 0 1px $shadow_color; - icon-shadow: 0 1px $shadow_color; + -gtk-icon-shadow: 0 1px $shadow_color; color: $budgie_panel_fg_color; background-color: transparentize($budgie_panel_bg_color, 0.2); border: solid transparentize(black, 0.8); @@ -312,4 +312,4 @@ $asset_suffix: if($variant == 'default', '', '-hc'); .message { color: transparentize($budgie_panel_fg_color, 0.3); } .failure { color: $red; } -} \ No newline at end of file +} diff --git a/Paper/gtk-3.20/apps/_gnome.scss b/Paper/gtk-3.20/apps/_gnome.scss index 77a5a31..12905cf 100644 --- a/Paper/gtk-3.20/apps/_gnome.scss +++ b/Paper/gtk-3.20/apps/_gnome.scss @@ -91,7 +91,7 @@ NautilusCanvasView { .nautilus-circular-button { border-radius: 20px; - outline-radius: 20px; + -gtk-outline-radius: 20px; } .disk-space-display { @@ -128,7 +128,7 @@ NautilusCanvasView { text-shadow: none; } - &:prelight { + &:hover { color: $fg_color; text-shadow: none; } @@ -224,7 +224,7 @@ MathWindow { &:backdrop { background-color: darken($gnome_calculator,10%); - color: transparentize($base_color, 0.5); + color: transparentize($base_color, 0.5); } } } @@ -588,4 +588,4 @@ YelpWindow { background-color: darken($yelp,10%); } } -} \ No newline at end of file +} diff --git a/Paper/gtk-3.20/gtk-dark.css b/Paper/gtk-3.20/gtk-dark.css index 39f0332..d89c7e0 100644 --- a/Paper/gtk-3.20/gtk-dark.css +++ b/Paper/gtk-3.20/gtk-dark.css @@ -87,7 +87,6 @@ read if you used those and something break with a version upgrade you're on your -GtkWidget-text-handle-height: 24; -GtkDialog-button-spacing: 4; -GtkDialog-action-area-border: 0; - -GtkPaned-handle-size: 1; outline-color: rgba(207, 216, 220, 0.3); outline-style: dashed; outline-offset: -3px; @@ -3206,7 +3205,7 @@ headerbar { border-radius: 50%; border: none; box-shadow: none; - icon-shadow: none; + -gtk-icon-shadow: none; margin: 0; padding: 1px; text-shadow: none; @@ -6349,7 +6348,7 @@ decoration { padding-right: 2px; border-color: rgba(38, 50, 56, 0); } .budgie-panel .launcher:hover { - -gtk-image-effect: highlight; } + -gtk-icon-effect: highlight; } .raven { color: #cfd8dc; @@ -6359,7 +6358,7 @@ decoration { padding: 4px; font: bold; text-shadow: 0 1px rgba(0, 0, 0, 0.2); - icon-shadow: 0 1px rgba(0, 0, 0, 0.2); + -gtk-icon-shadow: 0 1px rgba(0, 0, 0, 0.2); background-color: #37474f; background-image: linear-gradient(to bottom, #41555e, #37474f); color: #cfd8dc; @@ -6409,7 +6408,7 @@ decoration { .raven-mpris { text-shadow: 0 1px rgba(0, 0, 0, 0.2); - icon-shadow: 0 1px rgba(0, 0, 0, 0.2); + -gtk-icon-shadow: 0 1px rgba(0, 0, 0, 0.2); color: #cfd8dc; background-color: rgba(38, 50, 56, 0.8); border: solid rgba(0, 0, 0, 0.2); @@ -6522,7 +6521,7 @@ NautilusCanvasView { .nautilus-circular-button { border-radius: 20px; - outline-radius: 20px; } + -gtk-outline-radius: 20px; } .disk-space-display { border: 2px solid; } @@ -6545,7 +6544,7 @@ NautilusCanvasView { .nautilus-desktop .nautilus-canvas-item:active { color: #cfd8dc; text-shadow: none; } - .nautilus-desktop .nautilus-canvas-item:prelight { + .nautilus-desktop .nautilus-canvas-item:hover { color: #cfd8dc; text-shadow: none; } .nautilus-desktop .nautilus-canvas-item:selected { diff --git a/Paper/gtk-3.20/gtk.css b/Paper/gtk-3.20/gtk.css index 718b89e..264c156 100644 --- a/Paper/gtk-3.20/gtk.css +++ b/Paper/gtk-3.20/gtk.css @@ -87,7 +87,6 @@ read if you used those and something break with a version upgrade you're on your -GtkWidget-text-handle-height: 24; -GtkDialog-button-spacing: 4; -GtkDialog-action-area-border: 0; - -GtkPaned-handle-size: 1; outline-color: rgba(68, 68, 68, 0.3); outline-style: dashed; outline-offset: -3px; @@ -3215,7 +3214,7 @@ headerbar { border-radius: 50%; border: none; box-shadow: none; - icon-shadow: none; + -gtk-icon-shadow: none; margin: 0; padding: 1px; text-shadow: none; @@ -6375,7 +6374,7 @@ decoration { padding-right: 2px; border-color: rgba(38, 50, 56, 0); } .budgie-panel .launcher:hover { - -gtk-image-effect: highlight; } + -gtk-icon-effect: highlight; } .raven { color: #444; @@ -6385,7 +6384,7 @@ decoration { padding: 4px; font: bold; text-shadow: 0 1px rgba(0, 0, 0, 0.2); - icon-shadow: 0 1px rgba(0, 0, 0, 0.2); + -gtk-icon-shadow: 0 1px rgba(0, 0, 0, 0.2); background-color: #f7f7f7; background-image: linear-gradient(to bottom, white, #f7f7f7); color: #444; @@ -6435,7 +6434,7 @@ decoration { .raven-mpris { text-shadow: 0 1px rgba(0, 0, 0, 0.2); - icon-shadow: 0 1px rgba(0, 0, 0, 0.2); + -gtk-icon-shadow: 0 1px rgba(0, 0, 0, 0.2); color: #cfd8dc; background-color: rgba(38, 50, 56, 0.8); border: solid rgba(0, 0, 0, 0.2); @@ -6548,7 +6547,7 @@ NautilusCanvasView { .nautilus-circular-button { border-radius: 20px; - outline-radius: 20px; } + -gtk-outline-radius: 20px; } .disk-space-display { border: 2px solid; } @@ -6571,7 +6570,7 @@ NautilusCanvasView { .nautilus-desktop .nautilus-canvas-item:active { color: #444; text-shadow: none; } - .nautilus-desktop .nautilus-canvas-item:prelight { + .nautilus-desktop .nautilus-canvas-item:hover { color: #444; text-shadow: none; } .nautilus-desktop .nautilus-canvas-item:selected { diff --git a/Paper/gtk-3.20/widgets/_header-bars.scss b/Paper/gtk-3.20/widgets/_header-bars.scss index 6dba0e8..d33d11b 100644 --- a/Paper/gtk-3.20/widgets/_header-bars.scss +++ b/Paper/gtk-3.20/widgets/_header-bars.scss @@ -92,7 +92,7 @@ headerbar { .maximized { padding: 6px; - border-radius:0; + border-radius:0; } &:backdrop { @@ -212,7 +212,7 @@ headerbar { color: $backdrop_headerbar_fg_color; } - &:hover { + &:hover { background-image:none; background-color: transparentize(black, 0.85); color:lighten($headerbar_fg_color, 10%); @@ -240,7 +240,7 @@ headerbar { } &:focus, - &:hover { + &:hover { background-image:none; background-color: transparentize(black, 0.85); color:lighten($headerbar_fg_color, 10%); @@ -264,7 +264,7 @@ headerbar { text-shadow: none; -gtk-icon-shadow: none; - + box-shadow: inset 0 -2px 0 0 $headerbar_fg_color; background-color: transparent; @@ -280,7 +280,7 @@ headerbar { } &:focus, - &:hover { + &:hover { background-image:none; background-color: transparentize(black, 0.85); color:lighten($headerbar_fg_color, 10%); @@ -372,7 +372,7 @@ headerbar { border-radius:50%; border: none; box-shadow: none; - icon-shadow: none; + -gtk-icon-shadow: none; margin: 0; padding: 1px; text-shadow: none;