From 88ed5a0bef36e353b8468cc28ed1f0f076586695 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20N=C3=BCsse?= Date: Tue, 26 Feb 2019 09:30:10 +0100 Subject: [PATCH] Updated CSS and refined width-logic --- layouts/_default/baseof.html | 8 +++----- source/css/main.css | 17 +++++++++++------ 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index a0f40a4..a7d7bab 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -7,11 +7,9 @@ {{ partial "head.html" . }} -{{ if eq $.Site.Params.themeWidth "full" }} -
-{{ else }} -
-{{ end }} +{{ $container := cond $.Site.Params.FullWidthTheme "container full" (cond $.Site.Params.CenterTheme "container center" "container") }} + +
{{ partial "header.html" . }} diff --git a/source/css/main.css b/source/css/main.css index 52e351e..3e67097 100644 --- a/source/css/main.css +++ b/source/css/main.css @@ -228,14 +228,19 @@ ol ol { @media (--phone) { padding: 20px; } + &.full, + &.center { + border: none; + margin: 0 auto; + } + + &.full { + max-width: 100%; + } + + } -.full { - border-right: none; - margin: auto; -} - -.half {border-right: 1px solid rgba(255, 255, 255, .1);}