finishing touches before launch

This commit is contained in:
elisejakob committed 2019-08-06 00:43:45 +02:00
1 parent b3f99b5b7c
commit 847efe57a8
5 files changed
+53 -66

No files matched your search

+6
View File
@@ -63,6 +63,12 @@
&-image {
padding-right: 0;
}
&-text {
p {
font-size: 1rem;
}
}
}
&-homepage {
+27 -2
View File
@@ -24,6 +24,10 @@ body {
&:focus {
outline-color: $color-orange;
}
@media (max-width: $media-s) {
line-height: 1.4;
}
}
main {
@@ -41,6 +45,7 @@ section {
a {
color: $color-link;
transition: all .1s ease-in-out;
&:hover {
color: $color-hover;
@@ -132,8 +137,8 @@ button, .button {
&-small {
display: inline-block;
width: auto;
padding: 0.3rem 1rem;
margin: .5rem auto;
padding: 0.24rem .6rem;
margin: .3rem auto 0;
color: $color-white;
background: $color-black;
border: none;
@@ -143,6 +148,26 @@ button, .button {
&:hover {
color: $color-white;
}
@media (max-width: $media-s) {
font-size: 1rem;
}
}
&-text {
display: inline-block;
width: auto;
padding: 0;
margin: 0 auto .8rem;
color: $color-black;
border: none;
border-bottom: .13em solid $color-black;
background: transparent;
font-size: 1rem;
line-height: 1;
&:hover {
color: $color-white;
border-color: $color-white;
}
}
}
+3
View File
@@ -87,6 +87,9 @@
width: 100%;
margin-left: 0;
margin-right: 0;
&-body {
font-size: 1rem;
}
&-content {
padding: 0 1rem;
}
+8 -40
View File
@@ -19,14 +19,14 @@
text-align: center;
}
h2, h3, p, ul, .button {
h2, h3, p, ul {
max-width: $width-m;
margin: 0 auto 1rem;
}
.section-title {
font-weight: 700;
font-size: 1.5rem;
font-size: 2.6rem;
text-transform: uppercase;
letter-spacing: 0.03em;
line-height: 1.1;
@@ -46,42 +46,13 @@
.visit-us {
background: $color-green;
&_links {
margin: 0 auto;
}
.button {
color: $color-green;
&:hover {
color: $color-white;
}
}
label, input {
display: block;
width: 100%;
}
}
.opening-hours {
width: 100%;
&_venue {
font-weight: 700;
text-transform: uppercase;
letter-spacing: 0.03em;
line-height: 1.1;
}
ul {
list-style: none;
padding: 0;
font-size: $font-s;
li {
margin-bottom: 1rem;
}
ul {
display: block;
margin: 0 auto;
li {
width: 100%;
margin-bottom: 0;
}
color: white;
}
}
}
@@ -92,14 +63,10 @@
flex-direction: column;
justify-content: center;
.section-title {
font-size: 2.6rem;
}
.button {
color: $color-yellow;
&:hover {
color: $color-white;
color: white;
}
}
}
@@ -107,6 +74,7 @@
@media (max-width: $media-s) {
.front-page-info {
display: block;
font-size: 1rem;
> div {
width: 100%;
}
+9 -24
View File
@@ -22,30 +22,15 @@ export default class IndexPage extends React.Component {
/>
<section className="front-page-info">
<div className="visit-us">
<div className="inner">
<h2 className="section-title">Besøk oss</h2>
<div className="address">
<p>Vi holder til på Majorstua, i Slemdalsveien 15.</p>
<a href="https://www.google.no/maps/place/Slemdalsveien+15,+0369+Oslo/data=!4m2!3m1!1s0x46416dc4ab53aa7d:0x5629681f36c1c8af?sa=X&ved=2ahUKEwjR94re3unjAhUj4aYKHRLOAuwQ8gEwAHoECBQQAQ" target="_blank" className="button button-small">Se i Google Maps</a>
</div>
<div className="opening-hours">
<ul>
<li>
<span class="opening-hours_venue">Glassbaren</span>
<ul>
<li>Mandag–lørdag: 14:00–00:00</li>
</ul>
</li>
<li>
<span class="opening-hours_venue">Bokcaféen</span>
<ul>
<li>Mandag–torsdag: 19:00–00:00</li>
<li>Fredag: 20:00–03:00</li>
</ul>
</li>
</ul>
<a href="#" className="button button-small">Se alle åpningstider</a>
</div>
<h2 className="section-title">Besøk oss</h2>
<p>Chateau Neuf ligger på Majorstua i Oslo, i <a href="https://www.google.no/maps/place/Slemdalsveien+15,+0369+Oslo/data=!4m2!3m1!1s0x46416dc4ab53aa7d:0x5629681f36c1c8af?sa=X&ved=2ahUKEwjR94re3unjAhUj4aYKHRLOAuwQ8gEwAHoECBQQAQ" target="_blank">Slemdalsveien 15</a>.</p>
<div className="visit-us_links">
<Link to="/bli-aktiv/" className="button button-small">
Praktisk informasjon
</Link><br />
<Link to="/bli-aktiv/" className="button button-small">
Åpningstider
</Link>
</div>
</div>
<div className="volunteer">