Skip to content

Commit 3fae764

Browse files
author
Jay
committed
Add "garden" theme
1 parent 65166e2 commit 3fae764

File tree

3 files changed

+43
-2
lines changed

3 files changed

+43
-2
lines changed

.github/workflows/test.yaml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
name: Engine automated tests
2+
3+
on:
4+
push:
5+
branches: [master, experimental]
6+
7+
jobs:
8+
test:
9+
runs-on: ubuntu-latest
10+
name: Build and Test Engine package
11+
steps:
12+
- uses: actions/checkout@v3
13+
- uses: mlugg/setup-zig@v2
14+
with:
15+
version: 0.14.1
16+
- run: zig build test
17+

build.zig.zon

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
.{
22
.name = .engine,
3-
.version = "0.1.5",
3+
.version = "0.1.6",
44
.fingerprint = 0xe8a81a8d0aa558d5,
55
.minimum_zig_version = "0.14.1",
66
.dependencies = .{

src/theme.zig

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ pub const ThemeColour = enum {
6666

6767
/// The `Display` is prefilled with this usable set of default themes on
6868
/// initialisation.
69-
pub const default_themes = [4]Theme{
69+
pub const default_themes = [5]Theme{
7070
.{
7171
.tag = "black",
7272
.background_colour = .{ .r = 0, .g = 0, .b = 0, .a = 255 },
@@ -111,6 +111,7 @@ pub const default_themes = [4]Theme{
111111
.toggle_button_correct = .{ .r = 80, .g = 119, .b = 81, .a = 255 },
112112
.toggle_button_incorrect = .{ .r = 119, .g = 80, .b = 80, .a = 255 },
113113
},
114+
114115
.{
115116
.tag = "sand",
116117
.background_colour = .{ .r = 224, .g = 214, .b = 204, .a = 255 },
@@ -133,6 +134,7 @@ pub const default_themes = [4]Theme{
133134
.toggle_button_correct = .{ .r = 132, .g = 160, .b = 100, .a = 255 },
134135
.toggle_button_incorrect = .{ .r = 159, .g = 111, .b = 98, .a = 255 },
135136
},
137+
136138
.{
137139
.tag = "white",
138140
.background_colour = .{ .r = 255, .g = 255, .b = 255, .a = 255 },
@@ -155,6 +157,28 @@ pub const default_themes = [4]Theme{
155157
.toggle_button_correct = .{ .r = 132, .g = 160, .b = 100, .a = 255 },
156158
.toggle_button_incorrect = .{ .r = 159, .g = 111, .b = 98, .a = 255 },
157159
},
160+
.{
161+
.tag = "garden",
162+
.background_colour = .{ .r = 54, .g = 132, .b = 48, .a = 255 },
163+
.text_colour = .{ .r = 255, .g = 255, .b = 255, .a = 255 },
164+
.placeholder_text_colour = .{ .r = 136, .g = 194, .b = 136, .a = 255 },
165+
.cursor_colour = .{ .r = 160, .g = 210, .b = 160, .a = 128 },
166+
.label_background_colour = .{ .r = 81, .g = 160, .b = 77, .a = 255 },
167+
.tinted_text_colour = .{ .r = 250, .g = 250, .b = 170, .a = 255 },
168+
.emphasised_text_colour = .{ .r = 255, .g = 255, .b = 170, .a = 255 },
169+
.emphasised_panel_colour = .{ .r = 14, .g = 57, .b = 14, .a = 255 },
170+
.success_text_colour = .{ .r = 255, .g = 255, .b = 255, .a = 255 },
171+
.success_button_colour = .{ .r = 35, .g = 129, .b = 43, .a = 255 },
172+
.success_panel_colour = .{ .r = 83, .g = 172, .b = 75, .a = 128 },
173+
.failed_text_colour = .{ .r = 255, .g = 255, .b = 255, .a = 255 },
174+
.failed_button_colour = .{ .r = 145, .g = 59, .b = 59, .a = 255 },
175+
.failed_panel_colour = .{ .r = 150, .g = 80, .b = 65, .a = 255 },
176+
.faded_panel_colour = .{ .r = 66, .g = 144, .b = 62, .a = 255 },
177+
.toggle_button = .{ .r = 20, .g = 70, .b = 20, .a = 255 },
178+
.toggle_button_picked = .{ .r = 80, .g = 99, .b = 119, .a = 255 },
179+
.toggle_button_correct = .{ .r = 80, .g = 119, .b = 81, .a = 255 },
180+
.toggle_button_incorrect = .{ .r = 119, .g = 80, .b = 80, .a = 255 },
181+
},
158182
};
159183

160184
const Colour = @import("engine.zig").Colour;

0 commit comments

Comments
 (0)