Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 22 additions & 26 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,27 +1,23 @@
module.exports = {
extends: [
'unobtrusive',
'eslint:recommended'
],
plugins: ['babel'],
env: {
browser: true,
node: true,
},
globals: {
},
rules: {
semi: [2, 'always'],
quotes: [2, 'single'],
indent: [2, 2],
'linebreak-style': [2, 'unix'],
'brace-style': [2, '1tbs'],
'array-bracket-spacing': [2, 'never'],
camelcase: [2, {properties: 'always'}],
'keyword-spacing': [2],
'eol-last': [2],
'no-trailing-spaces': [2],
'no-process-env': ['off', 'always'],
'no-console': ['off','always']
}
};
extends: ["unobtrusive", "eslint:recommended"],
plugins: ["babel"],
env: {
browser: true,
node: true
},
globals: {},
rules: {
semi: [2, "always"],
quotes: [2, "double"],
indent: [2, 2],
"linebreak-style": [2, "unix"],
"brace-style": [2, "1tbs"],
"array-bracket-spacing": [2, "never"],
camelcase: [2, { properties: "always" }],
"keyword-spacing": [2],
"eol-last": [2],
"no-trailing-spaces": [2],
"no-process-env": ["off", "always"],
"no-console": ["off", "always"]
}
};
9 changes: 8 additions & 1 deletion _source/_includes/aside-left.html
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,19 @@

</ul>
<div class="tweet">
<p>Latest Tweets:</p>
<div class="message"></div>
<div class="tweettime"></div>
<div class="twitter-link"><a href="https://twitter.com/basil_js" class="textgrow menu-link">@basil_js</a></div>
</div>
<div class="fhnw-logo">
<div class="sponsors-text">
<p>Generously sponsored by</p>
</div>
<div class="logo">
<a href="https://www.fhnw.ch/hgk/ivk"><img src="/assets/images/fhnwlogo.png" alt="FHNW logo and link"></a>
</div>
<div class="logo">
<a href="https://www.netlify.com/"><img src="/assets/images/netlify-logo-light-simple.svg" alt="Netlify logo"></a>
</div>
</nav>
</aside>
86 changes: 45 additions & 41 deletions _source/assets/css/styles.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ css: true

* {
-webkit-box-sizing: border-box;
box-sizing: border-box;
box-sizing: border-box;
}

@import "mixins";
Expand All @@ -16,8 +16,8 @@ css: true
$textColor: #000;
$bgColor: #fff;
$headLineColor: #333;
$guideOneColor: #9636FC;
$guideTwoColor: #FF4EFF;
$guideOneColor: #9636fc;
$guideTwoColor: #ff4eff;

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


.wrapper {
position: relative;
-webkit-box-sizing: border-box;
box-sizing: border-box;
box-sizing: border-box;
max-width: 1200px;
width: 100%;
margin: 25px auto 0px;
Expand All @@ -50,12 +49,11 @@ body {
margin-top: 0px;
}


@include clearfix;

.logo {
background-color: white;
height: 130px;
height: auto;
width: 200px;
margin-bottom: 30px;

Expand All @@ -69,10 +67,9 @@ body {
float: left;

.main-menu {

padding-bottom: 1em;

ul{
ul {
list-style: none;
margin-left: 0;
padding-left: 0;
Expand All @@ -98,7 +95,6 @@ body {
padding-top: 150px;
}


a {
padding-left: 25px;
border: none;
Expand Down Expand Up @@ -142,27 +138,25 @@ body {
padding-right: 25px;
}


@include media($phone) {
float: none;
width: 90%;
margin: 0 auto 50px;
}

#gallery-overview{
#gallery-overview {
display: flex;
flex-wrap: wrap;
align-content: flex-start;
}
.gallery-overview-item{
.gallery-overview-item {
max-width: 350px;
margin-right: 1em;
// flex-basis: 100px;
flex-shrink: 0;

}
@include media($phone) {
.gallery-overview-item{
.gallery-overview-item {
max-width: 100%;
}
}
Expand Down Expand Up @@ -197,21 +191,20 @@ body {
.gallery-overview-item-wrapper {
width: 50%;

.gallery-overview-item{
.heading-container{
.gallery-overview-item {
.heading-container {
height: 4em;
}

img.gallery-thumbnail{
img.gallery-thumbnail {
width: 256px;
height: 144px;
}

}

}

p.project-authors, p.project-description{
p.project-authors,
p.project-description {
font-size: 1.2em;
font-style: italic;
}
Expand All @@ -225,7 +218,8 @@ p {
}
}

.fhnw-logo {
.fhnw-logo,
.sponsor-logo {
// padding-left: 25px;
a {
img {
Expand Down Expand Up @@ -257,7 +251,7 @@ p {
list-style-type: none;
width: 30px;
height: 1px;
background-color: #2AFFFF;
background-color: #2affff;
position: absolute;
margin-top: -1px;
top: 50%;
Expand All @@ -267,19 +261,19 @@ p {

&:first-child {
-webkit-transform: translateY(-10px) rotate(0deg);
transform: translateY(-10px) rotate(0deg);
transform: translateY(-10px) rotate(0deg);
}

&:last-child {
-webkit-transform: translateY(10px) rotate(0deg);
transform: translateY(10px) rotate(0deg);
transform: translateY(10px) rotate(0deg);
}
}

&.opened ul li {
&:first-child {
-webkit-transform: translate(0) rotate(45deg);
transform: translate(0) rotate(45deg);
transform: translate(0) rotate(45deg);
}

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

&:last-child {
-webkit-transform: translate(0) rotate(-45deg);
transform: translate(0) rotate(-45deg);
transform: translate(0) rotate(-45deg);
}
}

Expand All @@ -302,22 +296,29 @@ img {
width: 100%;
}

h1, h2, strong {
h1,
h2,
strong {
color: $headLineColor;
}

a {
cursor: pointer;
text-decoration: none;
color: #000;
border-bottom: 1px solid #9636FC;
border-bottom: 1px solid #9636fc;

&:hover {
background-image: url("/assets/images/stripe_c40ccfac0db9e43c48e95a530d787366.png");
}
}

h1, h2, h3, h4, h5, h6 {
h1,
h2,
h3,
h4,
h5,
h6 {
text-decoration: underline;
color: $headLineColor;
}
Expand Down Expand Up @@ -417,8 +418,6 @@ pre {
padding: 1.2em;
}



//-------media queries

// @media only screen
Expand Down Expand Up @@ -449,17 +448,22 @@ pre {
// @Son Please merge this so we don't have
// double definitions
.tweet {
.message, .tweettime{
font-size: 14px;
padding-left: 25px;

font-size: 14px;
padding-left: 25px;
.message,
.tweettime {
}
.message, .tweettime, .twitter-link{
margin-bottom: 0.75em;
.message,
.tweettime,
.twitter-link {
}

margin-bottom: 0.75em;
}
.sponsors-text {
font-size: 14px;
padding-left: 25px;
margin-bottom: 0.75em;
}

a.textgrow {
padding-left: 25px;
border: none;
Expand All @@ -481,7 +485,7 @@ a.textgrow {
height: auto;
display: inline-block;
font-weight: 700;
span{
span {
// position: relative;
// padding: 0px 4px;
border-bottom: 1px solid $textColor;
Expand Down
6 changes: 6 additions & 0 deletions _source/assets/images/netlify-logo-light-simple.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading