From 20f2b8638ffcb7d30d076253ad977639edc2a2d3 Mon Sep 17 00:00:00 2001 From: Harald Eilertsen Date: Mon, 18 Feb 2019 21:09:32 +0100 Subject: =?UTF-8?q?Kosmetiske=20fikser,=20legg=20sponsorene=20i=20en=20rad?= =?UTF-8?q?=20til=20h=C3=B8yre=20igjen.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- blog/_assets/stylesheets/_config.scss | 4 +- blog/_assets/stylesheets/_navbar.scss | 1 - blog/_assets/stylesheets/main.scss | 70 ++++++----------------------------- blog/_layouts/homepage.html | 4 +- 4 files changed, 16 insertions(+), 63 deletions(-) diff --git a/blog/_assets/stylesheets/_config.scss b/blog/_assets/stylesheets/_config.scss index 77d3c8b..ad00820 100644 --- a/blog/_assets/stylesheets/_config.scss +++ b/blog/_assets/stylesheets/_config.scss @@ -1,11 +1,11 @@ -$base-font-size: 12pt; +$base-font-size: 14.5pt; $huge-font-size: $base-font-size * 1.25; $body-bg: rgba(0, 0, 0, 0.4); $text-color: #6c7683; $heading-color: #2B4662; $dimmed-text-color: darken($text-color, 20%); -$link-color: #384e68; //#686; +$link-color: #97b9e1; $link-hover-color: lighten(#686, 5%); $side-bar-background: rgba(20, 20, 20, 0.7); $menu-bar-background: transparentize(#243B48, 0.2); //rgba(128, 256, 128, 0.15); diff --git a/blog/_assets/stylesheets/_navbar.scss b/blog/_assets/stylesheets/_navbar.scss index 5fb3d48..a7de626 100644 --- a/blog/_assets/stylesheets/_navbar.scss +++ b/blog/_assets/stylesheets/_navbar.scss @@ -3,7 +3,6 @@ background: { color: $menu-bar-background; } - @include round-corners; width: 100%; padding: { top: 1mm; diff --git a/blog/_assets/stylesheets/main.scss b/blog/_assets/stylesheets/main.scss index 0396e6f..c553c40 100644 --- a/blog/_assets/stylesheets/main.scss +++ b/blog/_assets/stylesheets/main.scss @@ -37,10 +37,8 @@ h1 { } #page-container { - position: relative; - max-width: 28cm; + max-width: 980px; margin: { - //top: 10mm; left: auto; right: auto; } @@ -54,66 +52,22 @@ h1 { } #body-content { - position: relative; - min-height: 700px; + &.narrow { + float: left; + max-width: 738px; + min-width: 300px; + } line-height: 170%; font-size: $base-font-size; background-color: $body-bg; - - @media screen and (min-width: 28cm) { - padding: 1cm; - } - - @include round-corners; - - #body { - } - - #side-body { - } - - #news, #links { - //width: 8.55cm; - //float: left; - //margin-right: 5mm; - - &.wide { - width: 100%; - float: none; - } - } } -#sponsor-pos-1, -#sponsor-pos-2 { - text-align: center; +#sponsor-pos-1 { + width: 224px; margin: { - left: auto; - right: auto; - } - height: 500px; - width: 3*(250px + 4mm); - .sponsor-logos { - float: left; - width: 250px; - display: inline-block; - .logo { - display: block; - vertical-align: middle; - img { - vertical-align: middle; - padding-top: 2mm; - padding-bottom: 2mm; - } - &:hover { - background-color: $nav-link-hover-bg; - } - } - &:after { - content: "."; - visibility: hidden; - clear: both; - } - } + left: 18px; + right: 0; + }; + float: left; } diff --git a/blog/_layouts/homepage.html b/blog/_layouts/homepage.html index 3ebf2cc..130169a 100644 --- a/blog/_layouts/homepage.html +++ b/blog/_layouts/homepage.html @@ -6,10 +6,9 @@ {% include header.html %}
-
+
{{ content }} - {% include sponsors.html %} {% include news.html %} {% if site.links %} @@ -18,6 +17,7 @@
{% endif %}
+ {% include sponsors.html %}
{% include footer.html %} -- cgit v1.2.3