Olivier Massot преди 2 години
родител
ревизия
557378e9ee

+ 13 - 4
components/Layout/Header/Menu.vue

@@ -46,7 +46,7 @@ header principal (configuration, paramètres du compte...)
           {{$t(menu.label)}}
         </v-card-title>
 
-        <v-card-text class="ma-0 pa-0 header-menu">
+        <v-card-text class="ma-0 pa-0 header-menu theme-neutral">
           <v-list density="compact" :subheader="true">
             <template v-for="(child, index) in menu.children" :key="index">
               <v-list-item
@@ -57,15 +57,14 @@ header principal (configuration, paramètres du compte...)
                 <v-list-item-title>
                     <span v-if="child.icon">
                       <v-avatar v-if="menu.icon.avatarId || child.icon.avatarByDefault" size="30">
-                        <UiImage :id="child.icon.avatarId" :defaultImage="child.icon.avatarByDefault" :width="30"></UiImage>
+                        <UiImage :id="child.icon.avatarId" :defaultImage="child.icon.avatarByDefault" :width="30" />
                       </v-avatar>
                       <v-icon v-else class="text-n-primary" size="small">
                         {{ child.icon.name }}
                       </v-icon>
                     </span>
 
-                  <span v-if="translateLabel">{{$t(child.label)}}</span>
-                  <span v-else>{{child.label}}</span>
+                  <span>{{ translateLabel ? $t(child.label) : child.label }}</span>
                 </v-list-item-title>
               </v-list-item>
 
@@ -118,3 +117,13 @@ const onStateUpdated = (e: any) => {
 const btn = ref(null)
 
 </script>
+
+<style scoped lang="scss">
+  .v-list {
+    padding: 0;
+  }
+
+  .header-menu .v-list .v-list-item:last-child {
+    border-bottom: none;
+  }
+</style>

+ 3 - 3
components/Layout/SubHeader/ActivityYear.vue

@@ -1,16 +1,16 @@
 <template>
-  <main class="d-flex flex-row align-center theme-neutral">
+  <main class="d-flex flex-row align-center">
     <span v-show="mdAndUp" class="mr-2 font-weight-bold">{{ $t(label) }} : </span>
 
     <UiXeditableText
-      class="activity-year-input bg-neutral"
+      class="activity-year-input"
       type="number"
       :data="currentActivityYear"
       @update="setActivityYear"
     >
       <template #xeditable.read="{inputValue}">
         <v-icon aria-hidden="false" size="small" class="text-nc-neutral mr-1" icon="fas fa-edit" />
-        <strong class="text-primary">
+        <strong class="text-nc-neutral">
           {{ inputValue }}
           <span v-if="yearPlusOne">
             / {{ parseInt(inputValue) + 1 }}

+ 0 - 1
components/Layout/SubHeader/Breadcrumbs.vue

@@ -1,7 +1,6 @@
 <template>
   <v-breadcrumbs
     :items="items"
-    class="theme-neutral"
   />
 </template>
 

+ 2 - 2
components/Layout/SubHeader/DataTiming.vue

@@ -1,5 +1,5 @@
 <template>
-  <main class="d-flex align-baseline theme-neutral">
+  <main class="d-flex align-baseline">
     <span v-show="mdAndUp" class="mr-2 font-weight-bold">{{ $t('display_data') }} : </span>
 
     <v-btn-toggle
@@ -18,7 +18,7 @@
           v-for="choice in historicalChoices"
           :value="choice"
           max-height="25"
-          :class="'font-weight-normal text-caption theme-neutral-soft' + (historicalValue.includes(choice) ? ' btn-selected' : '')"
+          :class="'font-weight-normal text-caption ' + (historicalValue.includes(choice) ? 'theme-primary' : 'theme-neutral-soft')"
       >
         <!-- TODO: on ne devrait pas avoir besoin du if et de la classe 'btn-selected' dans v-btn, mais à l'heure
          qu'il est, le component ne fonctionne pas comme attendu. A revoir quand vuetify 3 sera plus stable -->

+ 1 - 1
components/Layout/SubHeader/DataTimingRange.vue

@@ -1,5 +1,5 @@
 <template>
-  <main class="d-flex align-center data-timing-range theme-neutral">
+  <main class="d-flex align-center data-timing-range">
     <div v-if="show" class="d-flex align-center" style="max-height: 100%">
       <span class="pl-2 mr-2 font-weight-bold">
         {{ $t('period_choose') }}

+ 3 - 7
components/Layout/SubHeader/PersonnalizedList.vue

@@ -1,12 +1,8 @@
 <template>
-  <main class="theme-neutral">
-    <span
-        ref="btn"
-        class="text-nc-neutral"
-        style="cursor: pointer;"
-    >
+  <main>
+    <a ref="btn">
       {{ $t('my_list') }}
-    </span>
+    </a>
 
     <v-menu
         :activator="btn"

+ 9 - 2
components/Layout/Subheader.vue

@@ -6,6 +6,7 @@ Contient entre autres le breadcrumb, les commandes de changement d'année et les
 <template>
   <main>
     <v-card
+      id="subheader"
       class="d-md-flex theme-neutral text-body-2 px-2"
       flat
       rounded="0"
@@ -13,7 +14,7 @@ Contient entre autres le breadcrumb, les commandes de changement d'année et les
       <LayoutSubHeaderBreadcrumbs v-if="mdAndUp" class="mr-auto d-flex" />
 
       <v-card
-        class="d-md-flex pt-2 mr-6 align-baseline theme-neutral"
+        class="d-md-flex pt-2 mr-6 align-baseline"
         flat
         tile
       >
@@ -54,7 +55,13 @@ main {
   font-size: 12px;
 }
 
-.v-card {
+#subheader {
   max-height: 36px;
 }
+
+:deep(#subheader .v-card) {
+  max-height: 36px;
+  background-color: transparent !important;
+}
+
 </style>

+ 1 - 1
components/Ui/ExpansionPanel.vue

@@ -43,7 +43,7 @@ const props = defineProps({
     margin-right: 10px;
     flex: none !important;
   }
-  
+
   .v-expansion-panel-header {
     padding: 0;
     padding-right: 20px;

+ 1 - 1
config/theme.ts

@@ -55,7 +55,7 @@ export const lightTheme: Theme = {
 
         'neutral': '#e6e6e6',
         'n-neutral': '#666666',
-        'nc-neutral': '#00ad8e',
+        'nc-neutral': '#00997d',
 
         'neutral-soft': '#ecf0f5',
         'n-neutral-soft': '#464646',