Skip to content

Commit 907f507

Browse files
committed
chore(add sponsors into aside):
1 parent 4bb29d9 commit 907f507

9 files changed

+205
-240
lines changed

.eslintrc.js

+22-26
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,23 @@
11
module.exports = {
2-
extends: [
3-
'unobtrusive',
4-
'eslint:recommended'
5-
],
6-
plugins: ['babel'],
7-
env: {
8-
browser: true,
9-
node: true,
10-
},
11-
globals: {
12-
},
13-
rules: {
14-
semi: [2, 'always'],
15-
quotes: [2, 'single'],
16-
indent: [2, 2],
17-
'linebreak-style': [2, 'unix'],
18-
'brace-style': [2, '1tbs'],
19-
'array-bracket-spacing': [2, 'never'],
20-
camelcase: [2, {properties: 'always'}],
21-
'keyword-spacing': [2],
22-
'eol-last': [2],
23-
'no-trailing-spaces': [2],
24-
'no-process-env': ['off', 'always'],
25-
'no-console': ['off','always']
26-
}
27-
};
2+
extends: ["unobtrusive", "eslint:recommended"],
3+
plugins: ["babel"],
4+
env: {
5+
browser: true,
6+
node: true
7+
},
8+
globals: {},
9+
rules: {
10+
semi: [2, "always"],
11+
quotes: [2, "double"],
12+
indent: [2, 2],
13+
"linebreak-style": [2, "unix"],
14+
"brace-style": [2, "1tbs"],
15+
"array-bracket-spacing": [2, "never"],
16+
camelcase: [2, { properties: "always" }],
17+
"keyword-spacing": [2],
18+
"eol-last": [2],
19+
"no-trailing-spaces": [2],
20+
"no-process-env": ["off", "always"],
21+
"no-console": ["off", "always"]
22+
}
23+
};

_source/_includes/aside-left.html

+8-1
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,19 @@
2525

2626
</ul>
2727
<div class="tweet">
28+
<p>Latest Tweets:</p>
2829
<div class="message"></div>
2930
<div class="tweettime"></div>
3031
<div class="twitter-link"><a href="https://twitter.com/basil_js" class="textgrow menu-link">@basil_js</a></div>
3132
</div>
32-
<div class="fhnw-logo">
33+
<div class="sponsors-text">
34+
<p>Generously sponsored by</p>
35+
</div>
36+
<div class="logo">
3337
<a href="https://www.fhnw.ch/hgk/ivk"><img src="/assets/images/fhnwlogo.png" alt="FHNW logo and link"></a>
3438
</div>
39+
<div class="logo">
40+
<a href="https://www.netlify.com/"><img src="/assets/images/netlify-logo-light-simple.svg" alt="Netlify logo"></a>
41+
</div>
3542
</nav>
3643
</aside>

_source/assets/css/styles.scss

+45-41
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ css: true
44

55
* {
66
-webkit-box-sizing: border-box;
7-
box-sizing: border-box;
7+
box-sizing: border-box;
88
}
99

1010
@import "mixins";
@@ -16,8 +16,8 @@ css: true
1616
$textColor: #000;
1717
$bgColor: #fff;
1818
$headLineColor: #333;
19-
$guideOneColor: #9636FC;
20-
$guideTwoColor: #FF4EFF;
19+
$guideOneColor: #9636fc;
20+
$guideTwoColor: #ff4eff;
2121

2222
// Responsive Sizes
2323
$phone: 750px;
@@ -32,11 +32,10 @@ body {
3232
background-image: url("/assets/images/stripe_c40ccfac0db9e43c48e95a530d787366.png");
3333
}
3434

35-
3635
.wrapper {
3736
position: relative;
3837
-webkit-box-sizing: border-box;
39-
box-sizing: border-box;
38+
box-sizing: border-box;
4039
max-width: 1200px;
4140
width: 100%;
4241
margin: 25px auto 0px;
@@ -50,12 +49,11 @@ body {
5049
margin-top: 0px;
5150
}
5251

53-
5452
@include clearfix;
5553

5654
.logo {
5755
background-color: white;
58-
height: 130px;
56+
height: auto;
5957
width: 200px;
6058
margin-bottom: 30px;
6159

@@ -69,10 +67,9 @@ body {
6967
float: left;
7068

7169
.main-menu {
72-
7370
padding-bottom: 1em;
7471

75-
ul{
72+
ul {
7673
list-style: none;
7774
margin-left: 0;
7875
padding-left: 0;
@@ -98,7 +95,6 @@ body {
9895
padding-top: 150px;
9996
}
10097

101-
10298
a {
10399
padding-left: 25px;
104100
border: none;
@@ -142,27 +138,25 @@ body {
142138
padding-right: 25px;
143139
}
144140

145-
146141
@include media($phone) {
147142
float: none;
148143
width: 90%;
149144
margin: 0 auto 50px;
150145
}
151146

152-
#gallery-overview{
147+
#gallery-overview {
153148
display: flex;
154149
flex-wrap: wrap;
155150
align-content: flex-start;
156151
}
157-
.gallery-overview-item{
152+
.gallery-overview-item {
158153
max-width: 350px;
159154
margin-right: 1em;
160155
// flex-basis: 100px;
161156
flex-shrink: 0;
162-
163157
}
164158
@include media($phone) {
165-
.gallery-overview-item{
159+
.gallery-overview-item {
166160
max-width: 100%;
167161
}
168162
}
@@ -197,21 +191,20 @@ body {
197191
.gallery-overview-item-wrapper {
198192
width: 50%;
199193

200-
.gallery-overview-item{
201-
.heading-container{
194+
.gallery-overview-item {
195+
.heading-container {
202196
height: 4em;
203197
}
204198

205-
img.gallery-thumbnail{
199+
img.gallery-thumbnail {
206200
width: 256px;
207201
height: 144px;
208202
}
209-
210203
}
211-
212204
}
213205

214-
p.project-authors, p.project-description{
206+
p.project-authors,
207+
p.project-description {
215208
font-size: 1.2em;
216209
font-style: italic;
217210
}
@@ -225,7 +218,8 @@ p {
225218
}
226219
}
227220

228-
.fhnw-logo {
221+
.fhnw-logo,
222+
.sponsor-logo {
229223
// padding-left: 25px;
230224
a {
231225
img {
@@ -257,7 +251,7 @@ p {
257251
list-style-type: none;
258252
width: 30px;
259253
height: 1px;
260-
background-color: #2AFFFF;
254+
background-color: #2affff;
261255
position: absolute;
262256
margin-top: -1px;
263257
top: 50%;
@@ -267,19 +261,19 @@ p {
267261

268262
&:first-child {
269263
-webkit-transform: translateY(-10px) rotate(0deg);
270-
transform: translateY(-10px) rotate(0deg);
264+
transform: translateY(-10px) rotate(0deg);
271265
}
272266

273267
&:last-child {
274268
-webkit-transform: translateY(10px) rotate(0deg);
275-
transform: translateY(10px) rotate(0deg);
269+
transform: translateY(10px) rotate(0deg);
276270
}
277271
}
278272

279273
&.opened ul li {
280274
&:first-child {
281275
-webkit-transform: translate(0) rotate(45deg);
282-
transform: translate(0) rotate(45deg);
276+
transform: translate(0) rotate(45deg);
283277
}
284278

285279
&:nth-child(2) {
@@ -288,7 +282,7 @@ p {
288282

289283
&:last-child {
290284
-webkit-transform: translate(0) rotate(-45deg);
291-
transform: translate(0) rotate(-45deg);
285+
transform: translate(0) rotate(-45deg);
292286
}
293287
}
294288

@@ -302,22 +296,29 @@ img {
302296
width: 100%;
303297
}
304298

305-
h1, h2, strong {
299+
h1,
300+
h2,
301+
strong {
306302
color: $headLineColor;
307303
}
308304

309305
a {
310306
cursor: pointer;
311307
text-decoration: none;
312308
color: #000;
313-
border-bottom: 1px solid #9636FC;
309+
border-bottom: 1px solid #9636fc;
314310

315311
&:hover {
316312
background-image: url("/assets/images/stripe_c40ccfac0db9e43c48e95a530d787366.png");
317313
}
318314
}
319315

320-
h1, h2, h3, h4, h5, h6 {
316+
h1,
317+
h2,
318+
h3,
319+
h4,
320+
h5,
321+
h6 {
321322
text-decoration: underline;
322323
color: $headLineColor;
323324
}
@@ -417,8 +418,6 @@ pre {
417418
padding: 1.2em;
418419
}
419420

420-
421-
422421
//-------media queries
423422

424423
// @media only screen
@@ -449,17 +448,22 @@ pre {
449448
// @Son Please merge this so we don't have
450449
// double definitions
451450
.tweet {
452-
.message, .tweettime{
453-
font-size: 14px;
454-
padding-left: 25px;
455-
451+
font-size: 14px;
452+
padding-left: 25px;
453+
.message,
454+
.tweettime {
456455
}
457-
.message, .tweettime, .twitter-link{
458-
margin-bottom: 0.75em;
456+
.message,
457+
.tweettime,
458+
.twitter-link {
459459
}
460-
460+
margin-bottom: 0.75em;
461+
}
462+
.sponsors-text {
463+
font-size: 14px;
464+
padding-left: 25px;
465+
margin-bottom: 0.75em;
461466
}
462-
463467
a.textgrow {
464468
padding-left: 25px;
465469
border: none;
@@ -481,7 +485,7 @@ a.textgrow {
481485
height: auto;
482486
display: inline-block;
483487
font-weight: 700;
484-
span{
488+
span {
485489
// position: relative;
486490
// padding: 0px 4px;
487491
border-bottom: 1px solid $textColor;
Loading

0 commit comments

Comments
 (0)