Merge remote-tracking branch 'rico/new-design' into new-design

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --cc src/sass/main.sass
index 7e40bea8adeb8a608d1e5c779ee0b8ad8c03bc5b,d230cdcae32274d7b1a0788303c075fb7ca01b5f..524e7a004f836c42cb55ac2297a6844ec73ccb8b
--- 1/src/sass/main.sass
--- 2/src/sass/main.sass
+++ b/src/sass/main.sass
@@@ -60,8 -61,8 +61,14 @@@ $section-padding-desktop:       3rem 0.
  
  // Custom CSS
  
+ #hero-index
+     background-image: url("img/bg-img.jpg");
+     background-position: center;
+     background-repeat: no-repeat;
+     background-size: cover;
++
 +.footer
 +      a
 +              color: $grey
 +              &:hover
 +                      color: $black

diff --cc src/templates/blog/index.html
index e5bf7b2188ea34e0607fc16369932307e3fea7dc,b15f091c128a81c57fabd5ad78618b817a386d3d..9393a96a0427fba7fed6b41bb8e3ff7b24fdfb45
--- 1/src/templates/blog/index.html
--- 2/src/templates/blog/index.html
+++ b/src/templates/blog/index.html
@@@ -33,18 -40,10 +33,18 @@@
                                        {% if latest_post %}
                                                <div class="notification is-primary">
                                                        <h4 class="title is-4">
 -                                                              <a href="/blog/{{ latest_post.slug }}">Latest: {{ latest_post.title }}</a>
 +                                                              <a href="/blog/{{ latest_post.slug }}">
-                                                                       {{ latest_post.title }}
++                                                                      Latest: {{ latest_post.title }}
 +                                                              </a>
                                                        </h4>
 -                                                      {{ latest_post.excerpt }}
 -                                                      <a href="/blog/{{ latest_post.slug }}">Read more</a>
 +
 +                                                      <div class="content">
 +                                                              {{ latest_post.excerpt }}
 +                                                      </div>
 +
 +                                                      <p>
 +                                                              <a href="/blog/{{ latest_post.slug }}">Read more</a>
 +                                                      </p>
                                                </div>
                                        {% end %}
  

diff --cc src/templates/index.html
Simple merge

diff --cc src/templates/static/about.html
Simple merge