mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2024-12-20 22:56:30 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2730 from Simounet/feature/all-actions-on-mobile

Browse source 
Access to search, filters, export on mobile
This commit is contained in:
Nicolas Lœuillet 2016-12-30 11:10:47 +01:00 committed by GitHub
commit 5f4667e3e8
3 changed files with 54 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
app/Resources/static/themes/material/css/main.css
View file

@ -283,6 +283,16 @@ nav input {
color: #aaa; color: #aaa;
} }
nav {
height: auto;
}
.nav-wrapper {
display: flex;
flex-wrap: wrap;
justify-content: space-between;
}
.nav-wrapper .button-collapse { .nav-wrapper .button-collapse {
padding: 0 15px; padding: 0 15px;
} }
@ -291,8 +301,10 @@ nav input {
display: none; display: none;
} }
.nav-panels { .nav-panel-buttom {
overflow: hidden; display: flex;
flex-grow: 1;
justify-content: right;
} }
.nav-panel-buttom li { .nav-panel-buttom li {
@ -357,7 +369,7 @@ nav input {
.input-field.nav-panel-add form, .input-field.nav-panel-add form,
.input-field.nav-panel-search, .input-field.nav-panel-search,
.input-field.nav-panel-search form { .input-field.nav-panel-search form {
height: 100%; flex-grow: 1;
} }
/* ========================================================================== /* ==========================================================================
@ -807,6 +819,14 @@ article aside .tools li {
width: auto; width: auto;
} }
.nav-panels .action {
padding-right: 0.75rem;
}
.nav-panel-buttom {
justify-content: space-around;
}
#article { #article {
max-width: 35em; max-width: 35em;
margin-left: auto; margin-left: auto;
@ -843,11 +863,13 @@ article aside .tools li {
.pagination li.next { .pagination li.next {
width: auto; width: auto;
} }
}
@media only screen and (min-width: 400px) { .drag-target + .drag-target {
.nav-panel-buttom { height: 50%;
float: right; }
.drag-target + .drag-target + .drag-target {
top: 50%;
} }
} }

46
src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig
View file

@ -80,30 +80,28 @@
{% block title %} {% block title %}
{% endblock %} {% endblock %}
</div> </div>
<div class="input-field nav-panel-buttom"> <ul class="input-field nav-panel-buttom">
<ul> <li class="bold">
<li class="bold"> <a class="waves-effect tooltipped" data-position="bottom" data-delay="50" data-tooltip="{{ 'menu.top.add_new_entry'|trans }}" href="{{ path('new') }}" id="nav-btn-add">
<a class="waves-effect tooltipped" data-position="bottom" data-delay="50" data-tooltip="{{ 'menu.top.add_new_entry'|trans }}" href="{{ path('new') }}" id="nav-btn-add"> <i class="material-icons">add</i>
<i class="material-icons">add</i> </a>
</a> </li>
</li> <li>
<li> <a class="waves-effect tooltipped" data-position="bottom" data-delay="50" data-tooltip="{{ 'menu.top.search'|trans }}" href="javascript: void(null);" id="nav-btn-search">
<a class="waves-effect tooltipped" data-position="bottom" data-delay="50" data-tooltip="{{ 'menu.top.search'|trans }}" href="javascript: void(null);" id="nav-btn-search"> <i class="material-icons">search</i>
<i class="material-icons">search</i> </a>
</a> </li>
</li> <li id="button_filters">
<li id="button_filters"> <a class="nav-panel-menu button-collapse-right tooltipped" data-position="bottom" data-delay="50" data-tooltip="{{ 'menu.top.filter_entries'|trans }}" href="#" data-activates="filters">
<a class="nav-panel-menu button-collapse-right tooltipped" data-position="bottom" data-delay="50" data-tooltip="{{ 'menu.top.filter_entries'|trans }}" href="#" data-activates="filters"> <i class="material-icons">filter_list</i>
<i class="material-icons">filter_list</i> </a>
</a> </li>
</li> <li id="button_export">
<li id="button_export"> <a class="nav-panel-menu button-collapse-right tooltipped" data-position="bottom" data-delay="50" data-tooltip="{{ 'menu.top.export'|trans }}" href="#" data-activates="export">
<a class="nav-panel-menu button-collapse-right tooltipped" data-position="bottom" data-delay="50" data-tooltip="{{ 'menu.top.export'|trans }}" href="#" data-activates="export"> <i class="material-icons">file_download</i>
<i class="material-icons">file_download</i> </a>
</a> </li>
</li> </ul>
</ul>
</div>
<div class="input-field nav-panel-search" style="display: none"> <div class="input-field nav-panel-search" style="display: none">
{{ render(controller("WallabagCoreBundle:Entry:searchForm", {'currentRoute': app.request.attributes.get('_route')})) }} {{ render(controller("WallabagCoreBundle:Entry:searchForm", {'currentRoute': app.request.attributes.get('_route')})) }}
<label for="search" class="active"><i class="material-icons search">search</i></label> <label for="search" class="active"><i class="material-icons search">search</i></label>

6
web/bundles/wallabagcore/themes/material/css/style.min.css vendored
View file

File diff suppressed because one or more lines are too long