PoliEcho/kaliish-orange-theme
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GTK3: update gtk 3.24.24

Browse Source
This commit is contained in:
Daniel Ruiz de Alegría
2020-12-18 18:18:16 +01:00
parent c742577e73
commit cc2ea538f0
10 changed files with 215 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/themes/Kali/sass/gtk-sass/libhandy/_fallback-base.scss
+26
View File
@@ -69,6 +69,7 @@ row.expander {
// Shadows
flap,
deck,
leaflet {
> dimming {
@@ -136,6 +137,8 @@ avatar {
}
&.contrasted { color: #fff; }
&.image { background: none; }
}
// HdyViewSwitcherTitle
@@ -144,3 +147,26 @@ viewswitchertitle viewswitcher {
margin-left: 12px;
margin-right: 12px;
}
// HdyStatusPage
statuspage > scrolledwindow > viewport > box {
margin: 36px 12px;
> clamp > box {
> .icon {
margin-bottom: 36px;
opacity: 0.5;
}
> .title {
margin-bottom: 12px;
}
> .description {
margin-bottom: 36px;
}
}
}
src/themes/Kali/sass/gtk-sass/libhandy/sync.sh
+1 -1
View File
@@ -7,7 +7,7 @@ RESET='\033[0m'
while read file;
do
echo
echo " $GREEN[ * ]$RESET Downloading file $file"
echo -e " $GREEN[ * ]$RESET Downloading file $file"
wget https://gitlab.gnome.org/GNOME/libhandy/-/raw/master/src/themes/$file --timestamping --quiet
done <<- EOF
_definitions.scss
src/themes/Kali/sass/gtk-sass/upstream/_colors.scss
-1
View File
@@ -1,7 +1,6 @@
// When color definition differs for dark and light variant
// it gets @if ed depending on $variant
$base_color: if($variant == 'light', #ffffff, lighten(desaturate(#241f31, 100%), 2%));
$text_color: if($variant == 'light', black, white);
$bg_color: if($variant == 'light', #f6f5f4, darken(desaturate(#3d3846, 100%), 4%));
src/themes/Kali/sass/gtk-sass/upstream/_common.scss
+6 -5
View File
@@ -916,16 +916,14 @@ button {
$_border_bg: linear-gradient(to top, $alt-borders-color 25%, $borders-color 50%);
&:not(.flat):not(.osd):not(:checked):not(:active):not(:disabled):not(:backdrop) {
@include button(normal);
@include button(normal, $backimage: $_border_bg);
background-image: $button_fill, $_border_bg;
border-color: transparent;
}
&:hover:not(.osd):not(:checked):not(:active):not(:disabled):not(:backdrop) {
@include button(hover);
@include button(hover, $backimage: $_border_bg);
background-image: $button_fill, $_border_bg;
border-color: transparent;
}
@@ -1947,6 +1945,9 @@ filechooser .path-bar.linked > button {
/**************
* Tree Views *
**************/
$_treeview_borders_color: if($variant=='light',mix($borders_color, $base_color,80%),mix($fg_color, $base_color, 20%));
treeview.view {
@at-root * {
-GtkTreeView-horizontal-separator: 4;
@@ -2130,7 +2131,7 @@ treeview.view {
padding: 0 6px;
background-image: none;
border-style: none solid solid none;
border-color: $bg_color;
border-color: $_treeview_borders_color;
border-radius: 0;
text-shadow: none;
src/themes/Kali/sass/gtk-sass/upstream/_drawing.scss
+24 -37
View File
@@ -166,7 +166,7 @@
}
}
@mixin button($t, $c:$bg_color, $tc:$fg_color, $edge: none) {
@mixin button($t, $c:$bg_color, $tc:$fg_color, $edge: none, $backimage: null) {
//
// Button drawing function
//
@@ -175,13 +175,13 @@
// $tc: optional text color for colored* types
// $edge: set to none to not draw the bottom edge or specify a color to not
// use the default one
// $backimage: additional background-image behind the default one
// (for the button.circular hack)
//
// possible $t values:
// normal, hover, active, insensitive, insensitive-active,
// backdrop, backdrop-active, backdrop-insensitive, backdrop-insensitive-active,
// osd, osd-hover, osd-active, osd-insensitive, osd-backdrop, undecorated
//
// This mixin sets the $button_fill global variable which containts the button background-image
//
$_hilight_color: _button_hilight_color($c);
$_button_edge: if($edge == none, none, _widget_edge($edge));
@@ -196,8 +196,8 @@
outline-color: transparentize($tc, 0.7);
border-color: if($c != $bg_color, _border_color($c), $borders_color);
border-bottom-color: if($c != $bg_color, _border_color($c, true), $alt_borders_color);
$button_fill: linear-gradient(to top, if($c != $bg_color, $c, lighten($c, 3%)) 2px, lighten($c, 5%)) !global;
background-image: $button_fill;
background-image: linear-gradient(to top, if($c != $bg_color, $c, lighten($c, 3%)) 2px, lighten($c, 5%)),
$backimage;
@include _button_text_shadow($tc, $c);
@include _shadows(inset 0 1px $_hilight_color, $_button_edge, $_button_shadow);
}
@@ -211,16 +211,17 @@
border-color: if($c != $bg_color, _border_color($c), $borders_color);
border-bottom-color: if($c != $bg_color, _border_color($c, true), $alt_borders_color);
@if $variant == 'light' {
$button_fill: linear-gradient(to top, $c, lighten($c, 1%) 1px) !global;
background-image: linear-gradient(to top, $c, lighten($c, 1%) 1px),
$backimage;
@include _button_text_shadow($tc, lighten($c, 6%));
@include _shadows(inset 0 1px _button_hilight_color(lighten($c, 6%)), $_button_edge, $_button_shadow);
}
@else {
$button_fill: linear-gradient(to top, darken($c,1%), lighten($c, 1%) 1px) !global;
background-image: linear-gradient(to top, darken($c,1%), lighten($c, 1%) 1px),
$backimage;
@include _button_text_shadow($tc,lighten($c, 6%));
@include _shadows(inset 0 1px _button_hilight_color(darken($c, 2%)), $_button_edge, $_button_shadow);
}
background-image: $button_fill;
}
@if $t==normal-alt {
@@ -251,16 +252,15 @@
outline-color: transparentize($tc, 0.7);
border-color: if($c != $bg_color, _border_color($c, true), $alt_borders_color);
@if $variant == 'light' {
$button_fill: linear-gradient(to bottom, lighten($c, 9%) 10%, lighten($c, 4%) 90%) !global;
background-image: linear-gradient(to bottom, lighten($c, 9%) 10%, lighten($c, 4%) 90%);
@include _shadows(inset 0 1px _button_hilight_color(lighten($c, 6%)),
$_button_edge, $_button_shadow);
}
@else {
$button_fill: linear-gradient(to bottom, $c 20%, darken($c, 4%) 90%) !global;
background-image: linear-gradient(to bottom, $c 20%, darken($c, 4%) 90%);
@include _shadows(inset 0 1px $_hilight_color,
$_button_edge, $_button_shadow);
}
background-image: $button_fill;
}
@else if $t==active {
@@ -270,8 +270,7 @@
color: $tc;
outline-color: transparentize($tc, 0.7);
border-color: if($c != $bg_color, _border_color($c), $borders_color);
$button_fill: if($variant == 'light', image(darken($c, 14%)), image(darken($c, 9%))) !global;
background-image: $button_fill;
background-image: if($variant == 'light', image(darken($c, 14%)), image(darken($c, 9%)));
@include _shadows(inset 0 1px transparentize($_hilight_color, 1), $_button_edge);
text-shadow: none;
@@ -286,8 +285,7 @@
color: if($tc != $fg_color, mix($tc, $_bg, 50%), $insensitive_fg_color);
border-color: if($c != $bg_color, _border_color($c), $insensitive_borders_color);
$button_fill: image($_bg) !global;
background-image: $button_fill;
background-image: image($_bg);
text-shadow: none;
-gtk-icon-shadow: none;
// white with 0 alpha to avoid an ugly transition, since no color means
@@ -304,8 +302,7 @@
color: if($c != $bg_color, mix($tc, $_bg, 60%), $insensitive_fg_color);
border-color: $_bc;
$button_fill: image($_bg) !global;
background-image: $button_fill;
background-image: image($_bg);
// 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);
@@ -320,8 +317,7 @@
color: if($tc != $fg_color, mix($tc, $_bg, 80%), $backdrop_fg_color);
border-color: if($c != $bg_color, $_bc, $backdrop_borders_color);
$button_fill: image($_bg) !global;
background-image: $button_fill;
background-image: image($_bg);
text-shadow: none;
-gtk-icon-shadow: none;
@include _shadows(inset 0 1px transparentize(white, 1), $_blank_edge);
@@ -336,8 +332,7 @@
color: if($tc != $fg_color, mix($tc, $_bg, 80%), $backdrop_fg_color);
border-color: if($c != $bg_color, $_bc, $backdrop_borders_color);
$button_fill: image($_bg) !global;
background-image: $button_fill;
background-image: image($_bg);
@include _shadows(inset 0 1px transparentize(white, 1), $_blank_edge);
}
@@ -351,8 +346,7 @@
color: if($c != $bg_color, mix($tc, $_bg, 35%), $backdrop_insensitive_color);
border-color: if($c != $bg_color, $_bc, $backdrop_borders_color);
$button_fill: image($_bg) !global;
background-image: $button_fill;
background-image: image($_bg);
text-shadow: none;
-gtk-icon-shadow: none;
// white with 0 alpha to avoid an ugly transition, since no color means
@@ -370,8 +364,7 @@
color: if($c != $bg_color, mix($tc, $_bg, 35%), $backdrop_insensitive_color);
border-color: if($c != $bg_color, $_bc, $backdrop_borders_color);
$button_fill: image($_bg) !global;
background-image: $button_fill;
background-image: image($_bg);
@include _shadows(inset 0 1px transparentize(white, 1), $_blank_edge);
}
@@ -384,8 +377,7 @@
color: $osd_fg_color;
border-color: $osd_borders_color;
background-color: transparent;
$button_fill: image($_bg) !global;
background-image: $button_fill;
background-image: image($_bg);
background-clip: padding-box;
box-shadow: inset 0 1px transparentize(white, 0.9);
text-shadow: 0 1px black;
@@ -402,8 +394,7 @@
color: white;
border-color: $osd_borders_color;
background-color: transparent;
$button_fill: image($_bg) !global;
background-image: $button_fill;
background-image: image($_bg);
background-clip: padding-box;
box-shadow: inset 0 1px transparentize(white, 0.9);
text-shadow: 0 1px black;
@@ -420,8 +411,7 @@
color: white;
border-color: $osd_borders_color;
background-color: transparent;
$button_fill: image($_bg) !global;
background-image: $button_fill;
background-image: image($_bg);
background-clip: padding-box;
box-shadow: none;
text-shadow: none;
@@ -436,8 +426,7 @@
color: $osd_insensitive_fg_color;
border-color: $osd_borders_color;
background-color: transparent;
$button_fill: image($osd_insensitive_bg_color) !global;
background-image: $button_fill;
background-image: image($osd_insensitive_bg_color);
background-clip: padding-box;
box-shadow: none;
text-shadow: none;
@@ -453,8 +442,7 @@
color: $osd_fg_color;
border-color: $osd_borders_color;
background-color: transparent;
$button_fill: image($_bg) !global;
background-image: $button_fill;
background-image: image($_bg);
background-clip: padding-box;
box-shadow: none;
text-shadow: none;
@@ -467,8 +455,7 @@
//
border-color: transparent;
background-color: transparent;
$button_fill: none !global;
background-image: $button_fill;
background-image: none;
@include _shadows(inset 0 1px transparentize(white, 1), $_blank_edge);
src/themes/Kali/sass/gtk-sass/upstream/_drawing.scss.patch
+4 -3
View File
@@ -7,7 +7,8 @@
---
> $_button_shadow: inset 0 -1px 0 transparentize(if($c != $bg_color, _border_color($c), $borders_color), .25), 0 1px 2px transparentize($shadow_color, 0.03);
199,200c199
< $button_fill: if($variant == 'light', linear-gradient(to top, darken($c, 4%) 2px, $c),
< linear-gradient(to top, darken($c,1%) 2px, $c)) !global;
< background-image: if($variant == 'light', linear-gradient(to top, darken($c, 4%) 2px, $c),
< linear-gradient(to top, darken($c,1%) 2px, $c)),
---
> $button_fill: linear-gradient(to top, if($c != $bg_color, $c, lighten($c, 3%)) 2px, lighten($c, 5%)) !global;
> background-image: linear-gradient(to top, if($c != $bg_color, $c, lighten($c, 3%)) 2px, lighten($c, 5%)),
src/themes/Kali/sass/gtk-sass/upstream/sync.sh
+1 -1
View File
@@ -4,7 +4,7 @@ GREEN='\033[0;32m'
YELLOW='\033[0;33m'
RESET='\033[0m'
VERSION=3.24.23
VERSION=3.24.24
echo
echo -e " $YELLOW[ i ]$RESET Upstream version $VERSION"