Skip to content

Commit

Permalink
Merge branch 'master' into phonenumber-fix
Browse files Browse the repository at this point in the history
  • Loading branch information
fionera authored Jun 28, 2018
2 parents 503481e + 4cde606 commit fd4c345
Show file tree
Hide file tree
Showing 83 changed files with 1,754 additions and 815 deletions.
35 changes: 35 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
---
name: Bug report
about: Create a report to help us improve

---

**Describe the bug**
A clear and concise description of what the bug is.

**To Reproduce**
Steps to reproduce the behavior:
1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
4. See error

**Expected behavior**
A clear and concise description of what you expected to happen.

**Screenshots**
If applicable, add screenshots to help explain your problem.

**Desktop (please complete the following information):**
- OS: [e.g. iOS]
- Browser [e.g. chrome, safari]
- Version [e.g. 22]

**Smartphone (please complete the following information):**
- Device: [e.g. iPhone6]
- OS: [e.g. iOS8.1]
- Browser [e.g. stock browser, safari]
- Version [e.g. 22]

**Additional context**
Add any other context about the problem here.
17 changes: 17 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
---
name: Feature request
about: Suggest an idea for this project

---

**Is your feature request related to a problem? Please describe.**
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]

**Describe the solution you'd like**
A clear and concise description of what you want to happen.

**Describe alternatives you've considered**
A clear and concise description of any alternative solutions or features you've considered.

**Additional context**
Add any other context or screenshots about the feature request here.
9 changes: 6 additions & 3 deletions assets/css/_raleway.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,24 @@
font-style: normal;
font-weight: 300;
src: local('Raleway Light'), local('Raleway-Light'), url('../fonts/Raleway-Thin.ttf') format('ttf');
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC,
U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
}

@font-face {
font-family: 'Raleway';
font-style: normal;
font-weight: 400;
src: local('Raleway'), local('Raleway-Regular'), url('../fonts/Raleway-Regular.ttf') format('ttf');
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC,
U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
}

@font-face {
font-family: 'Raleway';
font-style: normal;
font-weight: 300;
src: local('Raleway Light'), local('Raleway-Bold'), url('../fonts/Raleway-Bold.ttf') format('ttf');
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC,
U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
}
39 changes: 26 additions & 13 deletions assets/css/_shared.scss
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
@import "variables";
@import "shared/langpicker";
@import "shared/sharebuttons";
@import "shared/footer";
@import "shared/typewriter";
@import "shared/video-player";
@import "shared/navigation";
@import 'shared/langpicker';
@import 'shared/sharebuttons';
@import 'shared/footer';
@import 'shared/video-player';
@import 'shared/navigation';

html {
height: 100vh;
Expand Down Expand Up @@ -87,15 +85,30 @@ h6 {
flex-grow: 1;
}


.label {
color: white;
padding: 6px;
border-radius: 13px;
}

.success {background-color: #4CAF50;} /* Green */
.info {background-color: #2196F3;} /* Blue */
.warning {background-color: #ff9800;} /* Orange */
.danger {background-color: #f44336;} /* Red */
.other {background-color: #e7e7e7; color: black;} /* Gray */
.success {
background-color: #4caf50;
} /* Green */
.info {
background-color: #2196f3;
} /* Blue */
.warning {
background-color: #ff9800;
} /* Orange */
.danger {
background-color: #f44336;
} /* Red */
.other {
background-color: #e7e7e7;
color: black;
} /* Gray */

/* Bootstrap-like */
.mt-3 {
margin-top: 3em;
}
16 changes: 8 additions & 8 deletions assets/css/_variables.scss
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
@import "~bootstrap/scss/bootstrap-grid";
@import '~bootstrap/scss/bootstrap-grid';

// nav implementation
@import "~bootstrap/scss/mixins/_hover";
@import "~bootstrap/scss/mixins/_border-radius";
@import "~bootstrap/scss/_nav";
@import "~bootstrap/scss/utilities/_position";
@import "~bootstrap/scss/mixins/_grid-framework";
@import '~bootstrap/scss/mixins/_hover';
@import '~bootstrap/scss/mixins/_border-radius';
@import '~bootstrap/scss/_nav';
@import '~bootstrap/scss/utilities/_position';
@import '~bootstrap/scss/mixins/_grid-framework';

@import "raleway";
@import 'raleway';

$background: #12233f;
$text: #fafafa;
$accent1: #ffbf00;
$accent2: #142E4D;
$accent2: #142e4d;
$accent3: #b9d6f2;

$text_invert: $background;
Expand Down
46 changes: 36 additions & 10 deletions assets/css/app.scss
Original file line number Diff line number Diff line change
@@ -1,12 +1,38 @@
@import "_variables";
@import "_shared";
@import "~flag-icon-css/sass/flag-icon";
@import "~font-awesome/scss/font-awesome";
@import '_variables';
@import '_shared';
@import '~flag-icon-css/sass/flag-icon';
//@import "~font-awesome/scss/font-awesome";

@import '~font-awesome/scss/variables';
@import '~font-awesome/scss/core';
@import '~font-awesome/scss/path';
//@import "~font-awesome/scss/icons";
.#{$fa-css-prefix}-facebook-square:before {
content: $fa-var-facebook-square;
}
.#{$fa-css-prefix}-share-square:before {
content: $fa-var-share-square;
}
.#{$fa-css-prefix}-twitter:before {
content: $fa-var-twitter;
}
.#{$fa-css-prefix}-twitter-square:before {
content: $fa-var-twitter-square;
}
.#{$fa-css-prefix}-google-plus-square:before {
content: $fa-var-google-plus-square;
}
.#{$fa-css-prefix}-instagram:before {
content: $fa-var-instagram;
}
.#{$fa-css-prefix}-envelope:before {
content: $fa-var-envelope;
}

// PAGES
@import "/pages/landing";
@import "pages/responsive-video";
@import "pages/imprint";
@import "pages/gallery";
@import "pages/about";
@import "pages/mep";
@import 'pages/landing';
//@import "pages/responsive-video";
@import 'pages/imprint';
@import 'pages/gallery';
@import 'pages/about';
@import 'pages/mep';
29 changes: 29 additions & 0 deletions assets/css/easteregg.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
* {
cursor: url(./img/easteregg/schmusercursor.png), auto !important;
}

img {
content: url('./img/easteregg/neigschaut.png');
}

.header-wrapper .header .title-wrapper {
background-color: transparent !important;
}

.title-wrapper {
content: url('./img/easteregg/banner.png') !important;
}

#particleCanvas {
pointer-events: none;
z-index: 99;
position: fixed;
margin: auto;
left: 0;
right: 0;
top: 0;
bottom: 0;
width: 100%;
height: 100%;
//background: rgba(30, 30, 50, 1);
}
6 changes: 3 additions & 3 deletions assets/css/pages/about.scss
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
.about-heading{
.about-heading {
font-size: 26px;
margin-top: 0;
margin-bottom: 7px;
}
p.about-text{
p.about-text {
font-style: italic;

a {
color: $accent1;
}
a:hover{
a:hover {
color: $text;
}
}
19 changes: 11 additions & 8 deletions assets/css/pages/gallery.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.section-gallery{
.section-gallery {
.title {
margin: 0;
font-size: 3.4em;
Expand All @@ -9,7 +9,8 @@
}
}
.gallery-grid {
.gallery, .grid-sizer {
.gallery,
.grid-sizer {
width: 20%;
}
.gallery {
Expand All @@ -34,7 +35,7 @@
}
}

.flag-icon{
.flag-icon {
position: absolute;
top: 5px;
right: 5px;
Expand All @@ -49,11 +50,11 @@
}
}


@media all and (max-width: 1200px) {
.section-gallery{
.section-gallery {
.gallery-grid {
.grid-sizer, .gallery {
.grid-sizer,
.gallery {
width: 30%;
}
}
Expand All @@ -63,7 +64,8 @@
@media all and (max-width: 768px) {
.section-gallery {
.gallery-grid {
.grid-sizer, .gallery {
.grid-sizer,
.gallery {
width: 47%;
}
}
Expand All @@ -73,7 +75,8 @@
@media all and (max-width: 462px) {
.section-gallery {
.gallery-grid {
.grid-sizer, .gallery {
.grid-sizer,
.gallery {
width: 100%;
}
}
Expand Down
2 changes: 1 addition & 1 deletion assets/css/pages/imprint.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
}

.imprint-eu-link:hover {
color: #FFF;
color: #fff;
text-decoration: none;
}
20 changes: 10 additions & 10 deletions assets/css/pages/landing.scss
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
@import "landing/header";
@import "landing/article-thirteen";
@import "landing/what-do";
@import "landing/graphic-box";
@import "landing/countdown";
@import "landing/image-split";
@import "landing/petition";
@import "landing/video";
@import "landing/twitter-feed";
@import "landing/map";
@import 'landing/header';
@import 'landing/article-thirteen';
@import 'landing/what-do';
@import 'landing/graphic-box';
@import 'landing/countdown';
@import 'landing/image-split';
@import 'landing/petition';
@import 'landing/video';
@import 'landing/twitter-feed';
@import 'landing/map';
2 changes: 0 additions & 2 deletions assets/css/pages/landing/article-thirteen.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
@import "../../variables";

.section-article-thirteen {
margin-top: $vertical-space;
padding-bottom: 5rem;
Expand Down
Loading

0 comments on commit fd4c345

Please sign in to comment.