diff options
| author |  Vitaly Takmazov | 2020-10-08 18:38:03 +0300 |
|---|---|---|
| committer | Vitaly Takmazov | 2020-10-08 18:38:03 +0300 |
| commit | 78be8499ff86aaefca14d91abe2f1dd1ff98fa80 (patch) | |
| tree | cfd8fbd999f48015de00b3a0c5631204fc999455 /src/main | |
| parent | 04f0db43fa33dd3752edc9437c67c85a364b5ff4 (diff) | |
Desktop layout fixes
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/assets/style.css | 28 | ||||
| -rw-r--r-- | src/main/resources/templates/layouts/default.html | 16 |
2 files changed, 31 insertions, 13 deletions
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 @@ <body id="body" {% if visitor.uid > 0 %}data-hash="{{visitor.authHash}}" {% endif %}> <div id="app"> {% include "views/partial/navigation" %} - <aside id="column"> - {% block column %} - {% endblock %} - </aside> - <section id="content" {% if msg | default('') is not empty %}data-mid="{{ msg.mid }}" {% endif %} class="content--top"> + <div id="content_wrapper"> + <aside id="column"> + <div id="sidebar_wrapper"> + {% block column %} + {% endblock %} + </div> + </aside> + <section id="content" {% if msg | default('') is not empty %}data-mid="{{ msg.mid }}" {% endif %} class="content--top"> {% block content %} {% endblock %} - </section> + </section> + </div> </div> </body> |