diff --git a/assets/js/Components/Listing/Row.vue b/assets/js/Components/Listing/Row.vue index da2b0ca7..85494953 100644 --- a/assets/js/Components/Listing/Row.vue +++ b/assets/js/Components/Listing/Row.vue @@ -1,5 +1,5 @@ + + \ No newline at end of file diff --git a/assets/js/Views/listing.js b/assets/js/Views/listing.js index 9b4b2602..850c7ea0 100644 --- a/assets/js/Views/listing.js +++ b/assets/js/Views/listing.js @@ -8,6 +8,7 @@ import draggable from 'vuedraggable' */ import Filter from "../Components/Listing/Filter"; import Row from "../Components/Listing/Row"; +import SelectedBox from "../Components/Listing/SelectedBox"; /** * Register Components @@ -15,5 +16,6 @@ import Row from "../Components/Listing/Row"; Vue.component("listing-filter", Filter); Vue.component("listing-row", Row); Vue.component("draggable", draggable); +Vue.component("listing-selected-box", SelectedBox); new Vue({ el: "#listing", name: "listing" }); diff --git a/assets/scss/modules/base/_badge.scss b/assets/scss/modules/base/_badge.scss new file mode 100644 index 00000000..84f1f6ce --- /dev/null +++ b/assets/scss/modules/base/_badge.scss @@ -0,0 +1,15 @@ +//** Base | Badge + +.badge{ + &.is-primary{ + background: var(--primary); + color: var(--foreground); + padding: 0 $spacer / 4; + text-align: center; + display: inline-flex; + align-items: center; + justify-content: center; + font-weight: $font-weight-bold; + border-radius: $border-radius; + } +} \ No newline at end of file diff --git a/assets/scss/modules/base/base.scss b/assets/scss/modules/base/base.scss index cf33f4d9..761b5024 100644 --- a/assets/scss/modules/base/base.scss +++ b/assets/scss/modules/base/base.scss @@ -2,4 +2,5 @@ @import '_status'; @import '_pagination'; -@import '_notification' +@import '_notification'; +@import '_badge'; diff --git a/assets/scss/modules/listing/_row.scss b/assets/scss/modules/listing/_row.scss index f77ac9a6..bd812590 100644 --- a/assets/scss/modules/listing/_row.scss +++ b/assets/scss/modules/listing/_row.scss @@ -32,9 +32,6 @@ $checkbox-row-width: 30px; top: 0; width: 100%; height: 100%; - &:hover{ - cursor: pointer; - } &:before, &:after{ left: $spacer / 4; top: 50%; @@ -184,6 +181,7 @@ $checkbox-row-width: 30px; .quickedit__row{ min-height: 200px; + flex: auto; box-shadow: $card-box-shadow; display: flex; z-index: 99; diff --git a/templates/content/listing.twig b/templates/content/listing.twig index 310a91d8..7bba371d 100644 --- a/templates/content/listing.twig +++ b/templates/content/listing.twig @@ -20,6 +20,11 @@ {% block aside %} + +
{{ 'title.contentlisting'|trans }}