From a1a759a88fea78475f8be8dccc7cbed6fc5886b3 Mon Sep 17 00:00:00 2001 From: j Date: Tue, 12 Oct 2021 16:20:58 +0100 Subject: [PATCH] add all changes --- app/static/css/partials/_menu.scss | 38 +++++++++++++----------------- app/static/css/style.scss | 2 +- app/templates/base.html | 15 ++++++------ 3 files changed, 24 insertions(+), 31 deletions(-) diff --git a/app/static/css/partials/_menu.scss b/app/static/css/partials/_menu.scss index 18db412..0a27188 100644 --- a/app/static/css/partials/_menu.scss +++ b/app/static/css/partials/_menu.scss @@ -6,11 +6,8 @@ padding-left: 16px; padding-top: 16px; @media screen and (max-width: 799px) { - overflow: hidden; - z-index: 100; - height: initial; - padding-left: initial; - padding-top: initial; + padding-left: 0; + padding-right: 0; } nav { @@ -18,9 +15,10 @@ text-align: right; margin-right: 16px; @media screen and (max-width: 799px) { - display: none; - text-align: initial; - margin-right: initial; + text-align: center; + width: 100%; + margin-right: 0; + margin-top: 16px; } } @@ -28,25 +26,21 @@ color: white; text-decoration: none; font-size: 17px; - @media screen and (max-width: 799px) { - padding: 14px 16px; - display: block; - } - - &.icon { - display: none; - @media screen and (max-width: 799px) { - display: block; - position: absolute; - right: 0; - top: 0; - } - } &:hover { background-color: #ddd; color: black; } + @media screen and (max-width: 799px) { + &.title { + display: block; + text-align: center; + } + div { + display: inline-block; + } + + } } diff --git a/app/static/css/style.scss b/app/static/css/style.scss index 6ebb911..fc32fae 100644 --- a/app/static/css/style.scss +++ b/app/static/css/style.scss @@ -1,6 +1,6 @@ @import "partials/reset"; @import "partials/layout"; -@import "partials/burger"; +@import "partials/menu"; @import "partials/film"; @import "partials/text"; @import "partials/ascroll"; diff --git a/app/templates/base.html b/app/templates/base.html index 460fd44..9b66b65 100644 --- a/app/templates/base.html +++ b/app/templates/base.html @@ -13,24 +13,23 @@
- + +
Phantas.ma/polis: Looking Back to the Future -
- 未竟之城：回顧未來 +
+
+ 未竟之城：回顧未來 +
- - -
{% block main %}{% endblock main %}
{% block end %}{% endblock end %} -