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

GTK3: update upstream 3.24.14

Browse Source
This commit is contained in:
Daniel Ruiz de Alegría 2020-03-06 11:04:44 +01:00
parent c8c7afdf0c
commit 87f2b7e506
7 changed files with 696 additions and 1027 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

501
share/themes/Kali-Dark/gtk-3.0/gtk.css
View File

File diff suppressed because it is too large Load Diff

501
share/themes/Kali-Light/gtk-3.0/gtk-dark.css
View File

File diff suppressed because it is too large Load Diff

504
share/themes/Kali-Light/gtk-3.0/gtk.css
View File

File diff suppressed because it is too large Load Diff

6
src/themes/Kali/sass/gtk-sass/_common-tweaks.scss
View File

@ -200,7 +200,7 @@ infobar {
*:link { color: $link_color; }
}
&.info {
&.info, &.info.action:hover {
&:backdrop > revealer > box, & > revealer > box {
background-color: $selected_bg_color;
}
@ -208,7 +208,7 @@ infobar {
@include _infobar_button($selected_bg_color);
}
&.question, &.warning {
&.question, &.warning, &.question.action:hover, &.warning.action:hover {
&:backdrop > revealer > box, & > revealer > box {
background-color: $warning_color;
}
@ -216,7 +216,7 @@ infobar {
@include _infobar_button($warning_color);
}
&.error {
&.error, &.error.action:hover {
&:backdrop > revealer > box, & > revealer > box {
background-color: $error_color;

150
src/themes/Kali/sass/gtk-sass/upstream/_common.scss
View File

@ -179,13 +179,8 @@ label {
&.separator {
@extend .dim-label;
color: $fg_color;
&:backdrop { color: $backdrop_fg_color; }
}
row:selected &,
&:selected { @extend %nobg_selected_items; }
selection {
@ -196,14 +191,18 @@ label {
&:disabled {
color: $insensitive_fg_color;
selection { @extend %selected_items_disabled; }
button & { color: inherit; }
&:backdrop { color: $backdrop_insensitive_color; }
&:backdrop {
color: $backdrop_insensitive_color;
button & { color: inherit; }
}
selection { @extend %selected_items_disabled; }
}
&:backdrop {
color: $backdrop_fg_color;
selection { @extend %selected_items_backdrop; }
}
}
@ -268,6 +267,47 @@ spinner {
}
}
/**********************
* General Typography *
**********************/
.large-title {
font-weight: 300;
font-size: 24pt;
letter-spacing: 0.2rem;
}
.title-1 {
font-weight: 800;
font-size: 20pt;
}
.title-2 {
font-weight: 800;
font-size: 15pt;
}
.title-3 {
font-weight: 700;
font-size: 15pt;
}
.title-4 {
font-weight: 700;
font-size: 13pt;
}
.heading {
font-weight: 700;
font-size: 11pt;
}
.body {
font-weight: 400;
font-size: 11pt;
}
.caption-heading {
font-weight: 700;
font-size: 9pt;
}
.caption {
font-weight: 400;
font-size: 9pt;
}
/****************
* Text Entries *
@ -591,6 +631,7 @@ button {
}
}
@at-root %button_basic_flat,
&.flat { &:backdrop, &:disabled, &:backdrop:disabled { @include button(undecorated); }}
&:disabled {
@ -632,8 +673,11 @@ button {
@at-root %button_selected, & {
row:selected & {
@if $variant == 'light' { border-color: $selected_borders_color; }
}
&.flat:not(:active):not(:checked):not(:hover):not(disabled) {
@at-root %button_selected_flat, &.flat {
row:selected & {
&:not(:active):not(:checked):not(:hover):not(disabled) {
color: $selected_fg_color;
border-color: transparent;
@ -641,6 +685,7 @@ button {
}
}
}
}
// big standalone buttons like in Documents pager
@ -973,6 +1018,7 @@ toolbar.inline-toolbar toolbutton:backdrop {
%linked_middle {
border-radius: 0;
border-right-style: none;
-gtk-outline-radius: 0;
}
%linked_left {
@ -981,6 +1027,10 @@ toolbar.inline-toolbar toolbutton:backdrop {
border-top-right-radius: 0;
border-bottom-right-radius: 0;
border-right-style: none;
-gtk-outline-bottom-left-radius: $button_radius;
-gtk-outline-top-left-radius: $button_radius;
-gtk-outline-top-right-radius: 0;
-gtk-outline-bottom-right-radius: 0;
}
%linked_right {
@ -989,11 +1039,16 @@ toolbar.inline-toolbar toolbutton:backdrop {
border-top-right-radius: $button_radius;
border-bottom-right-radius: $button_radius;
border-right-style: solid;
-gtk-outline-bottom-right-radius: $button_radius;
-gtk-outline-top-right-radius: $button_radius;
-gtk-outline-bottom-left-radius: 0;
-gtk-outline-top-left-radius: 0;
}
%linked_only_child {
border-radius: $button_radius;
border-style: solid;
-gtk-outline-radius: $button_radius;
}
// .linked assumes Box, which reverses nodes in RTL, so 1st child is always left
@ -1137,28 +1192,29 @@ list row button.image-button:not(.flat) {
&:visited {
color: $link_visited_color;
*:selected & { color: mix($selected_fg_color, $selected_bg_color, 60%); }
*:selected & { color: mix($selected_fg_color, $link_visited_color, 60%); }
}
&:hover {
color: lighten($link_color,10%);
$_fg: lighten($link_color, 10%);
color: $_fg;
*:selected & { color: mix($selected_fg_color, $selected_bg_color, 90%); }
*:selected & { color: mix($selected_fg_color, $_fg, 90%); }
}
&:active {
color: $link_color;
*:selected & { color: mix($selected_fg_color, $selected_bg_color, 80%); }
*:selected & { color: mix($selected_fg_color, $link_color, 80%); }
}
&:disabled, &:disabled:backdrop { color: transparentize(desaturate($link_color,100%), 0.2); }
&:disabled, &:disabled:backdrop { color: transparentize(desaturate($link_color, 100%), 0.2); }
&:backdrop { &:backdrop:hover, &:backdrop:hover:selected, & { color: $selected_bg_color; }}
&:backdrop { &:backdrop:hover, &:backdrop:hover:selected, & { color: transparentize($link_color, 0.1); }}
@at-root %link_selected,
&:selected,
*:selected & { color: mix($selected_fg_color, $selected_bg_color, 80%); }
*:selected & { color: mix($selected_fg_color, $link_color, 80%); }
}
button:link,
@ -1595,6 +1651,7 @@ headerbar {
button {
@include button(normal, $suggested_bg_color, $selected_fg_color);
@at-root %selection_mode_button_flat,
&.flat { @include button(undecorated); }
&:hover { @include button(hover, $suggested_bg_color, $selected_fg_color); }
@ -1632,6 +1689,7 @@ headerbar {
}
}
@at-root %selection_mode_button_flat,
&.flat { &:backdrop, &:disabled, &:backdrop:disabled { @include button(undecorated); }}
&:disabled {
@ -1841,26 +1899,20 @@ headerbar { // headerbar border rounding
window.devel {
headerbar.titlebar:not(.selection-mode) {
$c: darken($bg_color, 10%);
$gradient: -gtk-icontheme("system-run-symbolic") 90% 0/256px 256px no-repeat,
$gradient: cross-fade(10% -gtk-icontheme("system-run-symbolic"), image(transparent)) 90% 0/256px 256px no-repeat,
linear-gradient(to right, transparent 65%, transparentize($selected_bg_color, 0.8)),
linear-gradient(to top, darken($c, 3%), $c 3px, lighten($c, 6%));
@if $variant == 'dark' {
$gradient: -gtk-icontheme("system-run-symbolic") 90% 0/256px 256px no-repeat,
$gradient: cross-fade(10% -gtk-icontheme("system-run-symbolic"), image(transparent)) 90% 0/256px 256px no-repeat,
linear-gradient(to right, transparent 65%, transparentize($selected_bg_color, 0.9)),
linear-gradient(to top, lighten($c, 3%) 3px, lighten($c, 5%));
}
background: $bg_color $gradient;
color: transparentize($fg_color,.9);
label { color: $fg_color; }
&:backdrop {
background: $bg_color -gtk-icontheme("system-run-symbolic") 90% 0/256px 256px no-repeat,
background: $bg_color cross-fade(10% -gtk-icontheme("system-run-symbolic"), image(transparent)) 90% 0/256px 256px no-repeat,
image($bg_color); /* background-color would flash */
color: transparentize($fg_color,.95);
label { color: $backdrop_fg_color; }
}
}
}
@ -2282,6 +2334,13 @@ popover.background {
border-radius: $popover_radius;
}
.csd & {
$_popover_border: if($variant=='light', transparentize(black, 0.77), transparentize($borders_color, 0.1));
background-clip: padding-box;
border-color: $_popover_border;
}
box-shadow: 0 1px 2px transparentize(black, 0.7);
&:backdrop {
@ -3778,6 +3837,7 @@ list {
border-color: $borders_color;
&:backdrop {
color: $backdrop_text_color;
background-color: $backdrop_base_color;
border-color: $backdrop_borders_color;
}
@ -3932,15 +3992,31 @@ messagedialog { // Message Dialog styling
border-right-style: none;
border-bottom-style: none;
&:first-child{
&:first-child:not(:only-child) {
border-left-style: none;
border-bottom-left-radius: 7px;
-gtk-outline-bottom-left-radius: 5px;
border-bottom-left-radius: $button_radius + 2;
-gtk-outline-bottom-left-radius: $button_radius + 2;
-gtk-outline-top-left-radius: 0px;
-gtk-outline-top-right-radius: 0px;
-gtk-outline-bottom-right-radius: 0px;
}
&:last-child {
border-bottom-right-radius: 7px;
-gtk-outline-bottom-right-radius: 5px;
&:last-child:not(:only-child) {
border-bottom-right-radius: $button_radius + 2;
-gtk-outline-bottom-right-radius: $button_radius + 2;
-gtk-outline-top-right-radius: 0px;
-gtk-outline-bottom-left-radius: 0px;
-gtk-outline-top-left-radius: 0px;
}
&:only-child {
border-top-right-radius: 0;
border-top-left-radius: 0;
border-bottom-left-radius: $button_radius + 2;
border-bottom-right-radius: $button_radius + 2;
-gtk-outline-top-right-radius: 0px;
-gtk-outline-top-left-radius: 0px;
-gtk-outline-bottom-left-radius: $button_radius + 2;
-gtk-outline-bottom-right-radius: $button_radius + 2;
}
}
}
@ -4083,7 +4159,7 @@ placessidebar {
@at-root button.sidebar-button {
@extend %button_basic_flat;
@extend %button_selected.flat;
@extend %button_selected_flat;
min-height: 26px;
min-width: 26px;
@ -4220,6 +4296,12 @@ paned {
infobar {
border-style: none;
&.action:hover > revealer > box {
background-color: if($variant == 'light', desaturate(lighten(invert($selected_bg_color), 47%), 30%),
desaturate(darken(invert($selected_bg_color),42%), 70%));
border-bottom: 1px solid lighten($borders_color, 5%);
}
&.info,
&.question,
&.warning,
@ -4571,7 +4653,7 @@ button.titlebutton {
}
.selection-mode & {
@extend %button.flat.suggested-action;
@extend %selection_mode_button_flat;
@extend %nobg_selected_items;
}

18
src/themes/Kali/sass/gtk-sass/upstream/_drawing.scss
View File

@ -285,8 +285,7 @@
//
$_bg: if($c != $bg_color, mix($c, $base_color, 85%), $insensitive_bg_color);
label, & { color: if($tc != $fg_color, mix($tc, $_bg, 50%), $insensitive_fg_color); }
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;
@ -304,8 +303,7 @@
$_bg: if($variant == 'light', darken(mix($c, $base_color, 85%), 8%), darken(mix($c, $base_color, 85%), 6%));
$_bc: if($c != $bg_color, _border_color($c), $insensitive_borders_color);
label, & { color: if($c != $bg_color, mix($tc, $_bg, 60%), $insensitive_fg_color); }
color: if($c != $bg_color, mix($tc, $_bg, 60%), $insensitive_fg_color);
border-color: $_bc;
$button_fill: image($_bg) !global;
background-image: $button_fill;
@ -321,8 +319,7 @@
$_bg: if($c != $bg_color, $c, $backdrop_bg_color);
$_bc: if($variant == 'light', $c, _border_color($c));
label, & { color: if($tc != $fg_color, mix($tc, $_bg, 80%), $backdrop_fg_color); }
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;
@ -338,8 +335,7 @@
$_bg: if($variant == 'light', darken(mix($c, $base_color, 85%), 8%), darken(mix($c, $base_color, 85%), 4%));
$_bc: if($variant == 'light', $_bg ,_border_color($c));
label, & { color: if($tc != $fg_color, mix($tc, $_bg, 80%), $backdrop_fg_color); }
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;
@ -354,8 +350,7 @@
$_bg: if($c != $bg_color, mix($c, $base_color, 85%), $insensitive_bg_color);
$_bc: if($variant == 'light', $_bg,_border_color($c));
label, & { color: if($c != $bg_color, mix($tc, $_bg, 35%), $backdrop_insensitive_color); }
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;
@ -374,8 +369,7 @@
$_bg: if($variant == 'light', darken(mix($c, $base_color, 85%), 8%), darken(mix($c, $base_color, 85%), 4%));
$_bc: if($variant == 'light', $_bg, _border_color($c));
label { color: if($c != $bg_color, mix($tc, $_bg, 35%), $backdrop_insensitive_color); }
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;

21
src/themes/Kali/sass/gtk-sass/upstream/sync.sh
View File

@ -1,23 +1,26 @@
#!/bin/sh
VERSION=3.24.13
GREEN='\033[0;32m'
YELLOW='\033[0;33m'
RESET='\033[0m'
echo "[+] Pulling version $VERSION"
VERSION=3.24.14
echo
echo -e " [ $YELLOW"i"$RESET ] Upstream version $VERSION"
echo
while read file;
do
echo
echo "[*] Downloading file $file"
echo
wget https://gitlab.gnome.org/GNOME/gtk/raw/$VERSION/gtk/theme/Adwaita/$file --timestamping
echo -e " [ $GREEN*$RESET ] Downloading file $file"
wget https://gitlab.gnome.org/GNOME/gtk/raw/$VERSION/gtk/theme/Adwaita/$file --timestamping --quiet
if [ -f $file.patch ]
then
echo "[+] Apply patch"
echo
patch $file $file.patch
echo
echo -e " [ $YELLOW~$RESET ] Apply patch"
patch $file $file.patch --quiet
fi
done <<- EOF
_colors.scss