diff --git a/src/app/core/components/header/header.component.html b/src/app/core/components/header/header.component.html index 16c46e7c..0f599a95 100644 --- a/src/app/core/components/header/header.component.html +++ b/src/app/core/components/header/header.component.html @@ -1,72 +1,55 @@
- - +
-
+

@@ -11,7 +11,7 @@

- + {{ 'config.letsgo' | translate }}
diff --git a/src/app/core/components/home/home.component.scss b/src/app/core/components/home/home.component.scss index 0fdeea82..3b49c90e 100644 --- a/src/app/core/components/home/home.component.scss +++ b/src/app/core/components/home/home.component.scss @@ -2,39 +2,12 @@ :host { .landing-box { - background: $secondary_color; padding: 70px 1em 6em; - } - .title { - color: $white; - margin-bottom: 1rem; - text-align: left; - } - - .button { - color: $secondary_color !important; - background: $secondary_color; - text-align: center; - - &.is-white { - background: $white; - } - &.is-secondary { - color: $white !important; - background: $secondary_color !important; + color: $primary_color; + .title { + color: $primary_color !important; } } - - .subtitle { - text-align: left; - margin-top: 1rem; - min-height: 4em; - color: $white; - } - .poll-list { - margin: 2em 0; - } - a .fa { margin-right: 1ch; } diff --git a/src/app/shared/components/selectors/language-selector/language-selector.component.scss b/src/app/shared/components/selectors/language-selector/language-selector.component.scss index 075a64e3..57f46584 100644 --- a/src/app/shared/components/selectors/language-selector/language-selector.component.scss +++ b/src/app/shared/components/selectors/language-selector/language-selector.component.scss @@ -31,7 +31,7 @@ .lang-button { color: $secondary_color; border: none; - padding: 0; + padding: 0 1rem; display: block; line-height: $header-nav-height; height: $header-nav-height; diff --git a/src/app/shared/components/selectors/language-selector/language-selector.component.ts b/src/app/shared/components/selectors/language-selector/language-selector.component.ts index 5b9b4a98..bf173630 100644 --- a/src/app/shared/components/selectors/language-selector/language-selector.component.ts +++ b/src/app/shared/components/selectors/language-selector/language-selector.component.ts @@ -15,7 +15,7 @@ export class LanguageSelectorComponent implements OnInit { public availableLanguages: any = ['FR', 'EN', 'ES']; language: string; language_to_apply: string; - display_lang_dialog: any = true; + display_lang_dialog: boolean = false; constructor( private languageService: LanguageService, diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json index a100f217..a6f67e04 100644 --- a/src/assets/i18n/en.json +++ b/src/assets/i18n/en.json @@ -33,6 +33,7 @@ "landing_title": "Organize events or collect the opinion of your relatives, simply, freely.", "landing_subtitle": "Thanks to {{AppTitle}} you can schedule, organize and quickly take decisions, easily and without registration.", "letsgo": "Create a new poll", + "discover": "Find an existing poll", "description": "Shedule appointments with your friends or your family, or create a pool with text, pictures or links… A real survey!", "find_my_polls": "My polls", "find_helper": "I am looking for polls linked to my email", diff --git a/src/assets/i18n/fr.json b/src/assets/i18n/fr.json index 22f8b1d7..bc16a317 100755 --- a/src/assets/i18n/fr.json +++ b/src/assets/i18n/fr.json @@ -33,7 +33,7 @@ "landing_title": "Organisez des évènements ou récoltez l’opinion de vos proches, simplement, librement.", "landing_subtitle": "Grâce à {{AppTitle}} planifiez, organisez et prenez des décisions rapidement, simplement et sans inscription.", "letsgo": "Créer un nouveau sondage", - "discover": "Découvrir Framadate", + "discover": "Accéder à un sondage existant", "description": "Planifiez des rendez-vous avec vos amis ou votre famille ou créez un sondage avec du texte, des images ou des liens… un sondage quoi !", "find_my_polls": "Mes sondages", "find_helper": "Je cherche d'autres sondages qui correspondent à mon mail", diff --git a/src/styles/partials/_navigation.scss b/src/styles/partials/_navigation.scss index 276d9bd4..e80e313a 100644 --- a/src/styles/partials/_navigation.scss +++ b/src/styles/partials/_navigation.scss @@ -3,27 +3,14 @@ app-header { color: $white; } .big-header { - background: $secondary-color; - color: $white; + border-bottom: solid 1px #ccc !important; .container { - background: $secondary-color; - color: $white; box-shadow: none; + padding-bottom: 0; } } -// material override -.navbar { - margin-bottom: 0; - background: $secondary-color; - color: $white; -} - nav { - background: $primary-color; - text-align: center; - border-bottom: 2px solid $primary-color; - a { &::before { display: inline-block; diff --git a/src/styles/themes/_base.scss b/src/styles/themes/_base.scss index d1a0d8ae..5d0f1aa3 100644 --- a/src/styles/themes/_base.scss +++ b/src/styles/themes/_base.scss @@ -7,7 +7,6 @@ } .big-header { .container { - padding-bottom: 5em; .column:last-of-type { text-align: right; }