Merge pull request #1299 from GrabowskiM/EZP-31447-remove-button-misa…

…ligned-in-search EZP-31447: Remove button in search criteria for 'creator' field is not displayed propertly
ezsystems · Mar 23, 2020 · 7e0d2c2 · 7e0d2c2
2 parents 03ac0b9 + d7b960e
commit 7e0d2c2
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 26 deletions.
diff --git a/src/bundle/Resources/public/scss/_filters.scss b/src/bundle/Resources/public/scss/_filters.scss
@@ -48,24 +48,30 @@
         &--creator {
             position: relative;
 
-            .ez-filters__input {
-                + .ez-icon {
-                    display: none;
+            .ez-filters {
+                &__input-wrapper {
+                    position: relative;
                 }
 
-                &:disabled {
-                    cursor: auto;
-                    background-color: $ez-color-base-pale;
-                    color: $ez-black;
-                    padding-right: calculateRem(32px);
-                    text-overflow: ellipsis;
-
-                    & + .ez-icon {
-                        display: block;
-                        position: absolute;
-                        bottom: calculateRem(7px);
-                        right: calculateRem(6px);
-                        cursor: pointer;
+                &__input {
+                    + .ez-icon {
+                        display: none;
+                    }
+
+                    &:disabled {
+                        cursor: auto;
+                        background-color: $ez-color-base-pale;
+                        color: $ez-black;
+                        padding-right: calculateRem(32px);
+                        text-overflow: ellipsis;
+
+                        & + .ez-icon {
+                            display: block;
+                            position: absolute;
+                            bottom: calculateRem(7px);
+                            right: calculateRem(6px);
+                            cursor: pointer;
+                        }
                     }
                 }
             }

diff --git a/src/bundle/Resources/views/themes/admin/ui/search/form.html.twig b/src/bundle/Resources/views/themes/admin/ui/search/form.html.twig
@@ -151,16 +151,18 @@
         <div class="ez-filters__item ez-filters__item--creator">
             <label class="ez-filters__item-label">{{ 'search.creator'|trans|desc('Creator:') }}</label>
             {% set creator = form.vars.data.creator %}
-            <input type="text"
-                class="form-control ez-filters__input"
-                data-content-type-identifiers="{{ user_content_type_identifier|join(',') }}"
-                value="{{ creator is not empty ? ez_content_name(creator) }}"
-                placeholder="{{ 'search.creator_input.placeholder'|trans|desc('Type creator\'s name') }}"
-                {{ creator is not empty ? 'disabled'  }}
-            >
-            <svg class="ez-icon ez-icon--dark ez-icon--medium ez-icon--reset">
-                <use xlink:href="/bundles/ezplatformadminui/img/ez-icons.svg#circle-close"></use>
-            </svg>
+            <div class="ez-filters__input-wrapper">
+                <input type="text"
+                    class="form-control ez-filters__input"
+                    data-content-type-identifiers="{{ user_content_type_identifier|join(',') }}"
+                    value="{{ creator is not empty ? ez_content_name(creator) }}"
+                    placeholder="{{ 'search.creator_input.placeholder'|trans|desc('Type creator\'s name') }}"
+                    {{ creator is not empty ? 'disabled'  }}
+                >
+                <svg class="ez-icon ez-icon--dark ez-icon--medium ez-icon--reset">
+                    <use xlink:href="/bundles/ezplatformadminui/img/ez-icons.svg#circle-close"></use>
+                </svg>
+            </div>
             <ul class="ez-filters__user-list ez-filters__user-list--hidden"></ul>
         </div>
     </div>