Skip to content

Commit 8044a30

Browse files
715d715d
committed
refactor: adjust contrast and expand helix theme
1 parent 38cc8e8 commit 8044a30

File tree

9 files changed

+155
-164
lines changed

9 files changed

+155
-164
lines changed

‎README.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,12 @@ A warm, earthy terminal color scheme inspired by 1970s rumpus rooms and mid-cent
2020
|-------|-----|-----|-------|
2121
| Walnut | `#2A1810` | `42 24 16` | Primary background |
2222
| Chocolate Brown | `#5F3822` | `95 56 34` | Secondary background, dark accent |
23+
| Cork | `#98755f` | `152 117 95` | Comments, inactive UI elements |
2324
| Almond | `#F4DDB3` | `244 221 179` | Primary text |
2425
| Harvest Gold | `#E9A131` | `233 161 49` | Highlights, active elements |
2526
| Burnt Orange | `#F67422` | `246 116 34` | Emphasis, keywords |
2627
| Avocado Green | `#79966d` | `121 150 109` | Success, strings |
27-
| Denim Blue | `#5B7C99` | `91 124 153` | Information, operators |
28+
| Denim Blue | `#5B7C99` | `91 124 153` | Information, types |
2829
| Lava Gold | `#D3BE47` | `211 190 71` | Selections, warnings |
2930
| Persimmon | `#E84A38` | `232 74 56` | Errors, locked states |
3031

‎bat/rumpus.tmTheme‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
<key>guide</key>
3636
<string>#5F3822</string>
3737
<key>activeGuide</key>
38-
<string>#84563B</string>
38+
<string>#98755f</string>
3939
<key>stackGuide</key>
4040
<string>#5F3822</string>
4141
<key>bracketsForeground</key>
@@ -53,7 +53,7 @@
5353
<key>gutter</key>
5454
<string>#2A1810</string>
5555
<key>gutterForeground</key>
56-
<string>#84563B</string>
56+
<string>#98755f</string>
5757
</dict>
5858
</dict>
5959

@@ -66,7 +66,7 @@
6666
<key>settings</key>
6767
<dict>
6868
<key>foreground</key>
69-
<string>#5B7C99</string>
69+
<string>#98755f</string>
7070
<key>fontStyle</key>
7171
<string>italic</string>
7272
</dict>
@@ -223,7 +223,7 @@
223223
<key>settings</key>
224224
<dict>
225225
<key>foreground</key>
226-
<string>#5B7C99</string>
226+
<string>#F4DDB3</string>
227227
</dict>
228228
</dict>
229229

@@ -270,6 +270,8 @@
270270
<dict>
271271
<key>foreground</key>
272272
<string>#F4DDB3</string>
273+
<key>fontStyle</key>
274+
<string>italic</string>
273275
</dict>
274276
</dict>
275277

@@ -282,7 +284,7 @@
282284
<key>settings</key>
283285
<dict>
284286
<key>foreground</key>
285-
<string>#E9A131</string>
287+
<string>#5B7C99</string>
286288
<key>fontStyle</key>
287289
<string>bold</string>
288290
</dict>
@@ -295,7 +297,7 @@
295297
<key>settings</key>
296298
<dict>
297299
<key>foreground</key>
298-
<string>#D3BE47</string>
300+
<string>#5B7C99</string>
299301
</dict>
300302
</dict>
301303
<dict>
@@ -306,7 +308,7 @@
306308
<key>settings</key>
307309
<dict>
308310
<key>foreground</key>
309-
<string>#E9A131</string>
311+
<string>#5B7C99</string>
310312
</dict>
311313
</dict>
312314
<dict>

‎delta/rumpus.gitconfig‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
#
1515
# Color Palette:
1616
# Walnut: #2A1810 (primary background)
17+
# Cork: #98755f (comments, inactive elements)
1718
# Almond: #F4DDB3 (primary text)
1819
# Harvest Gold: #E9A131 (highlights)
1920
# Burnt Orange: #F67422 (emphasis)
@@ -39,7 +40,7 @@
3940
rumpus-lava-gold = "#D3BE47"
4041
rumpus-persimmon = "#E84A38"
4142
rumpus-light-avocado = "#9BB589"
42-
rumpus-light-brown = "#84563B"
43+
rumpus-cork = "#98755f"
4344

4445
# File headers - use harvest gold for file names
4546
file-style = "bold rumpus.rumpus-harvest-gold"
@@ -75,9 +76,9 @@
7576
line-numbers = true
7677
line-numbers-minus-style = "rumpus.rumpus-persimmon"
7778
line-numbers-plus-style = "rumpus.rumpus-avocado"
78-
line-numbers-zero-style = "rumpus.rumpus-light-brown"
79-
line-numbers-left-style = "rumpus.rumpus-light-brown"
80-
line-numbers-right-style = "rumpus.rumpus-light-brown"
79+
line-numbers-zero-style = "rumpus.rumpus-cork"
80+
line-numbers-left-style = "rumpus.rumpus-cork"
81+
line-numbers-right-style = "rumpus.rumpus-cork"
8182
line-numbers-left-format = "{nm:>4}│"
8283
line-numbers-right-format = "{np:>4}│"
8384

‎docs/index.html‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -476,6 +476,15 @@ <h2>Color Palette</h2>
476476
</div>
477477
</div>
478478

479+
<div class="color-card">
480+
<div class="color-swatch" style="background-color: #98755f;"></div>
481+
<div class="color-name">Cork</div>
482+
<div class="color-info">
483+
<div class="color-hex">#98755f</div>
484+
<div class="color-usage">Comments, inactive UI</div>
485+
</div>
486+
</div>
487+
479488
<div class="color-card">
480489
<div class="color-swatch" style="background-color: #F4DDB3;"></div>
481490
<div class="color-name">Almond</div>
@@ -517,7 +526,7 @@ <h2>Color Palette</h2>
517526
<div class="color-name">Denim Blue</div>
518527
<div class="color-info">
519528
<div class="color-hex">#5B7C99</div>
520-
<div class="color-usage">Information, operators</div>
529+
<div class="color-usage">Information, types</div>
521530
</div>
522531
</div>
523532

‎helix/rumpus.toml‎

Lines changed: 41 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -4,31 +4,24 @@
44
# UI Elements
55
"ui.background" = { bg = "walnut" }
66
"ui.text" = "almond"
7-
"ui.text.focus" = { fg = "harvest-gold", modifiers = ["bold"] }
8-
"ui.text.inactive" = { fg = "chocolate-brown" }
7+
"ui.text.focus" = { fg = "light-harvest-gold", modifiers = ["bold"] }
8+
"ui.text.inactive" = { fg = "cork" }
99
"ui.text.info" = "denim-blue"
1010
"ui.cursor" = { fg = "walnut", bg = "harvest-gold" }
11-
"ui.cursor.normal" = { fg = "walnut", bg = "harvest-gold" }
1211
"ui.cursor.insert" = { fg = "walnut", bg = "avocado-green" }
1312
"ui.cursor.select" = { fg = "walnut", bg = "lava-gold" }
14-
"ui.cursor.match" = { fg = "walnut", bg = "denim-blue" }
13+
"ui.cursor.match" = { fg = "walnut", bg = "light-denim-blue" }
1514
"ui.cursor.primary" = { fg = "walnut", bg = "harvest-gold" }
16-
"ui.cursor.primary.normal" = { fg = "walnut", bg = "harvest-gold" }
1715
"ui.cursor.primary.insert" = { fg = "walnut", bg = "avocado-green" }
1816
"ui.cursor.primary.select" = { fg = "walnut", bg = "lava-gold" }
1917
"ui.selection" = { fg = "walnut", bg = "lava-gold" }
20-
"ui.selection.primary" = { fg = "walnut", bg = "lava-gold" }
21-
"ui.linenr" = "chocolate-brown"
18+
"ui.linenr" = "cork"
2219
"ui.linenr.selected" = { fg = "harvest-gold", modifiers = ["bold"] }
2320
"ui.cursorline" = { bg = "chocolate-brown" }
24-
"ui.cursorline.primary" = { bg = "chocolate-brown" }
25-
"ui.cursorline.secondary" = { bg = "chocolate-brown" }
26-
"ui.cursorcolumn.primary" = { bg = "chocolate-brown" }
27-
"ui.cursorcolumn.secondary" = { bg = "chocolate-brown" }
2821

2922
# Statusline
3023
"ui.statusline" = { fg = "almond", bg = "chocolate-brown" }
31-
"ui.statusline.inactive" = { fg = "denim-blue", bg = "chocolate-brown" }
24+
"ui.statusline.inactive" = { fg = "light-denim-blue", bg = "chocolate-brown" }
3225
"ui.statusline.normal" = { fg = "walnut", bg = "harvest-gold" }
3326
"ui.statusline.insert" = { fg = "walnut", bg = "avocado-green" }
3427
"ui.statusline.select" = { fg = "walnut", bg = "lava-gold" }
@@ -49,13 +42,13 @@
4942
"ui.help" = { fg = "almond", bg = "chocolate-brown" }
5043

5144
# Virtual elements
52-
"ui.virtual.whitespace" = "chocolate-brown"
45+
"ui.virtual.whitespace" = "cork"
5346
"ui.virtual.ruler" = { bg = "chocolate-brown" }
54-
"ui.virtual.indent-guide" = "chocolate-brown"
55-
"ui.virtual.inlay-hint" = { fg = "chocolate-brown" }
56-
"ui.virtual.inlay-hint.parameter" = { fg = "chocolate-brown" }
57-
"ui.virtual.inlay-hint.type" = { fg = "chocolate-brown" }
58-
"ui.virtual.wrap" = { fg = "chocolate-brown" }
47+
"ui.virtual.indent-guide" = "cork"
48+
"ui.virtual.inlay-hint" = { fg = "cork" }
49+
"ui.virtual.inlay-hint.parameter" = { fg = "cork" }
50+
"ui.virtual.inlay-hint.type" = { fg = "cork" }
51+
"ui.virtual.wrap" = { fg = "cork" }
5952
"ui.virtual.jump-label" = { fg = "persimmon", modifiers = ["bold"] }
6053

6154
# Gutter
@@ -71,94 +64,73 @@
7164
# Diagnostics
7265
"error" = "persimmon"
7366
"warning" = "lava-gold"
74-
"info" = "denim-blue"
67+
"info" = "light-denim-blue"
7568
"hint" = "avocado-green"
7669

7770
"diagnostic" = { underline = { style = "curl" } }
7871
"diagnostic.error" = { underline = { color = "persimmon", style = "curl" } }
7972
"diagnostic.warning" = { underline = { color = "lava-gold", style = "curl" } }
80-
"diagnostic.info" = { underline = { color = "denim-blue", style = "curl" } }
73+
"diagnostic.info" = { underline = { color = "light-denim-blue", style = "curl" } }
8174
"diagnostic.hint" = { underline = { color = "avocado-green", style = "curl" } }
8275
"diagnostic.unnecessary" = { modifiers = ["dim"] }
8376
"diagnostic.deprecated" = { modifiers = ["crossed_out"] }
8477

8578
# Syntax highlighting - Comments
86-
"comment" = { fg = "denim-blue", modifiers = ["italic"] }
87-
"comment.line" = { fg = "denim-blue", modifiers = ["italic"] }
88-
"comment.line.documentation" = { fg = "denim-blue", modifiers = ["italic"] }
89-
"comment.block" = { fg = "denim-blue", modifiers = ["italic"] }
90-
"comment.block.documentation" = { fg = "denim-blue", modifiers = ["italic"] }
79+
"comment" = { fg = "cork", modifiers = ["italic"] }
9180

9281
# Syntax highlighting - Constants
9382
"constant" = "lava-gold"
94-
"constant.builtin" = "lava-gold"
95-
"constant.builtin.boolean" = "lava-gold"
83+
"constant.builtin" = "light-lava-gold"
9684
"constant.character" = "avocado-green"
9785
"constant.character.escape" = "burnt-orange"
9886
"constant.numeric" = "lava-gold"
9987
"constant.numeric.integer" = "lava-gold"
100-
"constant.numeric.float" = "lava-gold"
88+
"constant.numeric.float" = "light-lava-gold"
10189

10290
# Syntax highlighting - Strings
10391
"string" = "avocado-green"
104-
"string.regexp" = "avocado-green"
92+
"string.regexp" = "light-avocado"
10593
"string.special" = "burnt-orange"
10694
"string.special.path" = "avocado-green"
107-
"string.special.url" = { fg = "denim-blue", underline = { style = "line" } }
95+
"string.special.url" = { fg = "light-denim-blue", underline = { style = "line" } }
10896
"string.special.symbol" = "harvest-gold"
10997

11098
# Syntax highlighting - Numbers and Booleans
11199
"number" = "lava-gold"
112100
"boolean" = "lava-gold"
113101

114102
# Syntax highlighting - Attributes
115-
"attribute" = "denim-blue"
103+
"attribute" = "light-denim-blue"
116104

117105
# Syntax highlighting - Types
118-
"type" = "harvest-gold"
119-
"type.builtin" = "harvest-gold"
120-
"type.parameter" = "harvest-gold"
121-
"type.enum" = "harvest-gold"
122-
"type.enum.variant" = "harvest-gold"
123-
"constructor" = "harvest-gold"
106+
"type" = "light-denim-blue"
107+
"type.builtin" = "denim-blue"
108+
"constructor" = "denim-blue"
124109

125110
# Syntax highlighting - Functions
126-
"function" = "denim-blue"
127-
"function.builtin" = "denim-blue"
128-
"function.method" = "denim-blue"
129-
"function.method.private" = "denim-blue"
111+
"function" = "harvest-gold"
112+
"function.builtin" = "light-harvest-gold"
130113
"function.macro" = "burnt-orange"
131114
"function.special" = "burnt-orange"
132115

133116
# Syntax highlighting - Keywords
134117
"keyword" = "burnt-orange"
135-
"keyword.control" = "burnt-orange"
136-
"keyword.control.conditional" = "burnt-orange"
137-
"keyword.control.repeat" = "burnt-orange"
138-
"keyword.control.import" = "burnt-orange"
139-
"keyword.control.return" = "burnt-orange"
140-
"keyword.control.exception" = "burnt-orange"
141-
"keyword.operator" = "burnt-orange"
142-
"keyword.directive" = "burnt-orange"
143-
"keyword.function" = "burnt-orange"
144-
"keyword.storage" = "burnt-orange"
145-
"keyword.storage.type" = "burnt-orange"
146-
"keyword.storage.modifier" = "burnt-orange"
147118

148119
# Syntax highlighting - Operators
149-
"operator" = "denim-blue"
120+
"operator" = "almond"
150121

151122
# Syntax highlighting - Variables
152123
"variable" = "almond"
153-
"variable.parameter" = "almond"
154-
"variable.builtin" = "harvest-gold"
124+
"variable.parameter" = { fg = "almond", modifiers = ["italic"] }
125+
"variable.builtin" = "light-harvest-gold"
155126
"variable.other" = "almond"
156127
"variable.other.member" = "almond"
157128
"variable.other.member.private" = "almond"
158129

159130
# Syntax highlighting - Labels and Namespaces
160131
"label" = "burnt-orange"
161-
"namespace" = "harvest-gold"
132+
"namespace" = "denim-blue"
133+
"module" = "denim-blue"
162134

163135
# Syntax highlighting - Punctuation
164136
"punctuation" = "almond"
@@ -176,12 +148,6 @@
176148
# Markup
177149
"markup.heading" = { fg = "burnt-orange", modifiers = ["bold"] }
178150
"markup.heading.marker" = { fg = "burnt-orange", modifiers = ["bold"] }
179-
"markup.heading.1" = { fg = "burnt-orange", modifiers = ["bold"] }
180-
"markup.heading.2" = { fg = "burnt-orange", modifiers = ["bold"] }
181-
"markup.heading.3" = { fg = "burnt-orange", modifiers = ["bold"] }
182-
"markup.heading.4" = { fg = "burnt-orange", modifiers = ["bold"] }
183-
"markup.heading.5" = { fg = "burnt-orange", modifiers = ["bold"] }
184-
"markup.heading.6" = { fg = "burnt-orange", modifiers = ["bold"] }
185151
"markup.list" = "harvest-gold"
186152
"markup.list.unnumbered" = "harvest-gold"
187153
"markup.list.numbered" = "harvest-gold"
@@ -190,7 +156,7 @@
190156
"markup.bold" = { modifiers = ["bold"] }
191157
"markup.italic" = { modifiers = ["italic"] }
192158
"markup.strikethrough" = { modifiers = ["crossed_out"] }
193-
"markup.link.url" = { fg = "denim-blue", underline = { style = "line" } }
159+
"markup.link.url" = { fg = "light-denim-blue", underline = { style = "line" } }
194160
"markup.link.label" = "avocado-green"
195161
"markup.link.text" = "avocado-green"
196162
"markup.quote" = "avocado-green"
@@ -206,25 +172,34 @@
206172
"diff.minus" = "persimmon"
207173
"diff.minus.gutter" = "persimmon"
208174
"diff.delta" = "burnt-orange"
209-
"diff.delta.moved" = "denim-blue"
175+
"diff.delta.moved" = "light-denim-blue"
210176
"diff.delta.conflict" = "persimmon"
211177
"diff.delta.gutter" = "burnt-orange"
212178

213179
# Rainbow brackets (optional)
214180
"rainbow.0" = "harvest-gold"
215181
"rainbow.1" = "burnt-orange"
216182
"rainbow.2" = "avocado-green"
217-
"rainbow.3" = "denim-blue"
183+
"rainbow.3" = "light-denim-blue"
218184
"rainbow.4" = "lava-gold"
219185

220186
[palette]
221187
# Primary colors
222188
walnut = "#2A1810"
223189
chocolate-brown = "#5F3822"
190+
cork = "#98755f"
224191
almond = "#F4DDB3"
225192
harvest-gold = "#E9A131"
226193
burnt-orange = "#F67422"
227194
avocado-green = "#79966d"
228195
denim-blue = "#5B7C99"
229196
lava-gold = "#D3BE47"
230197
persimmon = "#E84A38"
198+
199+
# Light variants (ANSI bright colors)
200+
light-brown = "#84563B"
201+
light-avocado = "#9BB589"
202+
light-harvest-gold = "#F1C760"
203+
light-denim-blue = "#7A96B0"
204+
light-lava-gold = "#E1D36B"
205+
light-almond = "#FCF0DC"

0 commit comments

Comments
 (0)