diff options
Diffstat (limited to 'blog')
-rw-r--r-- | blog/_assets/stylesheets/_config.scss | 4 | ||||
-rw-r--r-- | blog/_assets/stylesheets/main.scss | 24 | ||||
-rw-r--r-- | blog/_includes/news.html | 6 | ||||
-rw-r--r-- | blog/_includes/sponsors.html | 94 | ||||
-rw-r--r-- | blog/_layouts/default.html | 7 | ||||
-rw-r--r-- | blog/_layouts/homepage.html | 28 | ||||
-rw-r--r-- | blog/index.html | 13 |
7 files changed, 109 insertions, 67 deletions
diff --git a/blog/_assets/stylesheets/_config.scss b/blog/_assets/stylesheets/_config.scss index 8477f0a..c8b5066 100644 --- a/blog/_assets/stylesheets/_config.scss +++ b/blog/_assets/stylesheets/_config.scss @@ -1,5 +1,5 @@ -$body-bg: black; -$text-color: #aaa; +$body-bg: rgba(0, 0, 0, 0.4); +$text-color: #acbed5; $heading-color: #3379BF; $dimmed-text-color: darken($text-color, 20%); $link-color: #93A2B1; //#686; diff --git a/blog/_assets/stylesheets/main.scss b/blog/_assets/stylesheets/main.scss index 16deaf6..0923299 100644 --- a/blog/_assets/stylesheets/main.scss +++ b/blog/_assets/stylesheets/main.scss @@ -14,6 +14,7 @@ body { background: { image: image_url("background.jpg"); repeat: no-repeat; + attachment: fixed; position: center top; color: black; } @@ -34,6 +35,10 @@ h1 { font-size: 20pt; } +strong { + color: $dimmed-text-color; +} + #page-container { position: relative; width: 28cm; @@ -56,6 +61,8 @@ h1 { min-height: 700px; padding: 1cm; + font-size: 16pt; + background-color: $body-bg; @include round-corners; @@ -88,10 +95,18 @@ h1 { #sponsor-pos-1, #sponsor-pos-2 { text-align: center; + margin: { + left: auto; + right: auto; + } + height: 500px; + width: 3*(250px + 4mm); .sponsor-logos { + float: left; + width: 250px; + display: inline-block; .logo { - display: inline-block; - width: 250px; + display: block; vertical-align: middle; img { vertical-align: middle; @@ -102,5 +117,10 @@ h1 { background-color: $nav-link-hover-bg; } } + &:after { + content: "."; + visibility: hidden; + clear: both; + } } } diff --git a/blog/_includes/news.html b/blog/_includes/news.html new file mode 100644 index 0000000..f7983da --- /dev/null +++ b/blog/_includes/news.html @@ -0,0 +1,6 @@ +<section id="news"> + <h2>{% t home.latest_news %}</h2> + {% for p in site.posts limit: 5 %} + {% include post-excerpt.html post=p %} + {% endfor %} +</section> diff --git a/blog/_includes/sponsors.html b/blog/_includes/sponsors.html index 433ac1a..b63d497 100644 --- a/blog/_includes/sponsors.html +++ b/blog/_includes/sponsors.html @@ -1,44 +1,50 @@ -<div class="sponsor-logos large"> - <span class="logo"> - <a href="http://ds-media.no"> - {% image "2014/sponsors/ds_banner_2014.jpg" alt="DS-Media" %} - </a> - </span> - <span class="logo"> - <a href="http://trineogkim.no/"> - {% image "logos/tkds_logo.png" alt="Trine og Kim Design Studio" %} - </a> - </span> - <span class="logo"> - <a href="http://negativevibe.net"> - {% image logos/nvr_logo_web_430.png alt="Negative Vibe Records" [resize:224x] %} - </a> - </span> -</div> -<div class="sponsor-logos"> - <span class="logo"> - <a href="http://www.symphonium.no/"> - {% image "2014/sponsors/Symphonium_2014.png" alt="Symphonium Metal Radio" %} - </a> - </span> - <span class="logo"> - <a href="http://heavymetal.no"> - {% image "logos/hmno_logo.png" alt="Heavymetal.no" [resize:224x] %} - </a> - </span> - <span class="logo"> - <a href="http://www.eternal-terror.com"> - {% image "logos/ET_logo_2.png" alt="Eternal-Terror Webzine" [resize:224x] %} - </a> - </span> - <span class="logo"> - <a href="http://www.fotograf-lovberg.no/"> - {% image "2014/sponsors/fotograf-lovberg_2014.png" alt="Fotograf Løvberg" %} - </a> - </span> - <span class="logo"> - <a href="http://turbine.no/"> - {% image "2014/sponsors/turbine_2014.png" alt="Turbine Agency" %} - </a> - </span> -</div> +<section id="sponsor-pos-1"> + <h1>Våre sponsorer</h1> + + <div class="sponsor-logos large"> + <span class="logo"> + <a href="http://ds-media.no"> + {% image "2014/sponsors/ds_banner_2014.jpg" alt="DS-Media" %} + </a> + </span> + </div> + <div class="sponsor-logos large"> + <span class="logo"> + <a href="http://trineogkim.no/"> + {% image "logos/tkds_logo.png" alt="Trine og Kim Design Studio" %} + </a> + </span> + <span class="logo"> + <a href="http://negativevibe.net"> + {% image logos/nvr_logo_web_430.png alt="Negative Vibe Records" [resize:224x] %} + </a> + </span> + <span class="logo"> + <a href="http://www.symphonium.no/"> + {% image "2014/sponsors/Symphonium_2014.png" alt="Symphonium Metal Radio" %} + </a> + </span> + </div> + <div class="sponsor-logos"> + <span class="logo"> + <a href="http://heavymetal.no"> + {% image "logos/hmno_logo.png" alt="Heavymetal.no" [resize:224x] %} + </a> + </span> + <span class="logo"> + <a href="http://www.eternal-terror.com"> + {% image "logos/ET_logo_2.png" alt="Eternal-Terror Webzine" [resize:224x] %} + </a> + </span> + <span class="logo"> + <a href="http://www.fotograf-lovberg.no/"> + {% image "2014/sponsors/fotograf-lovberg_2014.png" alt="Fotograf Løvberg" %} + </a> + </span> + <span class="logo"> + <a href="http://turbine.no/"> + {% image "2014/sponsors/turbine_2014.png" alt="Turbine Agency" %} + </a> + </span> + </div> +</section> diff --git a/blog/_layouts/default.html b/blog/_layouts/default.html index 676adb1..2daf763 100644 --- a/blog/_layouts/default.html +++ b/blog/_layouts/default.html @@ -11,11 +11,8 @@ {{ content }} </section> <section id="side-body"> - <h2>{% t global.our_sponsors %}</h2> - <section id="sponsor-pos-1"> - {% include sponsors.html %} - </section> - + {% include news.html %} + {% if site.links %} <section id="links"> <h2>{% t home.links %}</h2> diff --git a/blog/_layouts/homepage.html b/blog/_layouts/homepage.html index 0d6905d..a5e15a0 100644 --- a/blog/_layouts/homepage.html +++ b/blog/_layouts/homepage.html @@ -1,3 +1,25 @@ ---- -layout: default ---- +<!DOCTYPE html> +<html> + {% include head.html %} + <body> + <div id="page-container"> + {% include header.html %} + + <section id="page"> + <section id="body-content"> + {{ content }} + + {% include news.html %} + + {% if site.links %} + <section id="links"> + <h2>{% t home.links %}</h2> + </section> + {% endif %} + </section> + </section> + + {% include footer.html %} + </div> + </body> +</html> diff --git a/blog/index.html b/blog/index.html index 20865df..a2f4a3a 100644 --- a/blog/index.html +++ b/blog/index.html @@ -1,15 +1,6 @@ --- -layout: default +layout: homepage --- -{% image 2016/poster_norsk_urskog_15_mars.jpg class="right" [resize:300x] %} {% tf home/intro.md %} - -<h2>{% t home.latest_news %}</h2> -<section id="news"> - {% for p in paginator.posts %} - {% include post-excerpt.html post=p %} - {% endfor %} - - {% include pagination.html %} -</section> +{% include sponsors.html %} |