From e9276b65c5118f8884dddab62824376420f10a81 Mon Sep 17 00:00:00 2001 From: Mateus Machado Luna Date: Mon, 20 May 2019 11:31:36 -0300 Subject: [PATCH] Home page on admin ajdusted to fill lines with necessary sapce. isCancel function imported byt filters. --- src/admin/pages/home-page.vue | 3 +-- src/admin/scss/_collection-home-cards.scss | 25 ++++++++++++++++++- .../autocomplete/Autocomplete.vue | 4 +-- .../filter-types/checkbox/Checkbox.vue | 4 +-- .../filter-types/selectbox/Selectbox.vue | 4 +-- .../filter-types/taginput/Taginput.vue | 4 +-- 6 files changed, 33 insertions(+), 11 deletions(-) diff --git a/src/admin/pages/home-page.vue b/src/admin/pages/home-page.vue index dd084e1af..f83f2ca43 100644 --- a/src/admin/pages/home-page.vue +++ b/src/admin/pages/home-page.vue @@ -168,7 +168,7 @@ export default { loadCollections() { this.cleanCollections(); this.isLoadingCollections = true; - this.fetchCollections({ page: 1, collectionsPerPage: 5, status: undefined, contextEdit: true }) + this.fetchCollections({ page: 1, collectionsPerPage: 9, status: undefined, contextEdit: true }) .then(() => { this.isLoadingCollections = false; }) @@ -255,7 +255,6 @@ export default { a { margin-right: 2rem; display: inline-flex; - overflow: hidden; text-overflow: ellipsis; white-space: nowrap; diff --git a/src/admin/scss/_collection-home-cards.scss b/src/admin/scss/_collection-home-cards.scss index 9c198dc70..f24a1c5a2 100644 --- a/src/admin/scss/_collection-home-cards.scss +++ b/src/admin/scss/_collection-home-cards.scss @@ -10,6 +10,28 @@ animation-name: item-appear; animation-duration: 0.5s; + &>div { + width: calc(100% + 25px) !important; + + &>div>.tainacan-card:nth-child(3), + &>div>.tainacan-card:nth-child(4), + &>div>.tainacan-card:nth-child(5), + &>div>.tainacan-card:nth-child(6), + &>div>.tainacan-card:nth-child(7), + &>div>.tainacan-card:nth-child(8), + &>div>.tainacan-card:nth-child(9), + &>div>.tainacan-card:nth-child(10) { + display: none; + } + + @media screen and (max-width: 768px) { + &>div>.tainacan-card:nth-child(3), + &>div>.tainacan-card:nth-child(4) { + display: block; + } + } + } + .tainacan-card { background-color: $gray1; padding: 0px; @@ -93,13 +115,14 @@ } .metadata-title { overflow: hidden; - padding: 0.75rem 1rem; + padding: 0.5rem 0.875rem; flex-basis: calc(100% - 96px); p { color: black !important; font-size: 0.875rem !important; margin-bottom: 0; + line-height: 1.125rem; } } &:hover .metadata-title { diff --git a/src/classes/filter-types/autocomplete/Autocomplete.vue b/src/classes/filter-types/autocomplete/Autocomplete.vue index ae85ed8c4..c2807a997 100644 --- a/src/classes/filter-types/autocomplete/Autocomplete.vue +++ b/src/classes/filter-types/autocomplete/Autocomplete.vue @@ -40,7 +40,7 @@