From 032eaf035f566bbaba1c701b5eef8bebd55e68d4 Mon Sep 17 00:00:00 2001 From: Vitaly Takmazov Date: Thu, 6 Dec 2018 11:08:28 +0300 Subject: styling --- src/main/assets/scripts.js | 5 ++-- src/main/assets/style.css | 27 ++++++----------- .../templates/views/partial/navigation.html | 34 ++++++++++++---------- 3 files changed, 30 insertions(+), 36 deletions(-) diff --git a/src/main/assets/scripts.js b/src/main/assets/scripts.js index 32888279..f90fe2c5 100644 --- a/src/main/assets/scripts.js +++ b/src/main/assets/scripts.js @@ -868,11 +868,10 @@ ready(function() { } }); let location = window.location.href; - document.querySelectorAll('#global li a').forEach(el => { + document.querySelectorAll('#header_wrapper a').forEach(el => { if (el.href === location) { el.classList.add('active'); - el.parentNode.classList.add('active'); - el.parentNode.setAttribute('aria-disabled', 'true'); + el.setAttribute('aria-disabled', 'true'); } }); initES(); diff --git a/src/main/assets/style.css b/src/main/assets/style.css index 45e1722a..f7acac3c 100644 --- a/src/main/assets/style.css +++ b/src/main/assets/style.css @@ -182,32 +182,27 @@ body > header { #global a { color: #88958d; display: inline-block; - padding: 14px 6px; - border-bottom: 2px solid transparent; -} -#global li { - display: inline-block; + padding: 14px; border-bottom: 2px solid transparent; } #ctitle a { - padding: 4px 20px; + padding: 2px 20px; border-bottom: 2px solid transparent; } .l a { border-bottom: 2px solid transparent; } -#global li.active { - background: #fff; - color: #ff339a; +#header_wrapper a.active { + background: #ff339a; + color: #fff; border-bottom: 2px solid #ff339a; pointer-events: none; } -#global li:hover:not(.active), +#global a:hover:not(.active), #ctitle a:hover:not(.active), .l a:hover { background: #fff; border-bottom: 2px solid #ff339a; - box-shadow: 0 0 3px rgba(0, 0, 0, 0.16); cursor: pointer; } #search input { @@ -548,16 +543,9 @@ article .tags > a, } @media screen and (max-width: 480px) { - #wrapper { - margin-top: 104px; - } #search { display: none; } - #global a { - padding: 14px 2px; - font-size: 11pt; - } .msg-cont > nav.l, article > nav.l { font-size: 9pt; @@ -575,6 +563,9 @@ article .tags > a, .title2-right { line-height: initial; } + .icon-title { + display: none; + } } /* #endregion */ diff --git a/src/main/resources/templates/views/partial/navigation.html b/src/main/resources/templates/views/partial/navigation.html index 8a21a437..3171c678 100644 --- a/src/main/resources/templates/views/partial/navigation.html +++ b/src/main/resources/templates/views/partial/navigation.html @@ -2,7 +2,7 @@
{% if visitor.uid > 0 %}
- + {{ visitor.name }} {% if not visitor.verified %} @@ -19,21 +19,25 @@
-- cgit v1.2.3