Skip to content

Commit 616994a

Browse files
hsbasuhsbasu
authored
Update cinnamon theme (#57)
- Rename sass directory - Use semi-transparent panels - Change border radius in calendar - Add style file to support cinnamon's simplified settings - Update copyright year in LICENSE - Update test-sucharu script
1 parent 343968a commit 616994a

File tree

9 files changed

+98
-14
lines changed

9 files changed

+98
-14
lines changed

‎LICENSE

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
GNU GENERAL PUBLIC LICENSE
22
Version 3, 29 June 2007
33

4-
Copyright (C) 2021 Himadri Sekhar Basu <hsb10@iitbbs.ac.in>.
4+
Copyright (C) 2021-2023 Himadri Sekhar Basu <hsb10@iitbbs.ac.in>.
55

66
Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
77
Everyone is permitted to copy and distribute verbatim copies

‎cinnamon-shell/src/meson.build

+2-2
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ foreach variant: variants
112112
output: '@BASENAME@.css'.format(variant),
113113
command: [
114114
sassc, '-a', '@INPUT@', '@OUTPUT@',
115-
'-I', css_sources_path / 'cinnamon-shell-sass',
115+
'-I', css_sources_path / 'sass',
116116
],
117117
depends: source_deps,
118118
depend_files: [
@@ -137,7 +137,7 @@ foreach variant: variants
137137
configuration: {
138138
'DarkVariant': is_dark ? 'true' : 'false',
139139
'SucharuVariant': variant,
140-
'VariantDir': 'cinnamon-shell-sass',
140+
'VariantDir': 'sass',
141141
# 'UseGResource': cinnamonshell_use_gresource ? 'true' : 'false',
142142
'Colors': 'colors',
143143
'ColorableAssets': '@0@'.format(colorable_assets_names),

‎cinnamon-shell/src/cinnamon-shell-sass/_colors.scss ‎cinnamon-shell/src/sass/_colors.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ $fg_color: if($variant=='light', $inkstone, $porcelain);
99
$selected_fg_color: $accent_fg_color;
1010
$selected_bg_color: if($variant=='light', $accent_bg_color, darken($accent_bg_color, 4%));
1111
$selected_borders_color: if($variant=='light', darken($selected_bg_color, 15%), darken($selected_bg_color, 30%));
12-
$borders_color_dark: lighten(desaturate(lighten($jet, 4%), 100%), 14%); // Yaru: used for dash and other dark elements on light theme
12+
$borders_color_dark: lighten(desaturate(lighten($jet, 4%), 100%), 14%); // Sucharu: used for dash and other dark elements on light theme
1313
$borders_color: if($variant=='light', darken($bg_color, 20%), $borders_color_dark);
1414
$alt_borders_color: if($variant=='light', darken($bg_color, 24%), darken($bg_color, 10%));
1515
$borders_edge: if($variant=='light', transparentize(white, 0.2), transparentize($fg_color, 0.93));

‎cinnamon-shell/src/cinnamon-shell-sass/_common.scss ‎cinnamon-shell/src/sass/_common.scss

File renamed without changes.

‎cinnamon-shell/src/cinnamon-shell-sass/_drawing.scss ‎cinnamon-shell/src/sass/_drawing.scss

File renamed without changes.

‎cinnamon-shell/src/cinnamon-shell-sass/_palette.scss ‎cinnamon-shell/src/sass/_palette.scss

File renamed without changes.

‎cinnamon-shell/src/cinnamon-shell-sass/_tweaks.scss ‎cinnamon-shell/src/sass/_tweaks.scss

+29-9
Original file line numberDiff line numberDiff line change
@@ -43,46 +43,40 @@ $active_borders_color: darken($borders_color,if($variant=='light', 5%, 3%));
4343

4444
// arrow back
4545
.calendar-change-month-back {
46+
border-radius: 10px;
4647
&:hover, &:focus {
4748
background-color: $hover_bg_color;
48-
border-radius: 10px;
4949
}
5050
&:active {
5151
background-color: $active_bg_color;
52-
border-radius: 10px;
5352
}
5453

5554
&:rtl {
5655
&:hover, &:focus {
5756
background-color: $hover_bg_color;
58-
border-radius: 10px;
5957
}
6058
&:active {
6159
background-color: $active_bg_color;
62-
border-radius: 10px;
6360
}
6461
}
6562
}
6663

6764
// arrow forward
6865
.calendar-change-month-forward {
66+
border-radius: 10px;
6967
&:hover, &:focus {
7068
background-color: $hover_bg_color;
71-
border-radius: 10px;
7269
}
7370
&:active {
7471
background-color: $active_bg_color;
75-
border-radius: 10px;
7672
}
7773

7874
&:rtl {
7975
&:hover, &:focus {
8076
background-color: $hover_bg_color;
81-
border-radius: 10px;
8277
}
8378
&:active {
8479
background-color: $active_bg_color;
85-
border-radius: 10px;
8680
}
8781
}
8882
}
@@ -97,7 +91,7 @@ $active_borders_color: darken($borders_color,if($variant=='light', 5%, 3%));
9791
}
9892

9993
:focus, :hover, :hover:focus, :active, :active:focus, :insensitive {
100-
border-radius: 50px;
94+
border-radius: 10px;
10195
}
10296

10397

@@ -153,3 +147,29 @@ $active_borders_color: darken($borders_color,if($variant=='light', 5%, 3%));
153147
}
154148
}
155149
}
150+
151+
.panel {
152+
&-top {
153+
background-gradient-direction: vertical;
154+
background-gradient-start: transparentize($panel_bg, 0.3);
155+
background-gradient-end: transparentize(mix($panel_fg, $panel_bg, 60%), 0.6);
156+
}
157+
158+
&-bottom {
159+
background-gradient-direction: vertical;
160+
background-gradient-start: transparentize(mix($panel_fg, $panel_bg, 60%), 0.6);
161+
background-gradient-end: transparentize($panel_bg, 0.3);
162+
}
163+
164+
&-left {
165+
background-gradient-direction: horizontal;
166+
background-gradient-start: transparentize($panel_bg, 0.3);
167+
background-gradient-end: transparentize(mix($panel_fg, $panel_bg, 60%), 0.6);
168+
}
169+
170+
&-right {
171+
background-gradient-direction: horizontal;
172+
background-gradient-start: transparentize(mix($panel_fg, $panel_bg, 60%), 0.6);
173+
background-gradient-end: transparentize($panel_bg, 0.3);
174+
}
175+
}

‎files/usr/share/cinnamon/styles.d/22_sucharu-artwork.styles

+64
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
{
2+
"styles": [
3+
{
4+
"name": "Sucharu",
5+
"default": "mixed",
6+
"mixed": [
7+
{"name": "aqua", "color": "#6cabcd", "themes": "Sucharu-aqua-darker", "cinnamon": "Sucharu-aqua", "icons": "Sucharu-aqua", "cursor": "Sucharu-Aqua"},
8+
{"name": "blue", "color": "#5b73c4", "themes": "Sucharu-blue-darker", "cinnamon": "Sucharu-blue", "icons": "Sucharu-blue", "cursor": "Sucharu-Blue"},
9+
{"name": "brown", "color": "#aa876a", "themes": "Sucharu-brown-darker", "cinnamon": "Sucharu-brown", "icons": "Sucharu-brown", "cursor": "Sucharu-Brown"},
10+
{"name": "green", "color": "#12a327", "themes": "Sucharu-darker", "cinnamon": "Sucharu", "icons": "Sucharu", "cursor": "Sucharu-Green", "default": "true"},
11+
{"name": "grey", "color": "#9d9d9d", "themes": "Sucharu-grey-darker", "cinnamon": "Sucharu-grey", "icons": "Sucharu-grey", "cursor": "Sucharu-Grey"},
12+
{"name": "orange", "color": "#e95420", "themes": "Sucharu-orange-darker", "cinnamon": "Sucharu-orange", "icons": "Sucharu-orange", "cursor": "Sucharu-Orange"},
13+
{"name": "pink", "color": "#c76199", "themes": "Sucharu-pink-darker", "cinnamon": "Sucharu-pink", "icons": "Sucharu-pink", "cursor": "Sucharu-Pink"},
14+
{"name": "purple", "color": "#8c6ec9", "themes": "Sucharu-purple-darker", "cinnamon": "Sucharu-purple", "icons": "Sucharu-purple", "cursor": "Sucharu-Purple"},
15+
{"name": "red", "color": "#da3450", "themes": "Sucharu-red-darker", "cinnamon": "Sucharu-red", "icons": "Sucharu-red", "cursor": "Sucharu-Red"},
16+
{"name": "sand", "color": "#c8ac69", "themes": "Sucharu-sand-darker", "cinnamon": "Sucharu-sand", "icons": "Sucharu-sand", "cursor": "Sucharu-Sand"},
17+
{"name": "teal", "color": "#5aaa9a", "themes": "Sucharu-teal-darker", "cinnamon": "Sucharu-teal", "icons": "Sucharu-teal", "cursor": "Sucharu-Teal"}
18+
],
19+
"dark": [
20+
{"name": "aqua", "color": "#6cabcd", "themes": "Sucharu-aqua-dark", "cursor": "Sucharu-Aqua"},
21+
{"name": "blue", "color": "#5b73c4", "themes": "Sucharu-blue-dark", "cursor": "Sucharu-Blue"},
22+
{"name": "brown", "color": "#aa876a", "themes": "Sucharu-brown-dark", "cursor": "Sucharu-Brown"},
23+
{"name": "green", "color": "#12a327", "themes": "Sucharu-dark", "cursor": "Sucharu-Green", "default": "true"},
24+
{"name": "grey", "color": "#9d9d9d", "themes": "Sucharu-grey-dark", "cursor": "Sucharu-Grey"},
25+
{"name": "orange", "color": "#e95420", "themes": "Sucharu-orange-dark", "cursor": "Sucharu-Orange"},
26+
{"name": "pink", "color": "#c76199", "themes": "Sucharu-pink-dark", "cursor": "Sucharu-Pink"},
27+
{"name": "purple", "color": "#8c6ec9", "themes": "Sucharu-purple-dark", "cursor": "Sucharu-Purple"},
28+
{"name": "red", "color": "#da3450", "themes": "Sucharu-red-dark", "cursor": "Sucharu-Red"},
29+
{"name": "sand", "color": "#c8ac69", "themes": "Sucharu-sand-dark", "cursor": "Sucharu-Sand"},
30+
{"name": "teal", "color": "#5aaa9a", "themes": "Sucharu-teal-dark", "cursor": "Sucharu-Teal"}
31+
],
32+
"light": [
33+
{"name": "aqua", "color": "#6cabcd", "themes": "Sucharu-aqua", "cursor": "Sucharu-Aqua"},
34+
{"name": "blue", "color": "#5b73c4", "themes": "Sucharu-blue", "cursor": "Sucharu-Blue"},
35+
{"name": "brown", "color": "#aa876a", "themes": "Sucharu-brown", "cursor": "Sucharu-Brown"},
36+
{"name": "green", "color": "#12a327", "themes": "Sucharu", "cursor": "Sucharu-Green", "default": "true"},
37+
{"name": "grey", "color": "#9d9d9d", "themes": "Sucharu-grey", "cursor": "Sucharu-Grey"},
38+
{"name": "orange", "color": "#e95420", "themes": "Sucharu-orange", "cursor": "Sucharu-Orange"},
39+
{"name": "pink", "color": "#c76199", "themes": "Sucharu-pink", "cursor": "Sucharu-Pink"},
40+
{"name": "purple", "color": "#8c6ec9", "themes": "Sucharu-purple", "cursor": "Sucharu-Purple"},
41+
{"name": "red", "color": "#da3450", "themes": "Sucharu-red", "cursor": "Sucharu-Red"},
42+
{"name": "sand", "color": "#c8ac69", "themes": "Sucharu-sand", "cursor": "Sucharu-Sand"},
43+
{"name": "teal", "color": "#5aaa9a", "themes": "Sucharu-teal", "cursor": "Sucharu-Teal"}
44+
]
45+
},
46+
{
47+
"name": "Adwaita",
48+
"default": "mixed",
49+
"mixed": [
50+
{"default": "true", "name": "blue", "color": "#3584e4", "themes": "Adwaita", "cinnamon": "Sucharu-blue", "cursor": "Sucharu-Blue"}
51+
],
52+
"dark": [
53+
{"name": "blue", "color": "#15539e", "themes": "Adwaita-dark", "icons": "Adwaita", "cinnamon": "Sucharu-blue-dark", "cursor": "Sucharu-Blue"}
54+
]
55+
},
56+
{
57+
"name": "HighContrast",
58+
"default": "light",
59+
"light": [
60+
{"default": "true", "name": "contrast", "color": "#000000", "themes": "HighContrast", "cinnamon": "Sucharu-grey", "cursor": "Sucharu-Dark"}
61+
]
62+
}
63+
]
64+
}

‎test-sucharu

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
rm -rf ~/.local/share/themes/Sucharu*
44
rm -rf builddir
55

6-
meson -Dprefix=$HOME/.local builddir
6+
meson setup -Dprefix=$HOME/.local builddir
77
meson compile -C builddir
88
meson install -C builddir

0 commit comments

Comments
 (0)