Skip to content

Commit 0e3af04

Browse files
identikittenidentikitten
committed
Merge branch 'main' of https://github.com/SFPC/sfpc.study into fall-styling
2 parents ef00951 + 486196b commit 0e3af04

5 files changed

Lines changed: 21 additions & 51 deletions

File tree

‎public/fonts/Cardinal.ttf‎

-49.1 KB
Binary file not shown.

‎public/fonts/authentic-sans-90.otf‎

-13.5 KB
Binary file not shown.

‎public/lcd.css‎

Lines changed: 12 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,11 @@
3434
black 231F20
3535
white #FFFFFF */
3636
/* --summer-25-background: #FFF; */
37-
--fall-25-background: #0f261f;
38-
--fall-25-text: #f2ff26;
37+
--fall-25-background: #131313;
38+
--fall-25-text: #feadad;
3939
--fall-25-text-on-bg: #231F20;
40-
--fall-25-link: #e70bf7;
41-
--fall-25-special-text: #ffcfc4;
40+
--fall-25-link: #00BC00;
41+
--fall-25-special-text: #FF06C4;
4242
--fall-25-weekend-intensive: #FF000F;
4343

4444
--summer-25-background: #FFBAD9;
@@ -363,30 +363,21 @@ select#allSections {
363363
color: var(--fall-25-text);
364364
box-sizing: border-box;
365365
border-color: var(--fall-25-text);
366-
/*background-image: url('images/sessions/winter-25/bg.png');*/
367-
background-color: var(--fall-25-background);
366+
background-image: url('images/sessions/winter-25/bg.png');
367+
/* background-color: var(--fall-25-background); */
368368
background-position: center;
369369
background-size: cover;
370370
}
371371

372-
.fall-25-cardstyle{
373-
padding: 1em;
374-
border-radius: 0px;
375-
background-image: url(/images/sessions/fall-25/si.png);
376-
background-repeat: repeat;
377-
box-shadow: inset -1px -1px 15px 3px #f2ff26;
378-
border-color: #f2ff26bf;
379-
}
380-
381372
.fall-25.featured:hover {
382373
/* background-size: 200%; */
383374
}
384375

385376

386377

387378
.shell.fall-25 {
388-
background-color: var(--fall-25-background);
389-
/*background-image:url('images/sessions/winter-25/bg.png');*/
379+
/* background-color: var(--fall-25-background); */
380+
background-image:url('images/sessions/winter-25/bg.png');
390381
/* background-position: bottom; */
391382
background-repeat: no-repeat;
392383
background-size: 150%;
@@ -598,23 +589,18 @@ select#allSections {
598589
border-color:#FF000F;
599590
}
600591
.fall-25.online-class .pill {
601-
background-color: #f2ff26;
602-
padding: 0.2em;
603-
border-radius: 2em;
604-
color: black!important;
592+
background-color: #FFBAD9;
605593
}
606594
.fall-25.weekend-intensive .pill {
607595
background-color: #FF000F;
608596
color: #fffefb !important;
609597
}
610598
#class-block .fall-25.online-class {
611-
border-color:#ffcfc4;
599+
border-color:#00BC00;
612600
}
613601
#class-block .fall-25.online-class .pill {
614-
background-color: #ffcfc4;
615-
color: #000000;
616-
padding: 0.2em;
617-
border-radius: 2em;
602+
background-color: #00BC00;
603+
color: #fffefb;
618604
}
619605

620606
#class-block .weekend-intensive h2:hover, #class-block .weekend-intensive h6:hover, {

‎public/styles.css‎

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@
3131
/* DUPLICATE FOR SEASON, CHANGE SEASON NAME AND ADD TYPE USING @font-face BELOW */
3232

3333

34-
--fall-25-title-font: 'Cardinal', sans-serif;
35-
--fall-25-header-font: 'Cardinal', sans-serif;
36-
--fall-25-body-font: 'Authentic Sans', sans-serif;
37-
--fall-25-special-font: 'Cardinal', sans-serif;
34+
--fall-25-title-font: 'Ductus', sans-serif;
35+
--fall-25-header-font: 'Arastin Pro', sans-serif;
36+
--fall-25-body-font: 'DIN Alternate', sans-serif;
37+
--fall-25-special-font: 'Ductus', sans-serif;
3838

3939
--summer-25-title-font: 'Ductus', sans-serif;
4040
--summer-25-header-font: 'Arastin Pro', sans-serif;
@@ -145,22 +145,6 @@
145145

146146
@import url("https://p.typekit.net/p.css?s=1&k=thn3crj&ht=tk&f=28524.28525&a=79545553&app=typekit&e=css");
147147

148-
149-
@font-face {
150-
font-family: 'Authentic Sans';
151-
src: url('/fonts/authentic-sans-90.otf') format('opentype');
152-
font-weight: normal;
153-
font-style: normal;
154-
}
155-
156-
@font-face {
157-
font-family: 'Cardinal';
158-
src: url('/fonts/Cardinal.ttf') format('trueType');
159-
font-weight: normal;
160-
font-style: normal;
161-
}
162-
163-
164148
@font-face {
165149
font-family: 'Geneva 9';
166150
src: url('/fonts/Geneva-9.woff2') format('woff2'),

‎public/templates/index_staging.hbs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@
138138
</div>
139139
</div>
140140
</div>
141-
<div class="grid-4 featured fall-25 online-class" style="background-image: url('/images/sessions/fall-25/si.png'); background-repeat: repeat;">
141+
<div class="grid-4 featured fall-25 online-class">
142142
<div class="featured-text">
143143
<div class="top">
144144
<h4 class="type"><a class="pill" href="/sessions/fall-25/solidarity-infra">online class</a></h4>
@@ -151,7 +151,7 @@
151151
</div>
152152
</div>
153153
</div>
154-
<div class="grid-4 featured fall-25 online-class" style="background-image: url('/images/sessions/fall-25/icaa.png'); background-repeat: repeat;">
154+
<div class="grid-4 featured fall-25 online-class">
155155
<div class="featured-text">
156156
<div class="top">
157157
<h4 class="type"><a class="pill" href="/sessions/fall-25/interrogating-computational-approaches">online class</a></h4>
@@ -175,7 +175,7 @@
175175
</div>
176176
<div class="grid-1 currently">
177177

178-
<div class="grid-4 featured fall-25 online-class" style="background-image: url('/images/sessions/fall-25/avg.png'); background-repeat: repeat;">
178+
<div class="grid-4 featured fall-25 online-class">
179179
<div class="featured-text">
180180
<div class="top">
181181
<h4 class="type"><a class="pill" href="/sessions/fall-25/athletic-aesthetics">online class</a></h4>
@@ -189,7 +189,7 @@
189189
</div>
190190
</div>
191191

192-
<div class="grid-4 featured fall-25 online-class" style="background-image: url('/images/sessions/fall-25/pcs.png'); background-repeat: repeat;">
192+
<div class="grid-4 featured fall-25 online-class">
193193
<div class="featured-text">
194194
<div class="top">
195195
<h4 class="type"><a class="pill" href="/sessions/fall-25/politics-culture-sampling">online class</a></h4>
@@ -204,7 +204,7 @@
204204
</div>
205205

206206

207-
<div class="grid-4 featured fall-25 online-class" style="background-image: url('/images/sessions/fall-25/oops.png'); background-repeat: repeat;">
207+
<div class="grid-4 featured fall-25 online-class">
208208
<div class="featured-text">
209209
<div class="top">
210210
<h4 class="type"><a class="pill" href="/sessions/fall-25/platform-sabotage">online class</a></h4>

0 commit comments

Comments
 (0)