Skip to content

Commit 468c4ab

Browse files
authored
Various updates to Tech Fair
2 parents 2ebc3ed + 6ed87c1 commit 468c4ab

34 files changed

Lines changed: 1777 additions & 307 deletions

.prettierignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,4 @@ build
33
node_modules
44

55
# ignore HTML and CSS files
6-
**/*.html
76
**/*.css

.prettierrc

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,11 @@
11
{
2+
"arrowParens": "avoid",
3+
"bracketSpacing": true,
4+
"endOfLine": "lf",
25
"semi": true,
3-
"trailingComma": "none",
6+
"printWidth": 100,
47
"singleQuote": true,
5-
"printWidth": 80,
68
"tabWidth": 2,
7-
"overrides": [
8-
{
9-
"files": "public/admin/**/*.js",
10-
"options": {
11-
"singleQuote": false,
12-
"tabWidth": 4,
13-
"printWidth": 100
14-
}
15-
}
16-
]
9+
"trailingComma": "none",
10+
"useTabs": false
1711
}

package-lock.json

Lines changed: 619 additions & 280 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,7 @@
3535
"tailwindcss": "^3.4.8",
3636
"webpack": "^5.90.3",
3737
"webpack-bundle-analyzer": "^4.10.2",
38-
"webpack-cli": "^5.1.4",
39-
"webpack-dev-server": "^5.0.4"
38+
"webpack-cli": "^5.1.4"
4039
},
4140
"engines": {
4241
"node": "^18",
@@ -55,6 +54,7 @@
5554
]
5655
},
5756
"devDependencies": {
58-
"file-loader": "^6.2.0"
57+
"file-loader": "^6.2.0",
58+
"webpack-dev-server": "^5.2.1"
5959
}
6060
}

public/admin/style.css

Lines changed: 24 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
body {
77
display: flex;
88
flex-direction: column;
9-
9+
1010
margin: 0 auto;
1111

1212
height: 100vh;
@@ -42,8 +42,8 @@ select[readonly] optgroup {
4242

4343
border-bottom: #bbb 1px solid;
4444

45-
background: rgb(184,252,223);
46-
background: linear-gradient(19deg, rgb(202, 255, 232) 0%, rgb(236, 255, 218) 31%, rgba(255,254,243,1) 100%);
45+
background: rgb(184, 252, 223);
46+
background: linear-gradient(19deg, rgb(202, 255, 232) 0%, rgb(236, 255, 218) 31%, rgba(255, 254, 243, 1) 100%);
4747
}
4848

4949
#header-content {
@@ -122,14 +122,14 @@ select[readonly] optgroup {
122122
align-items: center;
123123
font-size: 1.5rem;
124124
line-height: 1;
125-
125+
126126
text-align: center;
127-
127+
128128
padding: 0 1rem;
129-
height: 100%;
129+
height: 100%;
130130

131131
vertical-align: middle;
132-
132+
133133
cursor: pointer;
134134
user-select: none;
135135

@@ -161,6 +161,7 @@ select[readonly] optgroup {
161161
.nav-header:hover {
162162
background-color: #eee;
163163
}
164+
164165
.nav-header:active {
165166
background-color: #f6f6f6;
166167
}
@@ -193,39 +194,44 @@ select[readonly] optgroup {
193194

194195
transition: transform 0.15s ease-in-out;
195196
}
197+
196198
.nav-child:hover {
197199
background-color: #f7f7f7;
198200
transform: translateX(-2px);
199201
}
202+
200203
.nav-child:active {
201204
transition: transform 0.06s ease-in-out;
202205
transform: translateX(2px);
203206
}
204207

205208
.tab-item {
206209
height: 4rem;
207-
210+
208211
border: #ddd 1px solid;
209212
border-radius: 1.2rem;
210-
213+
211214
cursor: pointer;
212215
user-select: none;
213216

214217
padding: 0.3rem 1rem 0 1rem;
215218
transition: transform 0.15s ease-in-out;
216219
}
220+
217221
.tab-item:hover {
218222
background-color: #eee;
219223
border: #eee 1px solid;
220224
transform: translateY(-2px);
221225
}
226+
222227
.tab-item:active {
223228
transition: transform 0.075s ease-in-out;
224229

225230
background-color: #f5f5f5;
226231
border: #f5f5f5 1px solid;
227232
transform: translateY(2px);
228233
}
234+
229235
#home-tab {
230236
font-size: 1.75rem;
231237
height: 1.7rem;
@@ -238,9 +244,11 @@ select[readonly] optgroup {
238244

239245
transition: transform 0.15s ease-in-out;
240246
}
247+
241248
#home-tab:hover {
242249
transform: translateY(-1px);
243250
}
251+
244252
#home-tab:active {
245253
transition: transform 0.1s ease-in-out;
246254
transform: translateY(2px);
@@ -256,10 +264,12 @@ select[readonly] optgroup {
256264

257265
transition: 0.1s transform ease-in-out;
258266
}
267+
259268
.tab-item img:hover {
260269
filter: invert(0%);
261270
background-color: #ccc;
262271
}
272+
263273
.tab-item img:active {
264274
filter: invert(20%);
265275
background-color: #bbb;
@@ -271,10 +281,12 @@ select[readonly] optgroup {
271281
background-color: #ddd;
272282
border-color: #ddd;
273283
}
284+
274285
.active-tab:hover {
275286
background-color: #ccc;
276287
border-color: #ccc;
277288
}
289+
278290
.active-tab:active {
279291
background-color: #d6d6d6;
280292
border-color: #d6d6d6;
@@ -289,6 +301,7 @@ select[readonly] optgroup {
289301
margin-top: -2ch;
290302
padding: 1ch 0 0 1ch;
291303
}
304+
292305
#controls div {
293306
width: calc(50ch - 2ch);
294307
padding: 1ch;
@@ -299,9 +312,11 @@ clickable {
299312
cursor: pointer;
300313
text-decoration: underline;
301314
}
315+
302316
clickable:hover {
303317
color: rgb(235, 157, 94);
304318
}
319+
305320
clickable:active {
306321
color: rgb(255, 246, 162);
307322
}

public/static/icons/csss_logo.svg

Lines changed: 62 additions & 0 deletions
Loading
179 KB
Binary file not shown.
1.98 MB
Loading
37.6 KB
Loading
35.2 KB
Loading

0 commit comments

Comments
 (0)