Skip to content

Commit 3f24873

Browse files
committed
[Fix] #master_cleanup Team/Sponsor component and stylesheets.
1 parent f179be3 commit 3f24873

File tree

8 files changed

+331
-59
lines changed

8 files changed

+331
-59
lines changed

package-lock.json

+6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+2
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,14 @@
2424
"@fortawesome/free-regular-svg-icons": "^5.11.2",
2525
"@fortawesome/free-solid-svg-icons": "^5.11.2",
2626
"@fortawesome/vue-fontawesome": "^0.1.7",
27+
"@types/lodash": "^4.14.149",
2728
"@types/ol": "^6.1.0",
2829
"@types/vue": "^2.0.0",
2930
"@vue/cli-plugin-babel": "^3.11.0",
3031
"@vue/cli-plugin-typescript": "^3.11.0",
3132
"@vue/cli-service": "^3.11.0",
3233
"axios": "^0.19.0",
34+
"lodash": "^4.17.15",
3335
"markdown": "^0.5.0",
3436
"ol": "^6.1.1",
3537
"prerender-spa-plugin": "^3.4.0",

src/assets/scss/animate.scss

+4-4
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
opacity: 0;
1212
transform: translateX(50%);
1313

14-
&.teams-subview {
15-
top: 240px;
14+
&.team-subview {
15+
top: 180px;
1616
}
1717
}
1818

@@ -22,7 +22,7 @@
2222
opacity: 0;
2323
transform: translateX(-50%);
2424

25-
&.teams-subview {
26-
top: 240px;
25+
&.team-subview {
26+
top: 180px;
2727
}
2828
}

src/assets/scss/sponsor.scss

+237-4
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
@media screen and (max-width: 1280px) {
1414
padding: 4em 2em;
1515
}
16-
16+
1717
@media screen and (max-width: 900px) {
1818
padding: 4em 1em;
1919
}
@@ -26,13 +26,13 @@
2626
margin: 1rem;
2727

2828
@media screen and (max-width: 475px) {
29-
margin: .5rem;
29+
margin: 0.5rem;
3030
}
3131

3232
a {
3333
img {
3434
max-width: 280px;
35-
35+
3636
@media screen and (max-width: 1280px) {
3737
max-width: 200px;
3838
}
@@ -46,4 +46,237 @@
4646
}
4747
}
4848
}
49-
}
49+
}
50+
51+
@mixin Sponsor {
52+
.sponsor {
53+
&-container {
54+
padding: 0 200px;
55+
56+
@media screen and (max-width: 1280px) {
57+
padding: 0 32px;
58+
}
59+
60+
@media screen and (max-width: 960px) {
61+
padding: 0 32px;
62+
padding-left: 120px;
63+
}
64+
65+
@media screen and (max-width: 675px) {
66+
padding: 0 16px;
67+
padding-left: 108px;
68+
}
69+
}
70+
71+
&-wrapper {
72+
h2 {
73+
font-size: 32px;
74+
margin: 32px 16px;
75+
}
76+
}
77+
}
78+
79+
.individual-sponsor {
80+
display: block;
81+
.card {
82+
width: 100%;
83+
}
84+
p {
85+
display: block;
86+
width: 100%;
87+
}
88+
p.give-me-money {
89+
text-align: center;
90+
}
91+
}
92+
93+
// Common layout for host and all sponsors
94+
.card-container {
95+
display: flex;
96+
flex-direction: row;
97+
justify-content: flex-start;
98+
flex-wrap: wrap;
99+
width: 100%;
100+
101+
.card {
102+
display: flex;
103+
flex-direction: column;
104+
box-sizing: border-box;
105+
padding: 32px;
106+
border-radius: 2rem;
107+
border: 8px solid $black;
108+
109+
h2.subtitle {
110+
text-align: left;
111+
font-size: 24px;
112+
}
113+
114+
p.paragraph {
115+
a {
116+
transition: all ease-in-out 0.3s;
117+
118+
&:hover {
119+
color: $tone;
120+
text-decoration: underline;
121+
}
122+
}
123+
}
124+
125+
img {
126+
height: 180px;
127+
128+
&:hover {
129+
cursor: pointer;
130+
}
131+
}
132+
133+
&.horizen {
134+
display: flex;
135+
flex-direction: row;
136+
width: 100%;
137+
box-sizing: border-box;
138+
justify-content: flex-start;
139+
align-items: center;
140+
margin-right: 0;
141+
border-radius: 18px;
142+
143+
img {
144+
margin-right: 1em;
145+
}
146+
147+
.text-container {
148+
width: 0;
149+
flex-grow: 1;
150+
}
151+
152+
@media screen and (max-width: 960px) {
153+
flex-direction: column;
154+
border-radius: 2rem;
155+
156+
.text-container {
157+
width: auto;
158+
flex-grow: auto;
159+
}
160+
}
161+
}
162+
}
163+
}
164+
165+
// Layout for organizations other than the host (i.e. sponsor)
166+
.org-container {
167+
box-sizing: border-box;
168+
font-size: 12pt;
169+
170+
.org {
171+
// min-height: calc((100vw - 500px - 66.5px) * 1.414 / 3);
172+
align-items: center;
173+
174+
img {
175+
margin-bottom: 1em;
176+
}
177+
178+
// Three cards per row
179+
@media screen and (min-width: 1440px + 1) {
180+
width: 31.33%;
181+
&:not(:nth-child(3n)) {
182+
margin-right: 3%;
183+
}
184+
&:nth-last-child(-n + 3) {
185+
margin-bottom: 0;
186+
}
187+
}
188+
189+
@media screen and (max-width: 1440px) and (min-width: 960px + 0.001px) {
190+
width: 48.5%;
191+
&:nth-child(odd) {
192+
margin-right: 3%;
193+
}
194+
&:nth-last-child(-n + 2) {
195+
margin-bottom: 0;
196+
}
197+
}
198+
199+
@media screen and (max-width: 960px) {
200+
width: 100%;
201+
&:not(:last-child) {
202+
margin-bottom: 2em;
203+
}
204+
}
205+
}
206+
}
207+
208+
// Mobile layout of cards
209+
@media screen and (max-width: 960px) {
210+
.card-container {
211+
display: flex;
212+
flex-direction: column;
213+
214+
.card {
215+
width: 100%;
216+
display: flex;
217+
flex-direction: column;
218+
align-items: center;
219+
border-width: 5px;
220+
padding: 16px;
221+
min-height: initial;
222+
height: initial;
223+
@media screen and (max-width: 480px) {
224+
min-height: calc((100vw - 32px - 78px) * 1.414);
225+
}
226+
.text-container {
227+
width: 100%;
228+
}
229+
img {
230+
height: 33vw;
231+
max-height: 180px;
232+
margin: 0 0 1em 0;
233+
}
234+
}
235+
}
236+
}
237+
238+
// Text style and size of cards
239+
.card-container {
240+
.text-container {
241+
width: 100%;
242+
}
243+
244+
h3 {
245+
// Daddy's name
246+
width: 100%;
247+
font-size: 1.5em;
248+
font-weight: bold;
249+
line-height: 1.5em;
250+
text-align: start;
251+
252+
@media screen and (max-width: 960px) {
253+
font-size: 1.25em;
254+
}
255+
}
256+
257+
p {
258+
// Daddy's info
259+
margin-top: 1em;
260+
word-wrap: break-word;
261+
line-height: 1.5em;
262+
text-align: start;
263+
width: 100%;
264+
}
265+
}
266+
267+
// Style of the read-more text
268+
.readmore {
269+
margin-top: 0.5em;
270+
margin-bottom: 0;
271+
text-align: end;
272+
273+
a {
274+
color: $tone;
275+
cursor: pointer;
276+
277+
&:hover {
278+
color: $light-tone;
279+
}
280+
}
281+
}
282+
}

src/assets/scss/tab.scss

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@
1010
box-sizing: border-box;
1111
transform-origin: center;
1212
transform: skewX(-15deg);
13-
z-index: 100;
13+
z-index: 1;
1414

1515
@media screen and (max-width: 1280px) {
1616
padding: 0;
1717
}
1818

1919
@media screen and (max-width: 960px) {
2020
top: 64px + 32px;
21-
left:16px;
21+
left: 16px;
2222
position: fixed;
2323
min-height: 0;
2424
width: 76px;

src/assets/scss/team.scss

+1
Original file line numberDiff line numberDiff line change
@@ -37,4 +37,5 @@
3737

3838
@include Tab;
3939
@include Staff;
40+
@include Sponsor;
4041
}

0 commit comments

Comments
 (0)