diff --git a/package-lock.json b/package-lock.json index 4a1b6ef32..6e2061173 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "impresso-frontend", - "version": "3.0.1", + "version": "3.0.5", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "impresso-frontend", - "version": "3.0.1", + "version": "3.0.5", "dependencies": { "@feathersjs/authentication-client": "5.0.25", "@feathersjs/feathers": "5.0.25", diff --git a/package.json b/package.json index c76680564..d4b148c0d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "impresso-frontend", - "version": "3.0.1", + "version": "3.0.5", "description": "Frontend app for impresso project", "author": "impresso ", "contributors": [ diff --git a/src/components/TextReuseExplorerPage.vue b/src/components/TextReuseExplorerPage.vue index 6f48c76cc..d4c909cbd 100644 --- a/src/components/TextReuseExplorerPage.vue +++ b/src/components/TextReuseExplorerPage.vue @@ -12,8 +12,8 @@ -
- +
+ -
+ +
{{ $t('no-jobs-yet') }}
@@ -135,7 +139,7 @@ />
- + @@ -667,6 +671,37 @@ export default defineComponent({ white-space: nowrap; } } + +#TheHeader.bg-dark .dropdown .dropdown-menu { + border-color: transparent; + background-color: var(--clr-grey-100); + color: var(--impresso-color-paper); + border-top-left-radius: var(--impresso-border-radius-sm); +} +#TheHeader.bg-dark .dropdown .btn.dropdown-toggle { + display: flex; + align-items: center; + color: var(--impresso-color-paper); + border-color: transparent; + padding: 0 var(--spacing-2); +} +#TheHeader.bg-dark .dropdown .btn.dropdown-toggle:focus-visible { + outline: none; + box-shadow: none; +} +#TheHeader.bg-dark .dropdown .btn.dropdown-toggle:not(.disabled):hover, +#TheHeader.bg-dark .dropdown .btn.dropdown-toggle:not(.disabled):focus { + background-color: var(--clr-grey-100); + border-radius: var(--impresso-border-radius-sm); + box-shadow: none; +} +#TheHeader.bg-dark .dropdown.show .btn.dropdown-toggle { + border-bottom-left-radius: 0 !important; + border-bottom-right-radius: 0 !important; +} +#TheHeader.bg-dark .dropdown-toggle[aria-expanded='true'] { + border-bottom: 1px solid var(--clr-grey-100) !important; +} @@ -682,7 +717,6 @@ export default defineComponent({ "label_search": "Search | Search* ({n} filter) | Search* ({n} filters)", "label_search_with_items": "Search | Search* ({n} filter, {items}) | Search* ({n} filters, {items})", "label_newspapers": "Newspapers", - "label_entities": "Entities", "label_explore": "explore...", "label_topics": "Topics", "label_entities": "Entities", diff --git a/src/components/UserArea.vue b/src/components/UserArea.vue index 2af533f6a..a73f5e6da 100644 --- a/src/components/UserArea.vue +++ b/src/components/UserArea.vue @@ -133,12 +133,15 @@ const userPicture = computed(() => { } .UserArea.bg-dark.dropdown .btn.dropdown-toggle:not(.disabled):hover, .UserArea.bg-dark.dropdown .btn.dropdown-toggle:not(.disabled):focus { - background-color: var(--clr-grey-100); + /* background-color: var(--clr-grey-100); */ + border-radius: var(--impresso-border-radius-sm); + /* box-shadow: none; */ } - -.UserArea.bg-dark .dropdown-toggle[aria-expanded='true'] { - border-bottom: 1px solid var(--clr-grey-100) !important; +.UserArea.bg-dark.dropdown.show .btn.dropdown-toggle { + border-bottom-left-radius: 0 !important; + border-bottom-right-radius: 0 !important; } + .UserArea__userLabel, .UserArea__userLabel .user-fullname, .UserArea__userLabel .user-role { diff --git a/src/components/modules/Pagination.vue b/src/components/modules/Pagination.vue index a16134c18..d06a1c788 100644 --- a/src/components/modules/Pagination.vue +++ b/src/components/modules/Pagination.vue @@ -227,18 +227,19 @@ const goToLast = () => { background-color: var(--impresso-color-black); } .bg-dark .Pagination .pagination { - border: 1px solid var(--clr-white); + border: 1px solid var(--clr-grey-200); border-radius: var(--impresso-border-radius-xs); overflow: hidden; } .bg-dark .Pagination .pagination li.page-item > a, .bg-dark .Pagination .pagination li.page-item > .page-link { background-color: var(--impresso-color-black); - color: var(--clr-white); - border-color: var(--clr-white-rgba-20); + color: var(--clr-grey-400); + border-color: var(--clr-grey-400); } .bg-dark .Pagination .pagination li.page-item.active > .page-link { - background-color: var(--clr-white); + background-color: var(--clr-grey-400); color: var(--impresso-color-black); + border-color: var(--clr-grey-400) !important; } diff --git a/src/components/modules/SearchQuerySummary.vue b/src/components/modules/SearchQuerySummary.vue index 41818a375..2dc4a614e 100644 --- a/src/components/modules/SearchQuerySummary.vue +++ b/src/components/modules/SearchQuerySummary.vue @@ -347,7 +347,6 @@ export default { span.item.newspaper, span.item.country { - color: black; font-family: var(--bs-font-serif); font-weight: bold; font-weight: var(--impresso-wght-bold); diff --git a/src/components/modules/collections/AddToCollection.vue b/src/components/modules/collections/AddToCollection.vue index cbf85cc84..977f0c0e3 100644 --- a/src/components/modules/collections/AddToCollection.vue +++ b/src/components/modules/collections/AddToCollection.vue @@ -6,9 +6,15 @@ v-on:shown="() => (show = true)" v-on:hidden="() => (show = false)" :text="title" + :right="right" >
- + {{ $t('login') }}
@@ -34,16 +40,15 @@ or --> -
- +
- {{ $t('actions.create') }} + {{ $t('actions.create') }} +
@@ -54,7 +59,7 @@ :key="item.uid" @click="() => $emit('item:click', item)" > - {{ i + 1 }} of {{ total }} + {{ i + 1 }} of {{ total }}
@@ -85,13 +90,17 @@ export default { name: 'AddToCollection', components: { List, - ItemLabel, + ItemLabel }, props: { title: { type: String, - required: true, + required: true }, + right: { + type: Boolean, + default: false + } }, emits: ['item:click', 'create'], data() { @@ -104,7 +113,7 @@ export default { q: '', total: -1, collections: [], - isLoading: false, + isLoading: false } }, computed: { @@ -116,14 +125,14 @@ export default { return { currentPage: this.paginationCurrentPage, perPage: this.paginationPerPage, - totalRows: this.total, + totalRows: this.total } }, searchApiQueryParameters() { if (!this.show) { return { query: {}, - hash: '', + hash: '' } } const query = { @@ -131,19 +140,16 @@ export default { page: this.paginationCurrentPage, limit: this.paginationPerPage, orderBy: this.orderBy, - q: this.q, + q: this.q } return { query, - hash: JSON.stringify(query) - .split('') - .sort() - .join(''), + hash: JSON.stringify(query).split('').sort().join('') } - }, + } }, methods: { - loadCollections() {}, + loadCollections() {} }, watch: { searchApiQueryParameters: { @@ -152,7 +158,7 @@ export default { if (!this.show || !this.isLoggedIn) { // eslint-disable-next-line console.debug( - '[AddToCollection] @searchApiQueryParameters \n cannot be loaded now.... not loggedin or dialog not shown', + '[AddToCollection] @searchApiQueryParameters \n cannot be loaded now.... not loggedin or dialog not shown' ) return } @@ -178,57 +184,47 @@ export default { creationDate: d.creation_date, lastModifiedDate: d.last_modified_date, countArticles: d.count_articles, - ...d, - }), + ...d + }) ) this.total = total this.isPristine = false }, - immediate: false, - }, - }, + immediate: false + } + } } - - { - "en": { - "no_collections_found": "No collections found", - "actions": { - "create": "new..." - } +{ + "en": { + "no_collections_found": "No collections found", + "actions": { + "create": "new..." } } +} diff --git a/src/components/modules/lists/JobItem.vue b/src/components/modules/lists/JobItem.vue index f005a8f89..ff35a40a1 100644 --- a/src/components/modules/lists/JobItem.vue +++ b/src/components/modules/lists/JobItem.vue @@ -1,6 +1,6 @@ @@ -162,19 +154,34 @@ export default { diff --git a/src/styles/style.css b/src/styles/style.css index 57f22e4c7..b15cdd871 100644 --- a/src/styles/style.css +++ b/src/styles/style.css @@ -170,7 +170,11 @@ h6.dropdown-header { font-weight: 450; font-variation-settings: 'wght' 450; } - +.btn-group-sm > .btn, +.input-group-sm > .input-group-append > .btn { + font-size: var(--impresso-font-size-smallcaps); + font-variation-settings: 'wght' var(--impresso-wght-smallcaps); +} b { font-weight: var(--impresso-wght-bold); font-variation-settings: 'wght' var(--impresso-wght-bold); @@ -310,6 +314,12 @@ label { background-color: transparent !important; border-bottom-color: var(--clr-grey-400) !important; } + +.btn-outline-white { + border-color: var(--clr-white) !important; + color: var(--clr-white) !important; +} + .btn-md { border-radius: var(--border-radius-md); box-shadow: var(--bs-box-shadow-sm); @@ -418,6 +428,11 @@ ul.nav.nav-pills .nav-item:hover .nav-link { .bg-dark .dropdown-toggle:hover { color: var(--white) !important; } +.bg-dark .dropdown .btn.dropdown-toggle:not(.disabled):hover, +.bg-dark .dropdown .btn.dropdown-toggle:not(.disabled):focus { + background-color: var(--clr-grey-100); + box-shadow: none; +} /* Bootstrap Modals */ .modal { z-index: 1041;