Merge branch 'feature/admin-filters' into develop

otto-torino · Dec 3, 2020 · 2b93ff9 · 2b93ff9
2 parents d0f846a + 5d09e42
commit 2b93ff9
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 6 deletions.
diff --git a/baton/static/baton/app/dist/baton.min.js b/baton/static/baton/app/dist/baton.min.js
diff --git a/baton/static/baton/app/dist/baton.min.js.map b/baton/static/baton/app/dist/baton.min.js.map
diff --git a/baton/static/baton/app/src/styles/_changelist.scss b/baton/static/baton/app/src/styles/_changelist.scss
@@ -191,7 +191,7 @@
     }
 
     #changelist-filter-clear {
-      background: lighten($filters-title-bg, 20%);
+      background: $filters-clear-bg;
       font-size: .9rem;
       margin-bottom: 0;
       margin-top: 0;

diff --git a/baton/static/baton/app/src/styles/_variables.scss b/baton/static/baton/app/src/styles/_variables.scss
@@ -83,6 +83,7 @@ $filters-bg: #fafafa;
 $filters-title-bg: #263238;
 $filters-title-color: #fff;
 $filter-selected-border-color: $base;
+$filters-clear-bg: #17a2b8;
 $rl-head-bg: #f0f0f0;
 $rl-head-color: inherit;
 $rl-tr-odd-bg: #fafafa;

diff --git a/baton/templates/admin/base_site.html b/baton/templates/admin/base_site.html
@@ -5,8 +5,8 @@
 
 {% block extrahead %}
     <meta content="width=device-width, initial-scale=1.0" name="viewport" />
-    <!-- <script src="{% static 'baton/app/dist/baton.min.js' %}"></script> -->
-    <script src="http://localhost:8080/dist/baton.min.js"></script>
+    <script src="{% static 'baton/app/dist/baton.min.js' %}"></script>
+    <!-- <script src="http://localhost:8080/dist/baton.min.js"></script> -->
     <script>
         {% baton_config 'CONFIRM_UNSAVED_CHANGES' as confirm_unsaved_changes %}
         {% baton_config 'SHOW_MULTIPART_UPLOADING' as show_multipart_uploading %}

diff --git a/baton/templates/baton/filters/input_filter.html b/baton/templates/baton/filters/input_filter.html
@@ -16,7 +16,7 @@ <h3>{% blocktrans with filter_title=title %} By {{ filter_title }} {% endblocktr
                         name="{{ spec.parameter_name }}"/>
 
                 {% if not all_choice.selected %}
-                    <a style="margin-top: .5rem;" href="{{ all_choice.query_string }}" class="btn btn-sm btn-secondary">x {% trans 'Remove' %}</a>
+                    <a style="margin-top: .5rem;" href="{{ all_choice.query_string }}" class="btn btn-sm btn-warning">x {% trans 'Remove' %}</a>
                 {% endif %}
 
             </form>