[libadwaita/wip/exalm/no-assets: 13/13] Use the same check/ratio assets for regular and hc
- From: Adrien Plazas <aplazas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libadwaita/wip/exalm/no-assets: 13/13] Use the same check/ratio assets for regular and hc
- Date: Thu, 6 May 2021 11:47:25 +0000 (UTC)
commit 869afde076833fa57bd196f3c359129b698c4a00
Author: Alexander Mikhaylenko <alexm gnome org>
Date: Wed May 5 14:22:43 2021 +0500
Use the same check/ratio assets for regular and hc
Fixes https://gitlab.gnome.org/GNOME/libadwaita/-/issues/112
src/stylesheet/_common.scss | 2 -
src/stylesheet/adwaita-stylesheet.gresources.xml | 11 --
src/stylesheet/assets-hc/bullet-symbolic.svg | 155 ---------------------
.../assets-hc/bullet-symbolic.symbolic.png | Bin 147 -> 0 bytes
.../assets-hc/bullet 2-symbolic symbolic png | Bin 268 -> 0 bytes
src/stylesheet/assets-hc/check-symbolic.svg | 154 --------------------
.../assets-hc/check-symbolic.symbolic.png | Bin 231 -> 0 bytes
.../assets-hc/check 2-symbolic symbolic png | Bin 381 -> 0 bytes
src/stylesheet/assets-hc/dash-symbolic.svg | 153 --------------------
.../assets-hc/dash-symbolic.symbolic.png | Bin 130 -> 0 bytes
.../assets-hc/dash 2-symbolic symbolic png | Bin 185 -> 0 bytes
src/stylesheet/widgets/_checks.scss | 16 +--
12 files changed, 8 insertions(+), 483 deletions(-)
---
diff --git a/src/stylesheet/_common.scss b/src/stylesheet/_common.scss
index 17dbc66..aa8d38c 100644
--- a/src/stylesheet/_common.scss
+++ b/src/stylesheet/_common.scss
@@ -3,8 +3,6 @@
}
$ease-out-quad: cubic-bezier(0.25, 0.46, 0.45, 0.94);
-$asset_suffix: if($variant=='dark', '-dark', '');
-$assets: if($contrast=='normal', 'assets', 'assets-hc');
$backdrop_transition: 200ms ease-out;
$button_transition: all 200ms $ease-out-quad;
$focus_transition: outline-width 200ms $ease-out-quad, outline-offset 200ms $ease-out-quad;
diff --git a/src/stylesheet/adwaita-stylesheet.gresources.xml
b/src/stylesheet/adwaita-stylesheet.gresources.xml
index 672db94..feb16bd 100644
--- a/src/stylesheet/adwaita-stylesheet.gresources.xml
+++ b/src/stylesheet/adwaita-stylesheet.gresources.xml
@@ -39,16 +39,5 @@
<file>assets/bullet-symbolic.svg</file>
<file>assets/check-symbolic.svg</file>
<file>assets/dash-symbolic.svg</file>
-
- <file>assets-hc/bullet-symbolic.symbolic.png</file>
- <file>assets-hc/bullet 2-symbolic symbolic png</file>
- <file>assets-hc/check-symbolic.symbolic.png</file>
- <file>assets-hc/check 2-symbolic symbolic png</file>
- <file>assets-hc/dash-symbolic.symbolic.png</file>
- <file>assets-hc/dash 2-symbolic symbolic png</file>
-
- <file>assets-hc/bullet-symbolic.svg</file>
- <file>assets-hc/check-symbolic.svg</file>
- <file>assets-hc/dash-symbolic.svg</file>
</gresource>
</gresources>
diff --git a/src/stylesheet/widgets/_checks.scss b/src/stylesheet/widgets/_checks.scss
index f832ca9..68419e8 100644
--- a/src/stylesheet/widgets/_checks.scss
+++ b/src/stylesheet/widgets/_checks.scss
@@ -68,11 +68,11 @@ check {
border-radius: 3px;
-gtk-icon-size: 14px;
- &:checked { -gtk-icon-source: -gtk-scaled(-gtk-recolor(url("#{$assets}/check-symbolic.symbolic.png")),
- -gtk-recolor(url("#{$assets}/check 2-symbolic symbolic png"))); }
+ &:checked { -gtk-icon-source: -gtk-scaled(-gtk-recolor(url("assets/check-symbolic.symbolic.png")),
+ -gtk-recolor(url("assets/check 2-symbolic symbolic png"))); }
- &:indeterminate { -gtk-icon-source: -gtk-scaled(-gtk-recolor(url("#{$assets}/dash-symbolic.symbolic.png")),
- -gtk-recolor(url("#{$assets}/dash 2-symbolic symbolic
png"))); }
+ &:indeterminate { -gtk-icon-source: -gtk-scaled(-gtk-recolor(url("assets/dash-symbolic.symbolic.png")),
+ -gtk-recolor(url("assets/dash 2-symbolic symbolic png")));
}
}
%radio,
@@ -80,11 +80,11 @@ radio {
border-radius: 100%;
-gtk-icon-size: 14px;
- &:checked { -gtk-icon-source: -gtk-scaled(-gtk-recolor(url("#{$assets}/bullet-symbolic.symbolic.png")),
- -gtk-recolor(url("#{$assets}/bullet 2-symbolic symbolic png")));
}
+ &:checked { -gtk-icon-source: -gtk-scaled(-gtk-recolor(url("assets/bullet-symbolic.symbolic.png")),
+ -gtk-recolor(url("assets/bullet 2-symbolic symbolic png"))); }
- &:indeterminate { -gtk-icon-source: -gtk-scaled(-gtk-recolor(url("#{$assets}/dash-symbolic.symbolic.png")),
- -gtk-recolor(url("#{$assets}/dash 2-symbolic symbolic
png"))); }
+ &:indeterminate { -gtk-icon-source: -gtk-scaled(-gtk-recolor(url("assets/dash-symbolic.symbolic.png")),
+ -gtk-recolor(url("assets/dash 2-symbolic symbolic png")));
}
}
treeview.view check,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]