diff --git a/app/Resources/static/themes/material/css/media_queries.scss b/app/Resources/static/themes/material/css/media_queries.scss index 48f3aefc8..69e3d47d5 100644 --- a/app/Resources/static/themes/material/css/media_queries.scss +++ b/app/Resources/static/themes/material/css/media_queries.scss @@ -27,7 +27,7 @@ } .nav-panel-buttom { - justify-content: space-around; + justify-content: space-between; } #article { diff --git a/app/Resources/static/themes/material/css/nav.scss b/app/Resources/static/themes/material/css/nav.scss index 7898f662c..99a048b05 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,27 @@ 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; + background-color: transparent; + border: none; } } +nav .nav-wrapper i { + height: 46px; + line-height: 46px; +} + .nav-input { display: none; } @@ -34,10 +49,6 @@ nav { display: flex; flex-grow: 1; justify-content: flex-end; - - li { - max-height: 64px; - } } .nav-panel-add .add, @@ -50,9 +61,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 +81,11 @@ nav { } } +.nav-panel-top { + display: flex; + align-items: center; +} + .input-field { &.nav-panel-add label, &.nav-panel-search label { @@ -109,3 +124,9 @@ nav { #button_export { display: none; } + +@media (min-width: 993px) { + .button-collapse { + display: none; + } +} 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..5c916a8d3 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 @@