Skip to content

Commit

Permalink
Merge pull request #31 from sledilnik/optimisations
Browse files Browse the repository at this point in the history 
Optimisations
  • Loading branch information
@luka-medic
luka-medic authored Dec 25, 2020
2 parents 4453234 + 9ffbedf commit 437c655
Show file tree
Hide file tree
Showing 6 changed files with 76 additions and 370 deletions.
332 changes: 1 addition & 331 deletions img/shareQRcode.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified img/spark-illustration.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed img/[email protected]
View file
Binary file not shown.
40 changes: 25 additions & 15 deletions index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,17 +82,28 @@
<section id="plan">
<!--<h2 class="title section-title is-2">Kako lahko pomagam?</h2>
<h3 class="subtitle is-size-4">Povežimo se med člani družine, prijatelji in znanci<br>s hitrim in učinkovitim medsebojnim SMS obveščanjem. Tako lahko<br>virus s poslanim ali prejetim SMS-om zajezimo že sami.</h3>-->
<br>
<p>Za vas sestavimo SMS, s katerim boste pripomogli k obvladovanju virusa.</p>
<h2 class="title section-title is-2">Kako pomagaš ti?</h2>
<p>Preprosto. Ob morebitni nevarnosti prenosa okužbe s SARS-CoV-2 se s prijatelji in znanci poveži s SMS-ji.</p>
<br>
<p>Obveščajmo se. Na ta način bomo spletli mrežo ljudi in vzeli nadzor nad virusom v svoje roke.</p>
<p><a href="https://medium.com/sledilnik/spark-prekinimo-verige-prenosov-9c2008e357cc">Preberi več</a></p>

<img src="img/spark-illustration.png" alt="Ilustracija SPARK">

<h2 class="title section-title is-2">Preveri in izberi:</h2>

<div class="basicInfo">
<p>Za vas sestavimo SMS, s katerim boste pripomogli k obvladovanju virusa.</p>
</div>
<div class="titleContainer">
<h2 class="title section-title is-2">Kako pomagaš ti?</h2>
</div>
<div class="basicInfo" >
<p>Preprosto. Ob morebitni nevarnosti prenosa okužbe s SARS-CoV-2 se s prijatelji in znanci poveži s SMS-ji.</p>
</div>
<div class="basicInfo">
<p>Obveščajmo se. Na ta način bomo spletli mrežo ljudi in vzeli nadzor nad virusom v svoje roke.</p>
<div class="readMore">
<p><a href="https://medium.com/sledilnik/spark-prekinimo-verige-prenosov-9c2008e357cc">Preberi več</a></p>
</div>
</div>
<div class="sparkImg">
<img src="img/spark-illustration.png" alt="Ilustracija SPARK">
</div>
<div class="titleContainer">
<h2 class="title section-title is-2">Preveri in izberi:</h2>
</div>
<div class="instruction">
<p>Preveri, ali zate velja katera izmed predvidenih situacij. Če velja, sledi navodilom.</p>
</div>
Expand Down Expand Up @@ -183,11 +194,10 @@ <h2 class="title section-title is-2">Kaj je Covid-SPARK?</h2>
<img src="img/friends.png" alt="Prijatelji">
</div>
</div>
</section id="disclaimer" class="disclaimer">
<h2 class="title section-title is-2"></h2>
<a href="other.html#anonymity">Uporaba spletne strani je anonimna.</a>
<section>
</section>

<section class="disclaimer">
<a href="other.html#anonymity">Uporaba spletne strani je anonimna.</a>
</section>
</div>
</div>
Expand Down
4 changes: 3 additions & 1 deletion other.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,9 @@ <h2 class="title section-title is-2">Pogosta vprašanja in odgovori</h2>
</section>

<section id="contact">
<h2 class="title section-title is-2">Kontakt</h2>
<div class="titleContainer">
<h2 class="title section-title is-2">Kontakt</h2>
</div>
<p>Projekt Covid-SPARK za boj proti virusu SARS-CoV-2 je razvila in podprla skupnost <a href="https://covid-19.sledilnik.org/sl/about">Sledilnik</a>.</p>
<p>Vprašanja in predloge lahko pošljete na: <a href="mailto:[email protected]">[email protected]</a> ali <a href="mailto:[email protected]">[email protected]</a></p>
</section>
Expand Down
70 changes: 47 additions & 23 deletions styles/main.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -248,21 +248,6 @@ body{
margin-top: 42px;
}

.hero .title {
margin-top: 0;
margin-bottom: 0;
}

.hero .subtitle {
color: #bbbbbb;
margin-top: 0;
margin-bottom: 10px;
}

.hero .subtitle {
margin-top: 15px !important;
}

.section-title::before {
content: "";
display: block;
Expand All @@ -274,6 +259,14 @@ body{
margin-top: 45px;
}

.titleContainer {
margin-bottom: 24px;
}

.basicInfo {
margin-top: 10px;
}

.spark-cases .case .description::after {
content: "▷";
position: absolute;
Expand Down Expand Up @@ -341,21 +334,17 @@ body{
}

.thanks {
font-size: 1rem;
padding-top: 15px;
margin-bottom: 40px;
}

.instruction {
font-size: 1rem;
padding-bottom: 15px;
margin-bottom: 2px;
}

.disclaimer {
font-size: 1rem;
padding-bottom: 15px;
margin-bottom: 2px;
margin-top: 40px;
}

.instructionSteps ol {
Expand Down Expand Up @@ -430,6 +419,14 @@ body{
margin-bottom: 15px;
}

.readMore {
font-size: .9rem;
}

.sparkImg {
margin-top: 15px;
}

footer {
background-color: #ddd;
padding: 60px;
Expand All @@ -448,13 +445,15 @@ footer {
margin-top: 42px;
padding: 0px 0px;
}
.titleContainer {
margin-bottom: 15px;
}
.title {
margin-top: 15px;
font-size: 2rem !important;
}
.subtitle {
margin-top: 15px;
font-size: 0.9rem !important;
}
.navbar .container {
margin: 0;
Expand All @@ -468,15 +467,40 @@ footer {
.about {
margin-top: 42px;
}
.disclaimer {
margin-top: 15px;
}
}

@media only screen and (max-width: 360px) {
.hero {
background-color: white;
margin-top: 42px;
padding: 0px 0px;
}
.titleContainer {
margin-bottom: 15px;
}
.title {
margin-top: 1.6rem;
margin-top: 15px;
font-size: 1.8rem !important;
}
.subtitle {
margin-top: 15px;
font-size: 0.8rem !important;
}
.navbar .container {
margin: 0;
}
.container {
margin: 0 15px;
}
.spark-cases .case .description {
padding-right: 45px;
}
.about {
margin-top: 42px;
}
.disclaimer {
margin-top: 15px;
}
}

0 comments on commit 437c655

Please sign in to comment.