diff --git a/app/assets/stylesheets/repository/bmt_filters.scss b/app/assets/stylesheets/repository/bmt_filters.scss index eb17a0ceb..de4a60401 100644 --- a/app/assets/stylesheets/repository/bmt_filters.scss +++ b/app/assets/stylesheets/repository/bmt_filters.scss @@ -1,12 +1,36 @@ #bmtFilterContainer { - min-width: 300px; + min-width: 422px; z-index: 100; + label { + font-weight: normal; + } + + .form-group { + display: block; + width: 100%; + + .form-control, + .form-select { + margin-bottom: 21px; + width: 100%; + } + } + + .checkbox-label { + vertical-align: text-bottom; + } + + .filter-list-notice { + color: $color-silver-chalice; + padding: 16px; + } + .header { align-items: center; border-bottom: $border-tertiary; display: flex; - padding: .5em 1em; + padding: 0 1em; .title { @include font-h2; @@ -16,19 +40,37 @@ .filter-element { align-items: center; + border-bottom: $border-tertiary; display: flex; + padding: 15px 52px 15px 15px; + position: relative; + } + + .filter-remove { + padding: 0; + position: absolute; + right: 16px; + top: 16px; + + .btn { + height: 16px; + padding: 0; + width: 16px; + } + + .btn:hover { + background: $color-white; + } } .filters-list { border-top: $border-tertiary; - padding: .5em 1em; } .footer { align-items: center; border-top: $border-tertiary; display: flex; - padding: .5em 1em; .add-filter { margin-right: auto; diff --git a/app/javascript/.eslintrc.json b/app/javascript/.eslintrc.json index 602de750e..c3295ac1b 100644 --- a/app/javascript/.eslintrc.json +++ b/app/javascript/.eslintrc.json @@ -16,6 +16,7 @@ "jsx": true } }, + "ignorePatterns": ["*.vue", "**/mixins/*.js"], "rules": { "import/extensions": "off", "import/no-unresolved": "off", diff --git a/app/javascript/packs/vue/bmt_filter.js b/app/javascript/packs/vue/bmt_filter.js index a1938e366..2ac28efe6 100644 --- a/app/javascript/packs/vue/bmt_filter.js +++ b/app/javascript/packs/vue/bmt_filter.js @@ -3,7 +3,7 @@ import Vue from 'vue/dist/vue.esm'; import FilterContainer from '../../vue/bmt_filter/container.vue'; Vue.use(TurbolinksAdapter); - +Vue.prototype.i18n = window.I18n; window.initBMTFilter = () => { const app = new Vue({ @@ -13,8 +13,5 @@ window.initBMTFilter = () => { } }); - $('#bmtFilterContainer').on('click', (e) => { - e.preventDefault(); - e.stopPropagation(); - }); + $('#bmtFilterContainer').on('click', (e) => e.stopPropagation()); }; diff --git a/app/javascript/vue/bmt_filter/container.vue b/app/javascript/vue/bmt_filter/container.vue index 9793d94b3..44db6fba2 100644 --- a/app/javascript/vue/bmt_filter/container.vue +++ b/app/javascript/vue/bmt_filter/container.vue @@ -10,7 +10,16 @@
- +
+

{{ i18n.t('repositories.show.bmt_search.no_filters') }}

+
+