From f86c2b5fa6e8e681dbc6608e8272b63679336676 Mon Sep 17 00:00:00 2001 From: Simounet Date: Thu, 28 Dec 2017 20:24:39 +0100 Subject: Label replaced by a button on the nav search form --- app/Resources/static/themes/material/css/nav.scss | 10 ++++++++++ app/Resources/static/themes/material/css/various.scss | 10 ---------- .../Resources/views/themes/material/Entry/new_form.html.twig | 2 +- .../views/themes/material/Entry/search_form.html.twig | 1 + .../Resources/views/themes/material/layout.html.twig | 1 - web/wallassets/material.css | 2 +- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/app/Resources/static/themes/material/css/nav.scss b/app/Resources/static/themes/material/css/nav.scss index 7191a71a..f5447b8c 100644 --- a/app/Resources/static/themes/material/css/nav.scss +++ b/app/Resources/static/themes/material/css/nav.scss @@ -116,6 +116,16 @@ nav .nav-wrapper i { } } +.nav-form-button { + padding: 0 1rem; + background-color: transparent; + border: none; + + &:focus { + background-color: inherit; + } +} + #button_filters { display: none; } diff --git a/app/Resources/static/themes/material/css/various.scss b/app/Resources/static/themes/material/css/various.scss index 9d2f94f5..ba6570f2 100644 --- a/app/Resources/static/themes/material/css/various.scss +++ b/app/Resources/static/themes/material/css/various.scss @@ -24,16 +24,6 @@ nav .input-field input { padding-left: 0.5rem; } -.new-entry-button { - padding: 0 1rem; - background-color: transparent; - border: none; - - &:focus { - background-color: inherit; - } -} - .tabs { display: flex; } 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 42f3c2cf..8d5d053e 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,7 +2,7 @@ {% if form_errors(form) %} {{ form_errors(form) }} {% endif %} - + {% if form_errors(form.url) %} {{ form_errors(form.url) }} 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 f25de94d..ba8a8454 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,6 +2,7 @@ {% if form_errors(form) %} {{ form_errors(form) }} {% endif %} + {% if form_errors(form.term) %} {{ form_errors(form.term) }} 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 66918db0..aa1e8a10 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig @@ -125,7 +125,6 @@