Skip to content

Commit 542779f

Browse files
authored
Merge pull request #19 from TheOtterlord/v0.7.0
V0.7.0
2 parents 4d5c432 + 407b70d commit 542779f

21 files changed

+3154
-207
lines changed

CHANGELOG.md

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,23 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
66
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
77

88

9+
## 0.7.0
10+
11+
This update improves the overall UI adding themes & custom css while also adding autocomplete for YCB card ids.
12+
13+
### Added
14+
15+
- A theme system with a few different themes
16+
- Custom css that can be changed in settings
17+
- Autocomplete for YCB card ids
18+
- Discord connect & disconnect notifications
19+
- New notifications API with better animations
20+
21+
### Changed
22+
23+
- Upgraded electron to 11.2.1 minimum
24+
- Updated the start screen UI (now only displays the name of the file, not the path)
25+
926
## 0.6.4
1027

1128
Deck saving bug fix

bg.png

364 KB
Loading

bg.webp

-58.3 KB
Binary file not shown.

css/combo.css

Lines changed: 36 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
.combo-editor .col {
77
height: 100%;
88
float: left;
9-
border-right: 2px solid #181818;
9+
border-right: 2px solid rgba(0,0,0,0.2);
1010
}
1111

1212
.combo-editor .col .scroller {
@@ -19,18 +19,16 @@
1919
outline: none;
2020
border: none;
2121
margin: 0;
22-
color: #fff;
22+
color: var(--color);
2323
padding: 12px 20px;
2424
box-sizing: border-box;
2525
transition: border 0.2s;
26-
background: #262626;
26+
background: var(--elevated);
2727
}
2828

2929
.collapse-btn.active {
30-
background: #303030;
31-
}
32-
.collapse-btn:hover {
33-
background: #343434;
30+
background: var(--primary);
31+
color: var(--on-primary);
3432
}
3533

3634
.collapse {
@@ -44,42 +42,62 @@
4442
outline: none;
4543
border: none;
4644
margin: 0;
47-
color: #fff;
45+
color: var(--color);
4846
padding: 12px 20px;
4947
box-sizing: border-box;
5048
transition: 0.2s;
5149
}
5250
.array-item:hover, .array-item.active {
5351
background-color: rgba(0,0,0,0.2);
54-
color: #0ef;
52+
color: var(--secondary);
5553
}
5654

5755
.array-list {
5856
width: 100%;
59-
border: 2px solid #181818;
57+
box-shadow: 0px 8px 16px 0px rgba(0,0,0,0.2);
6058
border-radius: 16px;
6159
overflow: hidden;
60+
background: var(--elevated);
6261
}
6362

6463
.array-list .item {
65-
background: #242424;
6664
outline: none;
6765
border: none;
68-
color: #fff;
66+
color: var(--color);
6967
width: 100%;
7068
padding: 12px 20px;
7169
box-sizing: border-box;
7270
}
7371

7472
.array-list .item:nth-child(even) {
75-
background-color: #202020;
73+
background-color: var(--hover-shade);
7674
}
7775

78-
/* Maybe add back if you can click it for action */
79-
/* .array-list .item:hover {
80-
background-color: #343443;
81-
} */
82-
8376
.array-list .item span {
8477
cursor: pointer;
8578
}
79+
80+
.suggestions {
81+
position: absolute;
82+
left: 0;
83+
right: 0;
84+
top: 100%;
85+
transform: translateY(-10px);
86+
background-color: var(--elevated);
87+
color: var(--color);
88+
box-shadow: 0px 8px 16px 0px rgba(0,0,0,0.2);
89+
}
90+
91+
.suggestions div {
92+
padding: 8px;
93+
cursor: pointer;
94+
}
95+
96+
.suggestions div:hover {
97+
background-color: var(--hover-shade);
98+
}
99+
100+
.suggestions div.active {
101+
background-color: var(--primary);
102+
color: var(--on-primary);
103+
}

css/editor.css

Lines changed: 39 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
}
6161

6262
.deckbox {
63-
border: 1px solid #fff;
63+
border: 1px solid var(--primary);
6464
padding: 4px;
6565
height: 100%;
6666
}
@@ -114,6 +114,7 @@
114114

115115
.card {
116116
transition: padding 0.2s;
117+
cursor: pointer;
117118
}
118119

119120
.card.drag {
@@ -137,25 +138,26 @@
137138
background: transparent;
138139
outline: none;
139140
border: none;
140-
color: #fff;
141-
border-bottom: 1px solid #fff;
141+
color: var(--color);
142+
border-bottom: 1px solid var(--primary);
142143
padding: 4px;
143144
}
144145

145146
.editor .search .padding .filter button {
146147
width: calc(50% - 8px);
147148
outline: none;
148149
border: none;
149-
background: rgba(255,0,255,0.4);
150-
color: #fff;
150+
background: var(--elevated);
151+
color: var(--color);
151152
float: left;
152153
margin: 4px;
153154
border-radius: 4px;
154-
transition: background 0.4s;
155+
transition: 0.2s;
155156
}
156157

157158
.editor .search .padding .filter button:active {
158-
background-color: rgba(255,0,255,0.6);
159+
background-color: var(--primary);
160+
color: var(--on-primary);
159161
}
160162

161163
.editor .search .padding .maxwidth {
@@ -200,7 +202,7 @@
200202
}
201203

202204
.editor .search .padding .pagination a.active, .editor .search .padding .pagination a:active {
203-
background-color: rgba(255,0,255,0.4);
205+
background-color: var(--primary);
204206
}
205207

206208
.fade {
@@ -227,7 +229,7 @@
227229
top: 50%;
228230
left: 50%;
229231
transform: translate(-50%, -50%);
230-
background-color: #242424;
232+
background-color: var(--elevated);
231233
box-shadow: 0px 8px 16px 0px rgba(0,0,0,0.2);
232234
overflow: hidden;
233235
transition: height 0.4s;
@@ -241,18 +243,19 @@
241243
.filter-panel button {
242244
outline: none;
243245
border: none;
244-
background: rgba(255,0,255,0.4);
245-
color: #fff;
246+
background: var(--background);
247+
color: var(--color);
246248
float: left;
247249
margin: 4px;
248250
padding-left: 12px;
249251
padding-right: 12px;
250252
border-radius: 4px;
251-
transition: background 0.4s;
253+
transition: 0.2s;
252254
}
253255

254256
.filter-panel button:active {
255-
background-color: rgba(255,0,255,0.6);
257+
background: var(--primary);
258+
color: var(--on-primary);
256259
}
257260

258261
/* Information box above deck */
@@ -261,51 +264,60 @@
261264
background-color: transparent;
262265
outline: none;
263266
border: none;
264-
color: #fff;
265-
border-bottom: 1px solid #fff;
267+
color: var(--color);
268+
border-bottom: 1px solid var(--primary);
266269
padding: 4px;
270+
transition: border 0.2s;
271+
}
272+
273+
.cell.info input:focus {
274+
border-bottom-color: var(--secondary);
267275
}
268276

269277
.btn50 {
278+
box-shadow: 0px 8px 16px 0px rgba(0,0,0,0.2);
270279
outline: none;
271280
border: none;
272-
background: rgba(255,0,255,0.4);
273-
color: #fff;
281+
background: var(--elevated);
282+
color: var(--color);
274283
float: left;
275284
margin: 4px;
276285
padding-left: 6px;
277286
padding-right: 6px;
278287
border-radius: 4px;
279-
transition: background 0.4s;
280288
width: calc(50% - 8px);
289+
transition: 0.2s;
281290
}
282291

283292
.btn50:active {
284-
background-color: rgba(255,0,255,0.6);
293+
background: var(--primary);
294+
color: var(--on-primary);
285295
}
286296

287297
.btn33 {
298+
box-shadow: 0px 8px 16px 0px rgba(0,0,0,0.2);
288299
outline: none;
289300
border: none;
290-
background: rgba(255,0,255,0.4);
291-
color: #fff;
301+
background: var(--elevated);
302+
color: var(--color);
292303
float: left;
293304
margin: 2px;
294305
padding-left: 6px;
295306
padding-right: 6px;
296307
border-radius: 4px;
297-
transition: background 0.4s;
298308
width: calc(50% - 4px);
309+
transition: 0.2s;
299310
}
300311

301312
.btn33:active {
302-
background-color: rgba(255,0,255,0.6);
313+
background-color: var(--primary);
314+
color: var(--on-primary);
303315
}
304316

305317
/* Combo Widget */
306318

307319
.combo-widget {
308-
border: 1px solid #fff;
320+
border: 1px solid var(--primary);
309321
overflow-x: hidden;
310322
overflow-y: auto;
311323
position: relative;
@@ -318,7 +330,7 @@
318330
}
319331

320332
.combo-widget h4:hover {
321-
background-color: #282828;
333+
background-color: var(--hover-shade);
322334
}
323335

324336
.combo-widget .btn-grp {
@@ -328,14 +340,8 @@
328340
min-width: 66%;
329341
}
330342

331-
.combo-widget .btn50.disabled {
332-
cursor: not-allowed;
333-
background-color: #282828;
334-
color: #555;
335-
}
336-
337343
.combo-widget h4.active {
338-
background-color: #3a3a3a;
344+
background-color: var(--elevated);
339345
}
340346

341347
.combo-widget ul {
@@ -363,7 +369,7 @@
363369
z-index: 9;
364370
transform: translate(-50%, -50%) scale(0);
365371
transition: .5s ease-in-out;
366-
background-color: #282828;
372+
background-color: var(--elevated);
367373
box-shadow: 0px 8px 16px 0px rgba(0,0,0,0.2);
368374
}
369375

css/filter.css

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
select {
2-
background: #555;
2+
background: var(--primary);
33
outline: none;
44
border: none;
5-
color: white;
5+
color: var(--color);
66
padding: 8px;
77
font-weight: bold;
88
width: 100%;
@@ -13,11 +13,15 @@ input[type=text] {
1313
background: transparent;
1414
outline: none;
1515
border: none;
16-
color: #fff;
17-
border-bottom: 1px solid #fff;
16+
color: var(--color);
17+
border-bottom: 1px solid var(--primary);
1818
padding: 4px;
1919
}
2020

21+
input[type=text]:focus {
22+
border-bottom-color: var(--secondary);
23+
}
24+
2125
input[type=text]:disabled {
2226
border-bottom: 1px solid #555;
2327
}

0 commit comments

Comments
 (0)