From 9cf278f18bfa12f17d12b26e98f458fa191dd981 Mon Sep 17 00:00:00 2001 From: Tykayn Date: Mon, 13 Dec 2021 16:18:24 +0100 Subject: [PATCH] nav header --- .../components/header/header.component.html | 40 +++++++++++-------- .../core/components/home/home.component.html | 2 +- .../navigation/navigation.component.html | 12 ++++++ .../navigation/navigation.component.scss | 14 +++++++ .../navigation/navigation.component.ts | 1 + .../steps/step-two/step-two.component.html | 4 +- .../steps/step-two/step-two.component.scss | 1 + .../stepper/stepper.component.html | 11 ++++- .../stepper/stepper.component.scss | 18 +++++++-- .../language-selector.component.html | 13 ++++-- .../language-selector.component.scss | 2 + .../language-selector.component.ts | 1 + src/assets/i18n/EN.json | 1 + src/assets/i18n/FR.json | 1 + 14 files changed, 94 insertions(+), 27 deletions(-) diff --git a/src/app/core/components/header/header.component.html b/src/app/core/components/header/header.component.html index 9a234736..9a85ba05 100644 --- a/src/app/core/components/header/header.component.html +++ b/src/app/core/components/header/header.component.html @@ -7,9 +7,9 @@ {{ appTitle }} - - {{ environment.appVersion }} - + + +
@@ -22,9 +22,25 @@ >
- {{ 'config.title' | translate }} + {{ 'creation.init' | translate }}
+ + Explorer le libre + + + + Des outils éthiques + + + + Changer le monde + + + + Entraide + +
@@ -33,23 +49,15 @@ - + Faire un don +
- +
diff --git a/src/app/core/components/home/home.component.html b/src/app/core/components/home/home.component.html index 09be9161..91f31a8b 100644 --- a/src/app/core/components/home/home.component.html +++ b/src/app/core/components/home/home.component.html @@ -23,7 +23,7 @@
- calendrier icone framadate +
diff --git a/src/app/core/components/sibebar/navigation/navigation.component.html b/src/app/core/components/sibebar/navigation/navigation.component.html index b57acf4d..7f50beaa 100644 --- a/src/app/core/components/sibebar/navigation/navigation.component.html +++ b/src/app/core/components/sibebar/navigation/navigation.component.html @@ -5,6 +5,18 @@ {{ 'creation.title' | translate }} +
Démos fixtures diff --git a/src/app/core/components/sibebar/navigation/navigation.component.scss b/src/app/core/components/sibebar/navigation/navigation.component.scss index f3234026..49a9bfd3 100644 --- a/src/app/core/components/sibebar/navigation/navigation.component.scss +++ b/src/app/core/components/sibebar/navigation/navigation.component.scss @@ -1,4 +1,18 @@ +@import '../../../../../styles/variables'; + em { margin-left: 1ch; margin-right: 1ch; } + +.logo-home-link { + margin-top: 0; + line-height: $header-nav-inner-height; + height: $header-nav-inner-height; + display: inline-block; + padding-left: 1em; + + &:hover { + color: $font_color; + } +} diff --git a/src/app/core/components/sibebar/navigation/navigation.component.ts b/src/app/core/components/sibebar/navigation/navigation.component.ts index 37884608..ece9aaf7 100644 --- a/src/app/core/components/sibebar/navigation/navigation.component.ts +++ b/src/app/core/components/sibebar/navigation/navigation.component.ts @@ -16,6 +16,7 @@ export class NavigationComponent implements OnInit { @Input() public appTitle = 'FramaDate Funky'; @Input() public appLogo: string; public environment = environment; + mobileMenuVisible: boolean; constructor(private mockingService: MockingService) {} diff --git a/src/app/features/administration/form/steps/step-two/step-two.component.html b/src/app/features/administration/form/steps/step-two/step-two.component.html index 1b01e96b..9798052a 100644 --- a/src/app/features/administration/form/steps/step-two/step-two.component.html +++ b/src/app/features/administration/form/steps/step-two/step-two.component.html @@ -12,7 +12,7 @@
@@ -27,7 +27,7 @@
diff --git a/src/app/features/administration/form/steps/step-two/step-two.component.scss b/src/app/features/administration/form/steps/step-two/step-two.component.scss index cf52d574..96441fbb 100644 --- a/src/app/features/administration/form/steps/step-two/step-two.component.scss +++ b/src/app/features/administration/form/steps/step-two/step-two.component.scss @@ -12,6 +12,7 @@ transition: background-color ease 1.5s; color: $font-color; &.is-selected { + background: $secondary_color; border: solid $primary-color 1px; color: $white; label { diff --git a/src/app/features/administration/stepper/stepper.component.html b/src/app/features/administration/stepper/stepper.component.html index 0d4a19c3..8bd6ea47 100644 --- a/src/app/features/administration/stepper/stepper.component.html +++ b/src/app/features/administration/stepper/stepper.component.html @@ -53,7 +53,11 @@
- + accueil FramaDate

@@ -70,7 +74,10 @@

Étape {{ step_current }} sur {{ step_max }}

- Annuler + + + Annuler +
diff --git a/src/app/features/administration/stepper/stepper.component.scss b/src/app/features/administration/stepper/stepper.component.scss index 901ef633..9be28cb5 100644 --- a/src/app/features/administration/stepper/stepper.component.scss +++ b/src/app/features/administration/stepper/stepper.component.scss @@ -52,12 +52,19 @@ } } - .cancel-button { + .nav-button { margin-top: 0; - line-height: $header-nav-inner-height; - height: $header-nav-inner-height; + line-height: 5rem; + height: 5rem; display: inline-block; padding-left: 1em; + &app-language-selector { + padding-top: 1rem; + } + } + .cancel-button { + line-height: 4rem; + height: 4rem; &:hover { color: $font_color; @@ -96,3 +103,8 @@ color: white !important; } } + +.lang-selector-icon { + margin-top: 0.5rem; + display: inline-block; +} diff --git a/src/app/shared/components/selectors/language-selector/language-selector.component.html b/src/app/shared/components/selectors/language-selector/language-selector.component.html index 66a46b50..842ed31d 100644 --- a/src/app/shared/components/selectors/language-selector/language-selector.component.html +++ b/src/app/shared/components/selectors/language-selector/language-selector.component.html @@ -1,8 +1,15 @@
- langue + sélection de langue
- -