diff --git a/assets/less/mio/classes/container.less b/assets/less/mio/classes/container.less index 15a6aa20..c32b0c22 100644 --- a/assets/less/mio/classes/container.less +++ b/assets/less/mio/classes/container.less @@ -4,7 +4,7 @@ margin: 2px 0; box-shadow: 0 1px 2px #9475b2; - .mio--dark & { + .main--dark & { background-color: #23172a; } diff --git a/assets/less/mio/classes/footer.less b/assets/less/mio/classes/footer.less index 7a6593b5..7897fb80 100644 --- a/assets/less/mio/classes/footer.less +++ b/assets/less/mio/classes/footer.less @@ -1,4 +1,5 @@ .footer { + flex: 0 0 auto; text-align: center; font-size: .9em; line-height: 1.5em; diff --git a/assets/less/mio/classes/header.less b/assets/less/mio/classes/header.less index 9b5b6761..476fb84d 100644 --- a/assets/less/mio/classes/header.less +++ b/assets/less/mio/classes/header.less @@ -1,12 +1,19 @@ @mio-header-mobile: 700px; .header { - display: flex; - align-items: center; - padding: 2px 0; + flex: 0 0 auto; + //background: linear-gradient(0deg, transparent, #c2affe) repeat-x; - @media (max-width: @mio-header-mobile) { - flex-direction: column; + &__wrapper { + margin: 0 auto; + display: flex; + align-items: center; + padding: 3px 1px; + max-width: @site-max-width; + + @media (max-width: @mio-header-mobile) { + flex-direction: column; + } } @media (max-width: @mio-header-mobile) { diff --git a/assets/less/mio/classes/input/select.less b/assets/less/mio/classes/input/select.less index 761d05cd..cf2478b9 100644 --- a/assets/less/mio/classes/input/select.less +++ b/assets/less/mio/classes/input/select.less @@ -9,7 +9,7 @@ } } -.mio--dark .input__select { +.main--dark .input__select { background: #111; color: #fff; } diff --git a/assets/less/mio/classes/input/text.less b/assets/less/mio/classes/input/text.less index e58e6d21..15383a65 100644 --- a/assets/less/mio/classes/input/text.less +++ b/assets/less/mio/classes/input/text.less @@ -13,7 +13,7 @@ } } -.mio--dark .input__text { +.main--dark .input__text { background: #111; color: #fff; } diff --git a/assets/less/mio/classes/input/textarea.less b/assets/less/mio/classes/input/textarea.less index 43707219..bebd969b 100644 --- a/assets/less/mio/classes/input/textarea.less +++ b/assets/less/mio/classes/input/textarea.less @@ -10,7 +10,7 @@ } } -.mio--dark .input__textarea { +.main--dark .input__textarea { background: #111; color: #fff; } diff --git a/assets/less/mio/classes/navigation.less b/assets/less/mio/classes/navigation.less index a1e70f83..300784cf 100644 --- a/assets/less/mio/classes/navigation.less +++ b/assets/less/mio/classes/navigation.less @@ -105,7 +105,7 @@ } } -.mio--dark { +.main--dark { .navigation, .navigation__option { border-color: #9475b2; diff --git a/assets/less/mio/main.less b/assets/less/mio/main.less index c95739ea..e297e367 100644 --- a/assets/less/mio/main.less +++ b/assets/less/mio/main.less @@ -1,5 +1,6 @@ @mio-font-heading: Verdana, 'Dejavu Sans', Arial, Helvetica, sans-serif; @mio-font-regular: Tahoma, Geneva, 'Dejavu Sans', Arial, Helvetica, sans-serif; +@site-max-width: 1200px; * { margin: 0; @@ -14,7 +15,9 @@ body { height: 100%; } -.mio { +.main { + display: flex; + flex-direction: column; background-color: #fbeeff; background-image: linear-gradient(180deg, #c2affe, transparent); background-repeat: repeat-x; @@ -23,11 +26,12 @@ body { color: #000; &__wrapper { - max-width: 1200px; + max-width: @site-max-width; margin: 0 auto; padding: 1px; + flex: 1 0 auto; - @media (max-width: 1201px) { + @media (max-width: @site-max-width + 1) { margin: 0 1px; } } diff --git a/views/mio/_layout/header.twig b/views/mio/_layout/header.twig index b98ce37b..1ed283d9 100644 --- a/views/mio/_layout/header.twig +++ b/views/mio/_layout/header.twig @@ -1,86 +1,88 @@ diff --git a/views/mio/master.twig b/views/mio/master.twig index 5d5ca96b..72de0e54 100644 --- a/views/mio/master.twig +++ b/views/mio/master.twig @@ -7,10 +7,10 @@ - -
- {% include '_layout/header.twig' %} + + {% include '_layout/header.twig' %} +
{% block content %}
Hello!
@@ -19,30 +19,31 @@
{% endblock %} - -
+ + +