From 78be8499ff86aaefca14d91abe2f1dd1ff98fa80 Mon Sep 17 00:00:00 2001 From: Vitaly Takmazov Date: Thu, 8 Oct 2020 18:38:03 +0300 Subject: Desktop layout fixes --- src/main/assets/style.css | 28 +++++++++++++++++------ src/main/resources/templates/layouts/default.html | 16 ++++++++----- 2 files changed, 31 insertions(+), 13 deletions(-) (limited to 'src') diff --git a/src/main/assets/style.css b/src/main/assets/style.css index 95ecab60..95e4e3e7 100644 --- a/src/main/assets/style.css +++ b/src/main/assets/style.css @@ -294,15 +294,17 @@ pre::-moz-selection { margin: 10px 0; } +#column { + background: var(--main-background-color); +} + #column .margtop { margin-top: 15px; } #column .tags { - background: var(--main-background-color); - border: 1px solid var(--border-color); line-height: 140%; - padding: 6px; + padding: 12px; text-align: justify; } @@ -1004,11 +1006,11 @@ article p { @media (--viewport-desktop) { #column { + position: sticky; padding: 12px; - left: 0; - top: 66px; - width: 240px; + margin-top: 66px; height: 100%; + z-index: auto; overflow-y: auto; } article, @@ -1016,6 +1018,18 @@ article p { .msg-cont { width: 640px; } + #sidebar_wrapper { + position: fixed; + width: 300px; + } + #header_wrapper, + #content_wrapper { + width: 1000px; + margin: 0 auto; + } + #content_wrapper { + display: flex; + } #footer { padding: 10px; } @@ -1026,8 +1040,8 @@ article p { display: none; } #content { - margin-left: 240px; padding-bottom: 12px; + width: 100%; } .toolbar { flex-direction: column; diff --git a/src/main/resources/templates/layouts/default.html b/src/main/resources/templates/layouts/default.html index a836f4c4..d3ce7dce 100644 --- a/src/main/resources/templates/layouts/default.html +++ b/src/main/resources/templates/layouts/default.html @@ -36,14 +36,18 @@ 0 %}data-hash="{{visitor.authHash}}" {% endif %}>
{% include "views/partial/navigation" %} - -
+
+ +
{% block content %} {% endblock %} -
+
+
-- cgit v1.2.3