aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/Wallabag
diff options
context:
space:
mode:
authorSimounet <contact@simounet.net>2017-12-28 22:54:42 +0100
committerNicolas LÅ“uillet <nicolas@loeuillet.org>2018-01-12 10:07:46 +0100
commit2831e77cce6eae213c0cec8f5a90a6a00c383633 (patch)
tree9cbde1e77585469348022f2c99afcf0980957d1b /src/Wallabag
parent63771b9ae31a8df8050677b53e64f7cf17924c27 (diff)
downloadwallabag-2831e77cce6eae213c0cec8f5a90a6a00c383633.tar.gz
wallabag-2831e77cce6eae213c0cec8f5a90a6a00c383633.tar.zst
wallabag-2831e77cce6eae213c0cec8f5a90a6a00c383633.zip
Nav close button alignment and nav boxes improved
Diffstat (limited to 'src/Wallabag')
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig2
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/new_form.html.twig3
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/search_form.html.twig3
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig70
4 files changed, 38 insertions, 40 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig
index 54066e95..8abf90c1 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig
@@ -9,7 +9,7 @@
9 <div class="determinate"></div> 9 <div class="determinate"></div>
10 </div> 10 </div>
11 <nav class="hide-on-large-only"> 11 <nav class="hide-on-large-only">
12 <div class="nav-wrapper cyan darken-1"> 12 <div class="nav-panel-item cyan darken-1">
13 <ul> 13 <ul>
14 <li> 14 <li>
15 <a href="#" data-activates="slide-out" class="button-collapse"> 15 <a href="#" data-activates="slide-out" class="button-collapse">
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/new_form.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/new_form.html.twig
index 8d5d053e..e0d5e794 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/new_form.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/new_form.html.twig
@@ -1,4 +1,4 @@
1<form name="entry" method="post" action="{{ path('new_entry')}}"> 1<form class="input-field nav-panel-item nav-panel-add" style="display: none" name="entry" method="post" action="{{ path('new_entry')}}">
2 {% if form_errors(form) %} 2 {% if form_errors(form) %}
3 <span class="black-text">{{ form_errors(form) }}</span> 3 <span class="black-text">{{ form_errors(form) }}</span>
4 {% endif %} 4 {% endif %}
@@ -9,6 +9,7 @@
9 {% endif %} 9 {% endif %}
10 10
11 {{ form_widget(form.url, { 'attr': {'autocomplete': 'off', 'placeholder': 'entry.new.placeholder'} }) }} 11 {{ form_widget(form.url, { 'attr': {'autocomplete': 'off', 'placeholder': 'entry.new.placeholder'} }) }}
12 <i class="material-icons close">clear</i>
12 13
13 {{ form_rest(form) }} 14 {{ form_rest(form) }}
14</form> 15</form>
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/search_form.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/search_form.html.twig
index ba8a8454..ba1b3aac 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/search_form.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/search_form.html.twig
@@ -1,4 +1,4 @@
1<form name="search" method="GET" action="{{ path('search')}}"> 1<form class="input-field nav-panel-item nav-panel-search" style="display: none" name="search" method="GET" action="{{ path('search')}}">
2 {% if form_errors(form) %} 2 {% if form_errors(form) %}
3 <span class="black-text">{{ form_errors(form) }}</span> 3 <span class="black-text">{{ form_errors(form) }}</span>
4 {% endif %} 4 {% endif %}
@@ -11,6 +11,7 @@
11 <input type="hidden" name="currentRoute" value="{{ currentRoute }}" /> 11 <input type="hidden" name="currentRoute" value="{{ currentRoute }}" />
12 12
13 {{ form_widget(form.term, { 'attr': {'autocomplete': 'off', 'placeholder': 'entry.search.placeholder'} }) }} 13 {{ form_widget(form.term, { 'attr': {'autocomplete': 'off', 'placeholder': 'entry.search.placeholder'} }) }}
14 <i class="material-icons close">clear</i>
14 15
15 {{ form_rest(form) }} 16 {{ form_rest(form) }}
16</form> 17</form>
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 aa1e8a10..6472d182 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig
@@ -93,44 +93,40 @@
93 <a class="waves-effect icon icon-power" href="{{ path('fos_user_security_logout') }}">{{ 'menu.left.logout'|trans }}</a> 93 <a class="waves-effect icon icon-power" href="{{ path('fos_user_security_logout') }}">{{ 'menu.left.logout'|trans }}</a>
94 </li> 94 </li>
95 </ul> 95 </ul>
96 <div class="nav-wrapper nav-panels"> 96 <div class="nav-panels">
97 <div class="nav-panel-top"> 97 <div class="nav-panel-actions nav-panel-item">
98 <button data-activates="slide-out" class="nav-panel-menu button-collapse"><i class="material-icons">menu</i></button> 98 <div class="nav-panel-top">
99 <h1 class="left action"> 99 <button data-activates="slide-out" class="nav-panel-menu button-collapse"><i class="material-icons">menu</i></button>
100 {% block title %} 100 <h1 class="left action">
101 {% endblock %} 101 {% block title %}
102 </h1> 102 {% endblock %}
103 </div> 103 </h1>
104 <ul class="input-field nav-panel-buttom"> 104 </div>
105 <li class="bold"> 105 <ul class="input-field nav-panel-buttom">
106 <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"> 106 <li class="bold">
107 <i class="material-icons">add</i> 107 <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">
108 </a> 108 <i class="material-icons">add</i>
109 </li> 109 </a>
110 <li> 110 </li>
111 <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"> 111 <li>
112 <i class="material-icons">search</i> 112 <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">
113 </a> 113 <i class="material-icons">search</i>
114 </li> 114 </a>
115 <li id="button_filters"> 115 </li>
116 <a class="nav-panel-menu button-collapse-right tooltipped js-filters-action" data-position="bottom" data-delay="50" data-tooltip="{{ 'menu.top.filter_entries'|trans }}" href="#" data-activates="filters"> 116 <li id="button_filters">
117 <i class="material-icons">filter_list</i> 117 <a class="nav-panel-menu button-collapse-right tooltipped js-filters-action" data-position="bottom" data-delay="50" data-tooltip="{{ 'menu.top.filter_entries'|trans }}" href="#" data-activates="filters">
118 </a> 118 <i class="material-icons">filter_list</i>
119 </li> 119 </a>
120 <li id="button_export"> 120 </li>
121 <a class="nav-panel-menu button-collapse-right tooltipped js-export-action" data-position="bottom" data-delay="50" data-tooltip="{{ 'menu.top.export'|trans }}" href="#" data-activates="export"> 121 <li id="button_export">
122 <i class="material-icons">file_download</i> 122 <a class="nav-panel-menu button-collapse-right tooltipped js-export-action" data-position="bottom" data-delay="50" data-tooltip="{{ 'menu.top.export'|trans }}" href="#" data-activates="export">
123 </a> 123 <i class="material-icons">file_download</i>
124 </li> 124 </a>
125 </ul> 125 </li>
126 <div class="input-field nav-panel-search" style="display: none"> 126 </ul>
127 {{ render(controller("WallabagCoreBundle:Entry:searchForm", {'currentRoute': app.request.attributes.get('_route')})) }}
128 <i class="material-icons close">clear</i>
129 </div>
130 <div class="input-field nav-panel-add" style="display: none">
131 {{ render(controller("WallabagCoreBundle:Entry:addEntryForm")) }}
132 <i class="material-icons close">clear</i>
133 </div> 127 </div>
128 {{ render(controller("WallabagCoreBundle:Entry:searchForm", {'currentRoute': app.request.attributes.get('_route')})) }}
129 {{ render(controller("WallabagCoreBundle:Entry:addEntryForm")) }}
134 </div> 130 </div>
135 </nav> 131 </nav>
136{% endblock %} 132{% endblock %}