diff options
| author | Jérémy Benoist <j0k3r@users.noreply.github.com> | 2019-10-11 09:08:58 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-11 09:08:58 +0200 |
| commit | ce4c2ead4bee67d44192e15975b85f7bed28b623 (patch) | |
| tree | 82959626486896d4ced832388984fca0329829b9 | |
| parent | afe486531d4dfffff7522efecdff1bcf18d13994 (diff) | |
| parent | 652cb58d59c9cb3d1f448914e0568e87eba90b16 (diff) | |
| download | wallabag-ce4c2ead4bee67d44192e15975b85f7bed28b623.tar.gz wallabag-ce4c2ead4bee67d44192e15975b85f7bed28b623.tar.zst wallabag-ce4c2ead4bee67d44192e15975b85f7bed28b623.zip | |
Merge pull request #4149 from ldidry/fix-4130
🐛 — Fix duplicated icons on "Search engine" and "new link" forms
| -rw-r--r-- | src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/new_form.html.twig | 4 | ||||
| -rw-r--r-- | src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/search_form.html.twig | 4 |
2 files changed, 4 insertions, 4 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 e0d5e794..4cf81167 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 | |||
| @@ -2,14 +2,14 @@ | |||
| 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 %} |
| 5 | <button type="submit" class="nav-form-button"><i class="material-icons add">add</i></button> | 5 | <button type="submit" class="nav-form-button" aria-label="add"><i class="material-icons add" aria-hidden="true"></i></button> |
| 6 | 6 | ||
| 7 | {% if form_errors(form.url) %} | 7 | {% if form_errors(form.url) %} |
| 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, { '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 | <i class="material-icons close" aria-label="clear" role="button"></i> |
| 13 | 13 | ||
| 14 | {{ form_rest(form) }} | 14 | {{ form_rest(form) }} |
| 15 | </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 ba1b3aac..0ae8b0b3 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 | |||
| @@ -2,7 +2,7 @@ | |||
| 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 %} |
| 5 | <button type="submit" class="nav-form-button"><i class="material-icons search">search</i></button> | 5 | <button type="submit" class="nav-form-button" aria-label="search"><i class="material-icons search" aria-hidden="true"></i></button> |
| 6 | 6 | ||
| 7 | {% if form_errors(form.term) %} | 7 | {% if form_errors(form.term) %} |
| 8 | <span class="black-text">{{ form_errors(form.term) }}</span> | 8 | <span class="black-text">{{ form_errors(form.term) }}</span> |
| @@ -11,7 +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 | <i class="material-icons close" aria-label="clear" role="button"></i> |
| 15 | 15 | ||
| 16 | {{ form_rest(form) }} | 16 | {{ form_rest(form) }} |
| 17 | </form> | 17 | </form> |