From 882da4a90a41b3f53b8cc28360587d29d6e7102d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Delafontaine?= Date: Thu, 4 Apr 2024 11:56:03 +0200 Subject: [PATCH 1/8] THE-1167 couleur skeleton --- app.vue | 4 ++++ components/common/Keywords.vue | 5 ----- components/common/results/ResultComponents.vue | 4 ++-- plugins/vuetify.ts | 6 ++++-- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/app.vue b/app.vue index 6d946e78..ded9ec3f 100644 --- a/app.vue +++ b/app.vue @@ -509,4 +509,8 @@ h4 { order: 10; } } + +.skeleton, .skeleton-cards { + background-color: rgb(var(--v-theme-gris-skeleton)) !important; +} \ No newline at end of file diff --git a/components/common/Keywords.vue b/components/common/Keywords.vue index 5e78cef1..0cc15abd 100644 --- a/components/common/Keywords.vue +++ b/components/common/Keywords.vue @@ -376,11 +376,6 @@ h3 { transform: rotate(180deg); } -:deep(.v-skeleton-loader__button) { - max-width: unset !important; - justify-self: end; -} - .legend-tooltip { display: flex; flex-direction: column; diff --git a/components/common/results/ResultComponents.vue b/components/common/results/ResultComponents.vue index a9773f2e..915938dc 100644 --- a/components/common/results/ResultComponents.vue +++ b/components/common/results/ResultComponents.vue @@ -46,7 +46,7 @@
-
+
@@ -189,7 +189,7 @@ watch(() => props.resetPage, () => { min-height: 190px; } -.skeleton { +.skeleton-wrapper { padding: 0; display: grid; grid-template-columns: 95% diff --git a/plugins/vuetify.ts b/plugins/vuetify.ts index 9173b80e..0ffb0baa 100644 --- a/plugins/vuetify.ts +++ b/plugins/vuetify.ts @@ -22,7 +22,8 @@ const abesLightTheme = { 'fond-noir': "#000000", 'text-dark-blue': "#0B2134", 'fond-chip-blue': "#ABB9D5", - 'white-text': "#FFFFFF" + 'white-text': "#FFFFFF", + 'gris-skeleton' : '#e6e6e6', } } @@ -46,7 +47,8 @@ const abesDarkTheme = { 'fond-noir': "#000000", 'text-dark-blue': "#FFFFFF", 'fond-chip-blue': "#ABB9D5", - 'white-text': "#FFFFFF" + 'white-text': "#FFFFFF", + 'gris-skeleton' : '#55586d', } } From 9da2aef381fad8d459a0c4a90568bbfe0a55b9db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Delafontaine?= Date: Thu, 4 Apr 2024 12:20:51 +0200 Subject: [PATCH 2/8] THE-1167 couleur alert + couleur bouton retour accueil en page d'erreur --- error.vue | 8 +++++--- plugins/vuetify.ts | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/error.vue b/error.vue index 402f8110..0ea024d8 100644 --- a/error.vue +++ b/error.vue @@ -39,7 +39,9 @@ const handleError = () => clearError({ redirect: '/' }) - \ No newline at end of file diff --git a/components/common/Keywords.vue b/components/common/Keywords.vue index 0cc15abd..01fc2f03 100644 --- a/components/common/Keywords.vue +++ b/components/common/Keywords.vue @@ -285,11 +285,11 @@ h3 { margin-top: unset !important; .free-chip { - background-color: rgb(var(--v-theme-secondary-darken-2)) !important; + background-color: rgb(var(--v-theme-secondary-darken-3)) !important; } .rameau-chip { - background-color: rgb(var(--v-theme-orange-abes)) !important; + background-color: rgb(var(--v-theme-orange-abes-thesaurus)) !important; } .chips { @@ -316,7 +316,7 @@ h3 { font-family: Roboto Black, sans-serif; font-weight: 600; font-size: 16px; - color: rgb(var(--v-theme-surface)); + color: rgb(var(--v-theme-white-text)); } .v-chip--disabled { @@ -376,6 +376,11 @@ h3 { transform: rotate(180deg); } +:deep(.v-skeleton-loader__button) { + max-width: unset !important; + justify-self: end; +} + .legend-tooltip { display: flex; flex-direction: column; @@ -385,4 +390,8 @@ h3 { width: fit-content; } } + +:deep(.v-chip__underlay) { + opacity: 0 !important; +} \ No newline at end of file diff --git a/components/theses/ButtonsList.vue b/components/theses/ButtonsList.vue index 967d3655..455cf2f3 100644 --- a/components/theses/ButtonsList.vue +++ b/components/theses/ButtonsList.vue @@ -29,12 +29,12 @@
- {{ b.libelle }} - {{ b.libelle }} @@ -64,7 +64,7 @@
- {{ b.libelle }} @@ -454,4 +454,9 @@ h4 { margin-left: 10px; } } + +.thesis-access-buttons { + background-color: rgb(var(--v-theme-secondary-darken-3)); + color: rgb(var(--v-theme-white-text)); +} diff --git a/components/theses/results/ResultCard.vue b/components/theses/results/ResultCard.vue index 61a007e9..3164d340 100644 --- a/components/theses/results/ResultCard.vue +++ b/components/theses/results/ResultCard.vue @@ -127,14 +127,6 @@ const route = useRoute(); \ No newline at end of file diff --git a/components/common/DomainSelector.vue b/components/common/DomainSelector.vue index 956a7675..239088d4 100644 --- a/components/common/DomainSelector.vue +++ b/components/common/DomainSelector.vue @@ -94,7 +94,8 @@ watch(() => currentRoute.path, () => { } .v-divider { - color: #0b2134; + color: rgb(var(--v-theme-gris-fonce)); + opacity: 0.5; border-width: 0 2px 0 0; margin: 0 2rem 0 2rem; diff --git a/components/common/Keywords.vue b/components/common/Keywords.vue index 01fc2f03..7e0d3c83 100644 --- a/components/common/Keywords.vue +++ b/components/common/Keywords.vue @@ -12,7 +12,8 @@

{{ $t("motCleControle") }}

- + + mdi-information-outline Informations sur les mots clés @@ -270,6 +271,11 @@ h3 { color: rgb(var(--v-theme-text-dark-blue)) } +.info-button { + min-width: unset; + padding: 0 8px; +} + .mdi-list-box.v-icon--size-default { font-size: 30px; width: 35px; diff --git a/components/personnes/search/SearchBar.vue b/components/personnes/search/SearchBar.vue index f8cb62ac..dfb3f037 100644 --- a/components/personnes/search/SearchBar.vue +++ b/components/personnes/search/SearchBar.vue @@ -259,6 +259,10 @@ defineExpose({ :deep(.v-combobox__selection) { overflow: hidden !important; } + + :deep(.v-label) { + opacity: 1 !important; + } } .searchbar__action { @@ -361,6 +365,10 @@ defineExpose({ :deep(.v-field--appended) { padding-inline-end: 0 !important; } + +:deep(.v-field__outline) { + --v-field-border-opacity: 1 !important; +} \ No newline at end of file diff --git a/plugins/vuetify.ts b/plugins/vuetify.ts index 9a594a0e..f160c6e1 100644 --- a/plugins/vuetify.ts +++ b/plugins/vuetify.ts @@ -26,6 +26,7 @@ const abesLightTheme = { 'fond-chip-blue': "#ABB9D5", 'white-text': "#FFFFFF", 'gris-skeleton' : '#e6e6e6', + 'gris-switch': '#595759' } } @@ -53,6 +54,7 @@ const abesDarkTheme = { 'fond-chip-blue': "#ABB9D5", 'white-text': "#FFFFFF", 'gris-skeleton' : '#55586d', + 'gris-switch': '#b3b2b4' } } From e6044b105e5dbe49f5fe0fee376a4afb0245b7bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Delafontaine?= Date: Thu, 4 Apr 2024 17:24:58 +0200 Subject: [PATCH 8/8] =?UTF-8?q?THE-1167=20contrastes=20switches=20mobile?= =?UTF-8?q?=20et=20recherche=20avanc=C3=A9e=20+=20suppression=20header=20t?= =?UTF-8?q?ooltips=20mobile=20+=20inversion=20mots=20cles=20controlles=20t?= =?UTF-8?q?exte=20blanc=20sur=20fond=20orange=20vers=20texte=20bleu=20sur?= =?UTF-8?q?=20fond=20blanc=20+=20changemenent=20icone=20exporter=20these?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/common/ExportButton.vue | 7 +------ components/common/HeaderMobile.vue | 17 ++++++++--------- components/common/Keywords.vue | 1 + components/theses/search/AdvancedForm.vue | 4 ++++ plugins/vuetify.ts | 6 ++++-- 5 files changed, 18 insertions(+), 17 deletions(-) diff --git a/components/common/ExportButton.vue b/components/common/ExportButton.vue index 99e6a588..66b47a8c 100644 --- a/components/common/ExportButton.vue +++ b/components/common/ExportButton.vue @@ -1,12 +1,7 @@