From bcc6bca8afb72374dd46765e0bc692ec12a13f36 Mon Sep 17 00:00:00 2001 From: Vitaly Takmazov Date: Tue, 18 Feb 2020 09:51:39 +0300 Subject: Update toolbar style --- src/main/assets/style.css | 30 +++++++---- .../templates/views/partial/homecolumn.html | 28 ++++------ .../templates/views/partial/settings_tabs.html | 14 ++--- .../templates/views/partial/tagcolumn.html | 36 +++++-------- .../templates/views/partial/usercolumn.html | 63 +++++++++------------- 5 files changed, 78 insertions(+), 93 deletions(-) (limited to 'src/main') diff --git a/src/main/assets/style.css b/src/main/assets/style.css index 1c8fb023..94052ac2 100644 --- a/src/main/assets/style.css +++ b/src/main/assets/style.css @@ -214,21 +214,31 @@ body > header { /* #region left column internals */ +.toolbar { + display: flex; + flex-direction: column; + justify-content: space-around; + border-top: 1px solid #eee; +} + +.toolbar a { + padding: 14px; + color: #88859d; + align-items: center; + vertical-align: middle; + border-right: 2px solid transparent; +} +.toolbar > a:hover { + background-color: #f8f8f8; + cursor: pointer; + border-right: 2px solid #ff339a; +} + #column ul, #column p, #column hr { margin: 10px 0; } -#column li > a { - display: block; - height: 100%; - padding: 6px; -} -#column li > a:hover { - background-color: #fff; - border: 1px solid #eee; - transition: background-color 0.2s ease-in; -} #column .margtop { margin-top: 15px; } diff --git a/src/main/resources/templates/views/partial/homecolumn.html b/src/main/resources/templates/views/partial/homecolumn.html index 5ab0d128..5b13dd66 100644 --- a/src/main/resources/templates/views/partial/homecolumn.html +++ b/src/main/resources/templates/views/partial/homecolumn.html @@ -1,20 +1,14 @@ - +
+ + Top + + + {{ i18n("messages","link.allMessages") }} + + + {{ i18n("messages", "link.withPhotos") }} + +

{{ i18n("messages","link.trends") }}

{% include "views/partial/tags" %} diff --git a/src/main/resources/templates/views/partial/settings_tabs.html b/src/main/resources/templates/views/partial/settings_tabs.html index 4715253e..60337d92 100644 --- a/src/main/resources/templates/views/partial/settings_tabs.html +++ b/src/main/resources/templates/views/partial/settings_tabs.html @@ -1,6 +1,8 @@ -
\ No newline at end of file +
+ +
\ No newline at end of file diff --git a/src/main/resources/templates/views/partial/tagcolumn.html b/src/main/resources/templates/views/partial/tagcolumn.html index 3e61d3d3..c411c3c4 100644 --- a/src/main/resources/templates/views/partial/tagcolumn.html +++ b/src/main/resources/templates/views/partial/tagcolumn.html @@ -2,32 +2,24 @@

*{{ tag.name }}

{% if visitor is not empty and visitor.uid > 0 %} - + {% endif %} diff --git a/src/main/resources/templates/views/partial/usercolumn.html b/src/main/resources/templates/views/partial/usercolumn.html index 3e51644b..5d1aaff6 100644 --- a/src/main/resources/templates/views/partial/usercolumn.html +++ b/src/main/resources/templates/views/partial/usercolumn.html @@ -4,65 +4,52 @@ {{ user.name }} - + {% endif %} - +

-- cgit v1.2.3