diff --git a/files/usr/share/themes/thumbnail-dark.svg b/files/usr/share/themes/thumbnail-dark.svg new file mode 100644 index 000000000..2d1c0624e --- /dev/null +++ b/files/usr/share/themes/thumbnail-dark.svg @@ -0,0 +1,212 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Button + + diff --git a/files/usr/share/themes/thumbnail-darker.svg b/files/usr/share/themes/thumbnail-darker.svg new file mode 100644 index 000000000..79c55165c --- /dev/null +++ b/files/usr/share/themes/thumbnail-darker.svg @@ -0,0 +1,276 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Button + + diff --git a/files/usr/share/themes/thumbnail.svg b/files/usr/share/themes/thumbnail.svg new file mode 100644 index 000000000..0b91e088f --- /dev/null +++ b/files/usr/share/themes/thumbnail.svg @@ -0,0 +1,212 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Button + + diff --git a/generate-themes.py b/generate-themes.py index d38444a28..6a279ed5c 100755 --- a/generate-themes.py +++ b/generate-themes.py @@ -62,6 +62,8 @@ def generate_theme(color): if (variant == "-Dark"): os.system("cp sass/gtk-dark.scss sass/gtk.scss") os.system("sassc ./sass/gtk.scss gtk.css") + elif (variant == "-Darker"): + os.system("cp sass/gtk-darker.scss sass/gtk.scss") else: os.system("sassc ./sass/gtk-dark.scss gtk-dark.css") os.system("sassc ./sass/gtk.scss gtk.css") diff --git a/src/Mint-Y/gtk-4.0/assets.svg b/src/Mint-Y/gtk-4.0/assets.svg index 16a0e59bd..9b0ef0524 100644 --- a/src/Mint-Y/gtk-4.0/assets.svg +++ b/src/Mint-Y/gtk-4.0/assets.svg @@ -2,21 +2,1228 @@ + inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)" + sodipodi:docname="assets.svg" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + id="defs9894"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + fit-margin-bottom="0" + inkscape:pagecheckerboard="0"> + id="guide8384" + inkscape:locked="false" /> @@ -2238,39 +3447,6 @@ id="layer1" style="display:inline" transform="translate(8.000005,285.63782)"> - - - - - - - - - @@ -2327,7 +3503,7 @@ id="g14051-0"> @@ -2338,7 +3514,7 @@ height="39.999992" width="39.999989" id="rect13851-7-0" - style="display:inline;fill:none;fill-opacity:0.55102036;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + style="display:inline;fill:none;fill-opacity:0.55102;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" rx="1.9999999" /> @@ -2500,10 +3676,10 @@ @@ -3272,7 +4448,7 @@ height="138" width="121" id="rect18028-4" - style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#383838;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994;marker:none;enable-background:accumulate" + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#383838;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" transform="scale(1,-1)" /> + transform="translate(19)"> @@ -3332,11 +4508,11 @@ style="display:inline"> + transform="rotate(45,7.4999938,1026.3622)"> @@ -3383,7 +4559,7 @@ inkscape:label="#g22047" id="checkbox-unchecked-5-4-5" style="display:inline" - transform="translate(19,0)"> + transform="translate(19)"> @@ -3432,11 +4608,11 @@ style="display:inline"> + transform="rotate(45,7.4999938,1026.3622)"> @@ -3452,7 +4628,7 @@ width="2" id="rect3979-7-3-4" style="fill:#2b303b;fill-opacity:1;stroke:none" - transform="matrix(-0.70710678,-0.70710678,0.70710678,-0.70710678,0,0)" /> + transform="rotate(-135)" /> @@ -3484,7 +4660,7 @@ id="radio-unchecked2-0-8" style="display:inline"> @@ -3599,7 +4775,7 @@ width="2" id="rect3979-7-3-9-5" style="display:inline;fill:#2b303b;fill-opacity:1;stroke:none" - transform="matrix(0,-1,1,0,0,0)" /> + transform="rotate(-90)" /> @@ -3761,10 +4937,10 @@ @@ -3907,7 +5083,7 @@ id="g5428-8-1-7-83-7"> + transform="translate(19)"> @@ -3978,11 +5154,11 @@ style="display:inline"> + transform="rotate(45,7.4999938,1026.3622)"> @@ -4029,7 +5205,7 @@ inkscape:label="#g22047" id="checkbox-unchecked-5-4-1-9" style="display:inline" - transform="translate(19,0)"> + transform="translate(19)"> @@ -4078,11 +5254,11 @@ style="display:inline"> + transform="rotate(45,7.4999938,1026.3622)"> @@ -4098,7 +5274,7 @@ width="2" id="rect3979-7-3-91-5" style="fill:#2b303b;fill-opacity:1;stroke:none" - transform="matrix(-0.70710678,-0.70710678,0.70710678,-0.70710678,0,0)" /> + transform="rotate(-135)" /> @@ -4130,7 +5306,7 @@ id="radio-unchecked2-0-4-5" style="display:inline"> @@ -4245,7 +5421,7 @@ width="2" id="rect3979-7-3-9-3-37" style="display:inline;fill:#2b303b;fill-opacity:1;stroke:none" - transform="matrix(0,-1,1,0,0,0)" /> + transform="rotate(-90)" /> + id="sdsd-0-3-0"> + transform="translate(0,-30)"> + id="g5428-8-1-4-0-0-65-4-7" /> + id="g5400-2-4-7"> + id="g10964-4-8-3"> + id="g7025-3-8-9"> + id="g5428-8-1-7-83-9-6"> @@ -4373,7 +5542,7 @@ height="39.999992" width="39.999989" id="rect13851-7-3" - style="display:inline;fill:none;fill-opacity:0.55102036;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + style="display:inline;fill:none;fill-opacity:0.55102;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" rx="1.9999999" /> @@ -4406,7 +5575,7 @@ height="39.999992" width="39.999989" id="rect13851-7-1" - style="display:inline;fill:none;fill-opacity:0.55102036;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + style="display:inline;fill:none;fill-opacity:0.55102;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" rx="1.9999999" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -4575,10 +5959,10 @@ @@ -5563,7 +6947,7 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Mint-Y/gtk-4.0/assets.txt b/src/Mint-Y/gtk-4.0/assets.txt index 6a0c51b90..f52f2f9d3 100644 --- a/src/Mint-Y/gtk-4.0/assets.txt +++ b/src/Mint-Y/gtk-4.0/assets.txt @@ -36,6 +36,22 @@ switch-selected switch-active-selected switch-insensitive-selected switch-active-insensitive-selected +titlebutton-close +titlebutton-close-backdrop +titlebutton-close-hover +titlebutton-close-active +titlebutton-max +titlebutton-max-backdrop +titlebutton-max-hover +titlebutton-max-active +titlebutton-min +titlebutton-min-backdrop +titlebutton-min-hover +titlebutton-min-active +titlebutton-resize +titlebutton-resize-backdrop +titlebutton-resize-hover +titlebutton-resize-active checkbox-checked-dark checkbox-checked-insensitive-dark checkbox-unchecked-dark @@ -60,3 +76,19 @@ switch-header-dark switch-active-header-dark switch-insensitive-header-dark switch-active-insensitive-header-dark +titlebutton-close-dark +titlebutton-close-backdrop-dark +titlebutton-close-hover-dark +titlebutton-close-active-dark +titlebutton-max-dark +titlebutton-max-backdrop-dark +titlebutton-max-hover-dark +titlebutton-max-active-dark +titlebutton-min-dark +titlebutton-min-backdrop-dark +titlebutton-min-hover-dark +titlebutton-min-active-dark +titlebutton-resize-dark +titlebutton-resize-backdrop-dark +titlebutton-resize-hover-dark +titlebutton-resize-active-dark diff --git a/src/Mint-Y/gtk-4.0/sass/gtk-darker.scss b/src/Mint-Y/gtk-4.0/sass/gtk-darker.scss new file mode 100644 index 000000000..356768fd4 --- /dev/null +++ b/src/Mint-Y/gtk-4.0/sass/gtk-darker.scss @@ -0,0 +1,8 @@ +$variant: 'light'; +$darker: 'true'; +$tint: 'no-tint'; + +@import 'colors'; +@import 'drawing'; +@import 'common'; +@import 'colors-public'; \ No newline at end of file diff --git a/src/Mint-Y/gtk-4.0/sass/gtk.scss b/src/Mint-Y/gtk-4.0/sass/gtk.scss index 36d08f1a3..c6447da07 100644 --- a/src/Mint-Y/gtk-4.0/sass/gtk.scss +++ b/src/Mint-Y/gtk-4.0/sass/gtk.scss @@ -1,4 +1,5 @@ $variant: 'light'; +$darker: 'false'; $tint: 'no-tint'; @import 'colors'; diff --git a/update-variations.py b/update-variations.py index cc4107faa..c3d301cb9 100755 --- a/update-variations.py +++ b/update-variations.py @@ -24,6 +24,7 @@ def update_color (color): os.system("rm -rf %s" % variation) os.system("mkdir -p %s/gtk-2.0" % variation) os.system("mkdir -p %s/gtk-3.0" % variation) + os.system("mkdir -p %s/gtk-4.0" % variation) os.system("mkdir -p %s/xfwm4" % variation) os.system("mkdir -p %s/xfwm4-dark" % variation) @@ -32,6 +33,7 @@ def update_color (color): assets.append("gtk-2.0/assets.svg") assets.append("gtk-2.0/assets-dark.svg") assets.append("gtk-3.0/assets.svg") + assets.append("gtk-4.0/assets.svg") assets.append("xfwm4/assets.svg") assets.append("xfwm4-dark/assets.svg") @@ -41,6 +43,8 @@ def update_color (color): files.append("gtk-2.0/assets.txt") files.append("gtk-3.0/assets") files.append("gtk-3.0/assets.txt") + files.append("gtk-4.0/assets") + files.append("gtk-4.0/assets.txt") files.append("xfwm4/assets.txt") files.append("xfwm4-dark/assets.txt") @@ -80,6 +84,11 @@ def update_color (color): os.system("rm -rf assets/*") os.system(rendering_script+" s2") + print("**Rendering gtk-4.0 assets...") + os.chdir(variation+"/gtk-4.0/") + os.system("rm -rf assets/*") + os.system(rendering_script+" s2") + print("**Rendering xfwm4 assets...") os.chdir(variation+"/xfwm4/") os.system("rm -rf *.png")