From 93e3329c58312916b8231cf2dea331a40bfc5d24 Mon Sep 17 00:00:00 2001 From: Simounet Date: Thu, 7 Dec 2017 23:46:29 +0100 Subject: [PATCH] Fix nav title nowrap on mobile --- .../static/themes/material/css/nav.scss | 33 +++++++++++++------ .../views/themes/material/layout.html.twig | 10 +++--- web/wallassets/material.css | 2 +- 3 files changed, 30 insertions(+), 15 deletions(-) diff --git a/app/Resources/static/themes/material/css/nav.scss b/app/Resources/static/themes/material/css/nav.scss index 7898f662c..f986b7854 100644 --- a/app/Resources/static/themes/material/css/nav.scss +++ b/app/Resources/static/themes/material/css/nav.scss @@ -2,10 +2,13 @@ /* ========================================================================== Nav ========================================================================== */ +nav, +.nav-wrapper { + height: auto; + line-height: initial; +} nav { - height: auto; - input { color: #aaa; } @@ -17,15 +20,25 @@ nav { .nav-wrapper { display: flex; + padding: 0.6rem 0.4rem 0.6rem 0.75rem; flex-wrap: wrap; justify-content: space-between; - min-height: 64px; + align-items: center; .button-collapse { - padding: 0 15px; + margin-left: 0; + margin-right: 0.5rem; + padding: 0 0.5rem; + height: auto; + line-height: 1; } } +nav .nav-wrapper i { + height: 46px; + line-height: 46px; +} + .nav-input { display: none; } @@ -34,10 +47,6 @@ nav { display: flex; flex-grow: 1; justify-content: flex-end; - - li { - max-height: 64px; - } } .nav-panel-add .add, @@ -50,9 +59,8 @@ nav { transition: background 0.2s ease; .action { - padding-left: 0.75rem; + margin: 0; font-size: 2.1rem; - white-space: nowrap; } .input-field input { @@ -71,6 +79,11 @@ nav { } } +.nav-panel-top { + display: flex; + align-items: center; +} + .input-field { &.nav-panel-add label, &.nav-panel-search label { diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig index cb6fd58ae..f6b3c963c 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig @@ -94,10 +94,12 @@