diff --git a/client/src/components/EventBilling/EventBilling.vue b/client/src/components/EventBilling/EventBilling.vue index 416fc9f4a..4f755e496 100644 --- a/client/src/components/EventBilling/EventBilling.vue +++ b/client/src/components/EventBilling/EventBilling.vue @@ -84,7 +84,6 @@ :key="beneficiaries[0].id" :to="`/beneficiaries/${beneficiaries[0].id}`" :title="$t('action-edit')" - tag="a" > {{ beneficiaries[0].full_name }} diff --git a/client/src/components/EventOverview/EventOverview.vue b/client/src/components/EventOverview/EventOverview.vue index 8454ed685..4d8803730 100644 --- a/client/src/components/EventOverview/EventOverview.vue +++ b/client/src/components/EventOverview/EventOverview.vue @@ -31,7 +31,6 @@ {{ beneficiary.full_name }} @@ -39,7 +38,6 @@ v-if="beneficiary.company" :to="`/companies/${beneficiary.company_id}`" :title="$t('action-edit')" - tag="a" > ({{ beneficiary.company.legal_name }}) @@ -64,7 +62,6 @@ diff --git a/client/src/components/MainHeader/TopMenu/TopMenu.scss b/client/src/components/MainHeader/TopMenu/TopMenu.scss index 614c086ce..15b200b34 100644 --- a/client/src/components/MainHeader/TopMenu/TopMenu.scss +++ b/client/src/components/MainHeader/TopMenu/TopMenu.scss @@ -24,6 +24,8 @@ right: 0; width: $main-header-dropdown-width; z-index: 99; + margin: 0; + padding: 0; background: $bg-color-main-header; box-shadow: -2px 6px 6px rgba(0, 0, 0, 0.25); transform-origin: 50% 0%; @@ -44,6 +46,15 @@ font-size: $side-nav-icon-size; margin-right: $content-padding-small-vertical; } + + &--active { + background-color: $bg-color-side-menu-item-active; + color: $link-active-color; + + &:hover { + background-color: $bg-color-side-menu-item-active; + } + } } &--open { diff --git a/client/src/components/MainHeader/TopMenu/TopMenu.vue b/client/src/components/MainHeader/TopMenu/TopMenu.vue index dae98379f..a2267a51f 100644 --- a/client/src/components/MainHeader/TopMenu/TopMenu.vue +++ b/client/src/components/MainHeader/TopMenu/TopMenu.vue @@ -5,35 +5,38 @@ -
{{ nickname }}
- - - {{$t('your-profile')}} + +
  • + + {{$t('your-profile')}} +
  • - - - {{$t('your-settings')}} + +
  • + + {{$t('your-settings')}} +
  • - - {{$t('logout-quit')}} + {{$t('logout-quit')}}
    -
    + diff --git a/client/src/components/MultipleItem/MultipleItem.vue b/client/src/components/MultipleItem/MultipleItem.vue index ce834a9d5..0b7ced22a 100644 --- a/client/src/components/MultipleItem/MultipleItem.vue +++ b/client/src/components/MultipleItem/MultipleItem.vue @@ -53,12 +53,10 @@

    {{ $t('no-result-found-try-another-search') }}

    - - {{ $t('create-select-item-label', { label: $t(label) }) }} + +
    diff --git a/client/src/components/PersonForm/PersonForm.vue b/client/src/components/PersonForm/PersonForm.vue index 5ca87b524..86be7aedf 100644 --- a/client/src/components/PersonForm/PersonForm.vue +++ b/client/src/components/PersonForm/PersonForm.vue @@ -42,10 +42,12 @@ - {{ $t('page-companies.edit-btn') }} + diff --git a/client/src/components/SideNav/SideMenu/SideMenu.vue b/client/src/components/SideNav/SideMenu/SideMenu.vue index 94ac84263..0750b6bbf 100644 --- a/client/src/components/SideNav/SideMenu/SideMenu.vue +++ b/client/src/components/SideNav/SideMenu/SideMenu.vue @@ -2,75 +2,123 @@
    -
    - {{$t('page-calendar.title')}} +
  • +
    + {{$t('page-calendar.title')}} +
  • -
    - {{$t('page-materials.title')}} +
  • +
    + {{$t('page-materials.title')}} +
  • -
    - {{$t('page-technicians.title')}} +
  • +
    + {{$t('page-technicians.title')}} +
  • -
    - {{$t('page-beneficiaries.title')}} +
  • +
    + {{$t('page-beneficiaries.title')}} +
  • -
    - {{$t('page-categories.title')}} +
  • +
    + {{$t('page-categories.title')}} +
  • -
    - {{$t('page-tags.title')}} +
  • +
    + {{$t('page-tags.title')}} +
  • -
    - {{$t('page-parks.title')}} +
  • +
    + {{$t('page-parks.title')}} +
  • -
    - {{$t('page-users.title')}} +
  • +
    + {{$t('page-users.title')}} +
  • diff --git a/client/src/pages/Beneficiaries/Beneficiaries.vue b/client/src/pages/Beneficiaries/Beneficiaries.vue index 150b1e820..f82c085cf 100644 --- a/client/src/pages/Beneficiaries/Beneficiaries.vue +++ b/client/src/pages/Beneficiaries/Beneficiaries.vue @@ -11,11 +11,16 @@
    - - {{ $t('page-beneficiaries.action-add') }} +
    @@ -32,7 +37,6 @@ v-if="beneficiary.row.company" v-tooltip="$t('action-edit')" :to="`/companies/${beneficiary.row.company.id}`" - tag="a" > {{ beneficiary.row.company.legal_name }} @@ -72,10 +76,12 @@ v-if="!isTrashDisplayed" v-tooltip="$t('action-edit')" :to="`/beneficiaries/${beneficiary.row.id}`" - tag="button" - class="item-actions__button info" + v-slot="{ navigate }" + custom > - +
    diff --git a/client/src/pages/Calendar/EventDetails/Header/Header.vue b/client/src/pages/Calendar/EventDetails/Header/Header.vue index 1618eacfe..8ca602570 100644 --- a/client/src/pages/Calendar/EventDetails/Header/Header.vue +++ b/client/src/pages/Calendar/EventDetails/Header/Header.vue @@ -23,10 +23,12 @@ v-show="!isVisitor" :to="`/events/${event.id}`" :disabled="event.isConfirmed" - tag="button" - class="info" + v-slot="{ navigate }" + custom > - {{ $t('action-edit') }} + diff --git a/client/src/pages/Company/Company.vue b/client/src/pages/Company/Company.vue index bed147819..598e40f23 100644 --- a/client/src/pages/Company/Company.vue +++ b/client/src/pages/Company/Company.vue @@ -24,10 +24,7 @@ class="Company__persons__item" > - + {{ person.full_name }} diff --git a/client/src/pages/Event/Step5/Step5.vue b/client/src/pages/Event/Step5/Step5.vue index 7cfa463e3..799df142f 100644 --- a/client/src/pages/Event/Step5/Step5.vue +++ b/client/src/pages/Event/Step5/Step5.vue @@ -52,14 +52,11 @@
    - - - {{ $t('page-events.back-to-calendar') }} + +
    diff --git a/client/src/pages/MaterialView/Infos/Infos.vue b/client/src/pages/MaterialView/Infos/Infos.vue index f5d8b5661..7f95d9205 100644 --- a/client/src/pages/MaterialView/Infos/Infos.vue +++ b/client/src/pages/MaterialView/Infos/Infos.vue @@ -63,11 +63,13 @@ - - {{ $t('action-edit') }} +
    diff --git a/client/src/pages/Materials/Materials.vue b/client/src/pages/Materials/Materials.vue index 20c8ce1dd..03ae22956 100644 --- a/client/src/pages/Materials/Materials.vue +++ b/client/src/pages/Materials/Materials.vue @@ -13,13 +13,11 @@ baseRoute="/materials" @change="refreshTableAndPagination" /> - - - {{ $t('page-materials.action-add') }} + +
    @@ -69,19 +67,23 @@ - + - +
    @@ -58,10 +56,12 @@ v-if="!isTrashDisplayed" v-tooltip="$t('action-edit')" :to="`/parks/${park.row.id}`" - tag="button" - class="item-actions__button info" + v-slot="{ navigate }" + custom > - + @@ -45,10 +43,12 @@ v-if="!isTrashDisplayed" v-tooltip="$t('action-edit')" :to="`/technicians/${technician.row.id}`" - tag="button" - class="item-actions__button info" + v-slot="{ navigate }" + custom > - + diff --git a/client/src/pages/UserSettings/UserSettings.vue b/client/src/pages/UserSettings/UserSettings.vue index 2d533d708..b2a9cd75c 100644 --- a/client/src/pages/UserSettings/UserSettings.vue +++ b/client/src/pages/UserSettings/UserSettings.vue @@ -41,13 +41,11 @@ :isLoading="isLoading" />
    - - - {{ $t('your-profile') }} + +
    diff --git a/client/src/pages/Users/Users.vue b/client/src/pages/Users/Users.vue index 46e54c129..ce3c460ea 100644 --- a/client/src/pages/Users/Users.vue +++ b/client/src/pages/Users/Users.vue @@ -9,13 +9,11 @@ />
    - - - {{ $t('page-users.action-add') }} + +
    @@ -61,11 +59,13 @@
    - - {{$t('your-profile')}} +
    @@ -73,10 +73,12 @@ v-if="!isTrashDisplayed" v-tooltip="$t('action-edit')" :to="`/users/${user.row.id}`" - tag="button" - class="item-actions__button info" + v-slot="{ navigate }" + custom > - +