aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/Wallabag
diff options
context:
space:
mode:
authorAlexandr Danilov <bitbucket@modos189.ru>2015-08-17 01:29:51 +0300
committerAlexandr Danilov <bitbucket@modos189.ru>2015-08-17 01:29:51 +0300
commitd75a9fa38b24b57fbbb11d52c17d56d04387718f (patch)
treeda74d6f4a906f7a4326b6dfa9fa1bce2696231cd /src/Wallabag
parent0e7cf1fc502e6d01f3059cb821420485bcb4614a (diff)
downloadwallabag-d75a9fa38b24b57fbbb11d52c17d56d04387718f.tar.gz
wallabag-d75a9fa38b24b57fbbb11d52c17d56d04387718f.tar.zst
wallabag-d75a9fa38b24b57fbbb11d52c17d56d04387718f.zip
Fix:
When I click on "new article" icon, and on the cross after, the filter icon is no more visible. When I change the size of my browser window, the filter appears but I didn't click on the icon Bug: can't click on pagination > 1 display bug: when we load homepage, we see quickly the filter form new entry form: when we click on the field, the history of the field is at the left of the screen, not below the field (see screenshot)
Diffstat (limited to 'src/Wallabag')
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/new_form.html.twig2
-rwxr-xr-xsrc/Wallabag/CoreBundle/Resources/views/themes/material/public/css/main.css15
-rwxr-xr-xsrc/Wallabag/CoreBundle/Resources/views/themes/material/public/js/init.js10
3 files changed, 20 insertions, 7 deletions
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 1a3ab86d..fda53e5b 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
@@ -8,7 +8,7 @@
8 <span class="black-text">{{ form_errors(form.url) }}</span> 8 <span class="black-text">{{ form_errors(form.url) }}</span>
9 {% endif %} 9 {% endif %}
10 10
11 {{ form_widget(form.url) }} 11 {{ form_widget(form.url, { 'attr': {'autocomplete': 'off'} }) }}
12 12
13 <div class="hidden">{{ form_rest(form) }}</div> 13 <div class="hidden">{{ form_rest(form) }}</div>
14</form> 14</form>
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/public/css/main.css b/src/Wallabag/CoreBundle/Resources/views/themes/material/public/css/main.css
index 2497e3e9..cc1bbd3f 100755
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/public/css/main.css
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/public/css/main.css
@@ -48,6 +48,16 @@ nav, main, footer {
48 margin-bottom: 0; 48 margin-bottom: 0;
49} 49}
50 50
51.pagination li {
52 padding: 0;
53}
54
55.pagination a {
56 padding: 0px 10px;
57 height: 30px;
58 display: block;
59}
60
51.page-footer .footer-copyright p { 61.page-footer .footer-copyright p {
52 display: inline; 62 display: inline;
53} 63}
@@ -177,6 +187,11 @@ nav input {
177 width: 100%; 187 width: 100%;
178} 188}
179 189
190.side-nav.fixed.right-aligned {
191 right: -250px;
192 left: auto !important;
193}
194
180/* ========================================================================== 195/* ==========================================================================
181 3 = Cards 196 3 = Cards
182 ========================================================================== */ 197 ========================================================================== */
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/public/js/init.js b/src/Wallabag/CoreBundle/Resources/views/themes/material/public/js/init.js
index 4adc1a8d..5e5ea847 100755
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/public/js/init.js
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/public/js/init.js
@@ -3,8 +3,7 @@ function init_filters() {
3 if ($("div").is("#filters")) { 3 if ($("div").is("#filters")) {
4 $('#button_filters').show(); 4 $('#button_filters').show();
5 $('.button-collapse-right').sideNav({ edge: 'right' }); 5 $('.button-collapse-right').sideNav({ edge: 'right' });
6 $('#filters').css({ "left": "auto" }); 6 $('#clean_form_filters').on('click', function(){
7 $('#clean_form_filters').click(function(){
8 $('#filters input').val(''); 7 $('#filters input').val('');
9 return false; 8 return false;
10 }); 9 });
@@ -20,17 +19,16 @@ $(document).ready(function(){
20 }); 19 });
21 init_filters(); 20 init_filters();
22 21
23 $('#nav-btn-add').click(function(){ 22 $('#nav-btn-add').on('click', function(){
24 $(".nav-panel-buttom").hide(100); 23 $(".nav-panel-buttom").hide(100);
25 $(".nav-panel-add").show(100); 24 $(".nav-panel-add").show(100);
26 $(".nav-panel-menu").hide(100);
27 $(".nav-panels .action").hide(100); 25 $(".nav-panels .action").hide(100);
28 $(".nav-panel-menu").addClass('hidden'); 26 $(".nav-panel-menu").addClass('hidden');
29 $(".nav-panels").css('background', 'white'); 27 $(".nav-panels").css('background', 'white');
30 $("#entry_url").focus(); 28 $("#entry_url").focus();
31 return false; 29 return false;
32 }); 30 });
33 $('#nav-btn-search').click(function(){ 31 $('#nav-btn-search').on('click', function(){
34 $(".nav-panel-buttom").hide(100); 32 $(".nav-panel-buttom").hide(100);
35 $(".nav-panel-search").show(100); 33 $(".nav-panel-search").show(100);
36 $(".nav-panels .action").hide(100); 34 $(".nav-panels .action").hide(100);
@@ -39,7 +37,7 @@ $(document).ready(function(){
39 $("#searchfield").focus(); 37 $("#searchfield").focus();
40 return false; 38 return false;
41 }); 39 });
42 $('.mdi-navigation-close').click(function(){ 40 $('.mdi-navigation-close').on('click', function(){
43 $(".nav-panel-add").hide(100); 41 $(".nav-panel-add").hide(100);
44 $(".nav-panel-search").hide(100); 42 $(".nav-panel-search").hide(100);
45 $(".nav-panel-buttom").show(100); 43 $(".nav-panel-buttom").show(100);