Merge branch '1.4'

* 1.4: Scaling text input field to keep enough room for the buttons
ezecosystem · Feb 11, 2019 · d13afde · d13afde
2 parents b126174 + 81e1dbb
commit d13afde
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/src/Sylius/Bundle/ShopBundle/Resources/private/scss/style.scss b/src/Sylius/Bundle/ShopBundle/Resources/private/scss/style.scss
@@ -31,3 +31,15 @@ body {
 .ui.unmargined.segments {
   margin: 0;
 }
+
+#searchbar {
+    display: flex;
+}
+
+#searchbarTextField {
+    flex-grow: 100;
+}
+
+#searchbarButtons {
+    width: fit-content;
+}
diff --git a/src/Sylius/Bundle/ShopBundle/Resources/views/Product/Index/_search.html.twig b/src/Sylius/Bundle/ShopBundle/Resources/views/Product/Index/_search.html.twig
@@ -1,12 +1,12 @@
 <div class="ui segment">
     <form method="get" action="{{ path('sylius_shop_product_index', {'slug': app.request.attributes.get('slug')}) }}" class="ui loadable form">
-        <div class="ui stackable grid">
-            <div class="eleven wide column">
+        <div class="ui stackable grid" id="searchbar">
+            <div class="column" id="searchbarTextField">
                 {% for filter in products.definition.enabledFilters %}
                     {{ sylius_grid_render_filter(products, filter) }}
                 {% endfor %}
             </div>
-            <div class="three wide column">
+            <div class="right aligned column" id="searchbarButtons">
                 <div class="ui buttons">
                     <button type="submit" class="ui primary icon labeled button"><i class="search icon"></i> {{ 'sylius.ui.search'|trans }}</button>
                     <a href="{{ path('sylius_shop_product_index', {'slug': app.request.attributes.get('slug')}) }}" class="ui negative icon labeled button">