devol
/
wallabag
mirror of https://github.com/wallabag/wallabag.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3467 from Simounet/feat/nav-improved 

Feat/nav improved
This commit is contained in:
Jérémy Benoist 2017-12-10 13:33:06 +01:00 committed by GitHub
parent e99be2c134 f072829ce3
commit 55bd59962c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 39 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Resources/static/themes/material/css/media_queries.scss
View File

@ -27,7 +27,7 @@
} }
.nav-panel-buttom { .nav-panel-buttom {
justify-content: space-around; justify-content: space-between;
} }
#article { #article {

41
app/Resources/static/themes/material/css/nav.scss
View File

@ -2,10 +2,13 @@
/* ========================================================================== /* ==========================================================================
Nav Nav
========================================================================== */ ========================================================================== */
nav,
.nav-wrapper {
height: auto;
line-height: initial;
}
nav { nav {
height: auto;
input { input {
color: #aaa; color: #aaa;
} }
@ -17,15 +20,27 @@ nav {
.nav-wrapper { .nav-wrapper {
display: flex; display: flex;
padding: 0.6rem 0.4rem 0.6rem 0.75rem;
flex-wrap: wrap; flex-wrap: wrap;
justify-content: space-between; justify-content: space-between;
min-height: 64px; align-items: center;
.button-collapse { .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 { .nav-input {
display: none; display: none;
} }
@ -34,10 +49,6 @@ nav {
display: flex; display: flex;
flex-grow: 1; flex-grow: 1;
justify-content: flex-end; justify-content: flex-end;
li {
max-height: 64px;
}
} }
.nav-panel-add .add, .nav-panel-add .add,
@ -50,9 +61,8 @@ nav {
transition: background 0.2s ease; transition: background 0.2s ease;
.action { .action {
padding-left: 0.75rem; margin: 0;
font-size: 2.1rem; font-size: 2.1rem;
white-space: nowrap;
} }
.input-field input { .input-field input {
@ -71,6 +81,11 @@ nav {
} }
} }
.nav-panel-top {
display: flex;
align-items: center;
}
.input-field { .input-field {
&.nav-panel-add label, &.nav-panel-add label,
&.nav-panel-search label { &.nav-panel-search label {
@ -109,3 +124,9 @@ nav {
#button_export { #button_export {
display: none; display: none;
} }
@media (min-width: 993px) {
.button-collapse {
display: none;
}
}

10
src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig
View File

@ -94,10 +94,12 @@
</li> </li>
</ul> </ul>
<div class="nav-wrapper nav-panels"> <div class="nav-wrapper nav-panels">
<a href="#" data-activates="slide-out" class="nav-panel-menu button-collapse"><i class="material-icons">menu</i></a> <div class="nav-panel-top">
<div class="left action"> <button data-activates="slide-out" class="nav-panel-menu button-collapse"><i class="material-icons">menu</i></button>
{% block title %} <h1 class="left action">
{% endblock %} {% block title %}
{% endblock %}
</h1>
</div> </div>
<ul class="input-field nav-panel-buttom"> <ul class="input-field nav-panel-buttom">
<li class="bold"> <li class="bold">

2
web/wallassets/material.css
View File

File diff suppressed because one or more lines are too long