diff options
Diffstat (limited to 'src/Wallabag/CoreBundle/Resources/views')
4 files changed, 82 insertions, 59 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig index 176290e4..08f3fe60 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig | |||
@@ -71,6 +71,14 @@ | |||
71 | <label for="entry_filter_previewPicture">{% trans %}Has a preview picture{% endtrans %}</label> | 71 | <label for="entry_filter_previewPicture">{% trans %}Has a preview picture{% endtrans %}</label> |
72 | </div> | 72 | </div> |
73 | </div> | 73 | </div> |
74 | |||
75 | <div id="filter-language" class="filter-group"> | ||
76 | <label for="entry_filter_language">{% trans %}Language{% endtrans %}</label> | ||
77 | <div class="input-field "> | ||
78 | {{ form_widget(form.language) }} | ||
79 | </div> | ||
80 | </div> | ||
81 | |||
74 | <div id="filter-reading-time" class="filter-group"> | 82 | <div id="filter-reading-time" class="filter-group"> |
75 | <div class=""> | 83 | <div class=""> |
76 | <label>{% trans %}Reading time in minutes{% endtrans %}</label> | 84 | <label>{% trans %}Reading time in minutes{% endtrans %}</label> |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/css/main.css b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/css/main.css index 950d8b0e..4aeadb4f 100755 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/css/main.css +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/css/main.css | |||
@@ -356,9 +356,9 @@ footer a { | |||
356 | overflow: hidden; | 356 | overflow: hidden; |
357 | padding: 1.5em 1.5em 3em 1.5em; | 357 | padding: 1.5em 1.5em 3em 1.5em; |
358 | 358 | ||
359 | /* Removing CSS transitions because they make the switch from list view to | 359 | /* Removing CSS transitions because they make the switch from list view to |
360 | * table view jerky | 360 | * table view jerky |
361 | */ | 361 | */ |
362 | /* -webkit-transition: all 0.5s ease; */ | 362 | /* -webkit-transition: all 0.5s ease; */ |
363 | /* -moz-transition: all 0.5s ease; */ | 363 | /* -moz-transition: all 0.5s ease; */ |
364 | /* -ms-transition: all 0.5s ease; */ | 364 | /* -ms-transition: all 0.5s ease; */ |
@@ -570,47 +570,47 @@ img.preview { | |||
570 | border-left: 1px #EEE solid; | 570 | border-left: 1px #EEE solid; |
571 | } | 571 | } |
572 | 572 | ||
573 | .popup-form form { | 573 | .popup-form form { |
574 | background-color: #FFF; | 574 | background-color: #FFF; |
575 | position: absolute; | 575 | position: absolute; |
576 | top: 0; | 576 | top: 0; |
577 | left: 0; | 577 | left: 0; |
578 | z-index: 20; | 578 | z-index: 20; |
579 | border: 10px solid #000; | 579 | border: 10px solid #000; |
580 | width: 400px; | 580 | width: 400px; |
581 | height: 200px; | 581 | height: 200px; |
582 | padding: 2em; | 582 | padding: 2em; |
583 | } | 583 | } |
584 | 584 | ||
585 | #bagit-form-form .addurl { | 585 | #bagit-form-form .addurl { |
586 | margin-left: 0; | 586 | margin-left: 0; |
587 | } | 587 | } |
588 | 588 | ||
589 | .closeMessage, | 589 | .closeMessage, |
590 | .close-button { | 590 | .close-button { |
591 | background-color: #000; | 591 | background-color: #000; |
592 | color: #FFF; | 592 | color: #FFF; |
593 | font-size: 1.2em; | 593 | font-size: 1.2em; |
594 | line-height: 1.6; | 594 | line-height: 1.6; |
595 | width: 1.6em; | 595 | width: 1.6em; |
596 | height: 1.6em; | 596 | height: 1.6em; |
597 | text-align: center; | 597 | text-align: center; |
598 | text-decoration: none; | 598 | text-decoration: none; |
599 | } | 599 | } |
600 | .closeMessage:hover, | 600 | .closeMessage:hover, |
601 | .closeMessage:focus, | 601 | .closeMessage:focus, |
602 | .close-button:hover, | 602 | .close-button:hover, |
603 | .close-button:focus { | 603 | .close-button:focus { |
604 | background-color: #999; | 604 | background-color: #999; |
605 | color: #000; | 605 | color: #000; |
606 | } | 606 | } |
607 | 607 | ||
608 | .close-button--popup { | 608 | .close-button--popup { |
609 | display: inline-block; | 609 | display: inline-block; |
610 | position: absolute; | 610 | position: absolute; |
611 | top: 0; | 611 | top: 0; |
612 | right: 0; | 612 | right: 0; |
613 | font-size: 1.4em; | 613 | font-size: 1.4em; |
614 | } | 614 | } |
615 | 615 | ||
616 | .active-current { | 616 | .active-current { |
@@ -753,24 +753,24 @@ a.add-to-wallabag-link-after:after { | |||
753 | 753 | ||
754 | 754 | ||
755 | /* .icon-image class, for image-based icons | 755 | /* .icon-image class, for image-based icons |
756 | ========================================================================== */ | 756 | ========================================================================== */ |
757 | 757 | ||
758 | .icon-image { | 758 | .icon-image { |
759 | background-size: 16px 16px; | 759 | background-size: 16px 16px; |
760 | background-repeat: no-repeat; | 760 | background-repeat: no-repeat; |
761 | background-position: center; | 761 | background-position: center; |
762 | padding-right: 1em !important; | 762 | padding-right: 1em !important; |
763 | padding-left: 1em !important; | 763 | padding-left: 1em !important; |
764 | } | 764 | } |
765 | 765 | ||
766 | /* Carrot (http://carrot.org) */ | 766 | /* Carrot (http://carrot.org) */ |
767 | .icon-image--carrot { | 767 | .icon-image--carrot { |
768 | background-image: url('../../_global/img/icons/carrot-icon--white.png'); | 768 | background-image: url('../../_global/img/icons/carrot-icon--white.png'); |
769 | } | 769 | } |
770 | 770 | ||
771 | /* Diaspora */ | 771 | /* Diaspora */ |
772 | .icon-image--diaspora { | 772 | .icon-image--diaspora { |
773 | background-image: url('../../_global/img/icons/diaspora-icon--black.png'); | 773 | background-image: url('../../_global/img/icons/diaspora-icon--black.png'); |
774 | }} | 774 | }} |
775 | 775 | ||
776 | /* ========================================================================== | 776 | /* ========================================================================== |
@@ -813,14 +813,14 @@ a.add-to-wallabag-link-after:after { | |||
813 | } | 813 | } |
814 | 814 | ||
815 | .more-info { | 815 | .more-info { |
816 | font-size: 0.85em; | 816 | font-size: 0.85em; |
817 | line-height: 1.5; | 817 | line-height: 1.5; |
818 | color: #aaa; | 818 | color: #aaa; |
819 | } | 819 | } |
820 | 820 | ||
821 | .more-info a { | 821 | .more-info a { |
822 | color: #aaa; | 822 | color: #aaa; |
823 | } | 823 | } |
824 | 824 | ||
825 | /* ========================================================================== | 825 | /* ========================================================================== |
826 | 5 = Article | 826 | 5 = Article |
@@ -934,9 +934,9 @@ blockquote { | |||
934 | } | 934 | } |
935 | 935 | ||
936 | pre code { | 936 | pre code { |
937 | font-family: "Courier New", Courier, monospace; | 937 | font-family: "Courier New", Courier, monospace; |
938 | border: 1px solid #ccc; | 938 | border: 1px solid #ccc; |
939 | font-size: 0.96em; | 939 | font-size: 0.96em; |
940 | } | 940 | } |
941 | 941 | ||
942 | #filter-form { | 942 | #filter-form { |
@@ -949,18 +949,18 @@ pre code { | |||
949 | padding: 15px; | 949 | padding: 15px; |
950 | padding-right: 30px; | 950 | padding-right: 30px; |
951 | padding-top: 30px; | 951 | padding-top: 30px; |
952 | 952 | border-left: 1px #333 solid; | |
953 | z-index: 12; | 953 | z-index: 12; |
954 | 954 | ||
955 | /*transition-property: transform; | 955 | /*transition-property: transform; |
956 | transition-duration: 0.3s; | 956 | transition-duration: 0.3s; |
957 | transition-delay: 0.3s; | 957 | transition-delay: 0.3s; |
958 | 958 | ||
959 | transform: translate3d(100%, 0, 0);*/ | 959 | transform: translate3d(100%, 0, 0);*/ |
960 | } | 960 | } |
961 | 961 | ||
962 | #filter-form form { | 962 | #filter-form form { |
963 | 963 | ||
964 | } | 964 | } |
965 | 965 | ||
966 | #filter-form form .filter-group { | 966 | #filter-form form .filter-group { |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig index 77483a09..dcdf7c09 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig | |||
@@ -98,25 +98,35 @@ | |||
98 | <h4 class="center">{% trans %}Filters{% endtrans %}</h1> | 98 | <h4 class="center">{% trans %}Filters{% endtrans %}</h1> |
99 | 99 | ||
100 | <div class="row"> | 100 | <div class="row"> |
101 | <div class="col s12"> | ||
102 | <label>{% trans %}Status{% endtrans %}</label> | ||
103 | </div> | ||
104 | |||
105 | <div class="input-field col s6 with-checkbox"> | ||
106 | {{ form_widget(form.isArchived) }} | ||
107 | <label for="entry_filter_isArchived">{% trans %}Archived{% endtrans %}</label> | ||
108 | </div> | ||
101 | 109 | ||
110 | <div class="input-field col s6 with-checkbox"> | ||
111 | {{ form_widget(form.isStarred) }} | ||
112 | <label for="entry_filter_isStarred">{% trans %}Starred{% endtrans %}</label> | ||
113 | </div> | ||
102 | 114 | ||
103 | <div class="col s12"> | 115 | <div class="col s12"> |
104 | <label>{% trans %}Status{% endtrans %}</label> | 116 | <label>{% trans %}Preview picture{% endtrans %}</label> |
105 | </div> | 117 | </div> |
106 | 118 | ||
107 | <div class="input-field col s6"> | 119 | <div class="input-field col s12 with-checkbox"> |
108 | {{ form_widget(form.previewPicture) }} | 120 | {{ form_widget(form.previewPicture) }} |
109 | <label for="entry_filter_previewPicture">{% trans %}Has a preview picture{% endtrans %}</label> | 121 | <label for="entry_filter_previewPicture">{% trans %}Has a preview picture{% endtrans %}</label> |
110 | </div> | 122 | </div> |
111 | 123 | ||
112 | <div class="input-field col s6"> | 124 | <div class="col s12"> |
113 | {{ form_widget(form.isArchived) }} | 125 | <label>{% trans %}Language{% endtrans %}</label> |
114 | <label for="entry_filter_isArchived">{% trans %}Archived{% endtrans %}</label> | ||
115 | </div> | 126 | </div> |
116 | 127 | ||
117 | <div class="input-field col s6"> | 128 | <div class="input-field col s12"> |
118 | {{ form_widget(form.isStarred) }} | 129 | {{ form_widget(form.language) }} |
119 | <label for="entry_filter_isStarred">{% trans %}Starred{% endtrans %}</label> | ||
120 | </div> | 130 | </div> |
121 | 131 | ||
122 | <div class="col s12"> | 132 | <div class="col s12"> |
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 144e259f..7a4e7df2 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 | |||
@@ -209,6 +209,11 @@ nav input { | |||
209 | overflow-y: visible; | 209 | overflow-y: visible; |
210 | } | 210 | } |
211 | 211 | ||
212 | #filters div.with-checkbox { | ||
213 | height: 3rem; | ||
214 | margin-top: 0px; | ||
215 | } | ||
216 | |||
212 | /* ========================================================================== | 217 | /* ========================================================================== |
213 | 4 = Cards | 218 | 4 = Cards |
214 | ========================================================================== */ | 219 | ========================================================================== */ |