diff --git a/src/app/app.component.html b/src/app/app.component.html index 849ae8e0..bc54e891 100644 --- a/src/app/app.component.html +++ b/src/app/app.component.html @@ -5,8 +5,8 @@
-
- + +
diff --git a/src/app/app.component.ts b/src/app/app.component.ts index f747fb60..969d776a 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -35,6 +35,7 @@ export class AppComponent implements OnInit, OnDestroy, AfterViewInit { private themeSubscription: Subscription; public environment = environment; + public onHomePage = false; constructor( private router: Router, @@ -67,6 +68,9 @@ export class AppComponent implements OnInit, OnDestroy, AfterViewInit { if (!(evt instanceof NavigationEnd)) { return; } + console.log('evt', evt); + + this.onHomePage = evt.url === '/'; let mainelem = this.document.querySelector('#big_container main'); console.log('mainelem', mainelem); diff --git a/src/app/core/components/header/header.component.html b/src/app/core/components/header/header.component.html index 4bc99437..0e9580ae 100644 --- a/src/app/core/components/header/header.component.html +++ b/src/app/core/components/header/header.component.html @@ -1,132 +1,139 @@
- + +
+ + + Ce site est un espace de démonstration, les informations que vous y mettrez seront régulièrement supprimées. + N'en faites pas une utilisation réelle.
+ +
+ voici des liens de démonstration issus des fixtures Doctrine de date-poll-api. +
+ +
+
+ + test admin link to edit poll +
- - test admin link to edit poll - diff --git a/src/styles/partials/_main.scss b/src/styles/partials/_main.scss index 7c84f5e3..fabc860a 100644 --- a/src/styles/partials/_main.scss +++ b/src/styles/partials/_main.scss @@ -1,12 +1,14 @@ @charset "UTF-8"; - +body, +html { + background: $white; +} main { display: block; width: 100%; margin: 0 auto; } -.creation, .search { @extend main; } diff --git a/src/styles/partials/_navigation.scss b/src/styles/partials/_navigation.scss index c4331469..860dec1c 100644 --- a/src/styles/partials/_navigation.scss +++ b/src/styles/partials/_navigation.scss @@ -1,6 +1,28 @@ +app-header { + background: $primary_color; + color: $white; +} +.big-header { + background: $secondary-color; + color: $white; + .container { + background: $secondary-color; + color: $white; + box-shadow: none; + } +} + +// material override +.navbar { + margin-bottom: 0; + background: $secondary-color; + color: $white; +} + nav { + background: $primary-color; text-align: center; - border-bottom: 2px solid $primary; + border-bottom: 2px solid $primary-color; a { &::before { @@ -81,10 +103,6 @@ a { padding-left: 1rem; } } -// material override -.navbar { - margin-bottom: 0; -} a span.ui-steps-number { padding: 0; } diff --git a/src/styles/themes/_base.scss b/src/styles/themes/_base.scss index 6a9d867e..08cd20af 100644 --- a/src/styles/themes/_base.scss +++ b/src/styles/themes/_base.scss @@ -1,5 +1,5 @@ #big_container { - background: $primary; + background: $white; main { margin-bottom: 2em; @@ -11,9 +11,6 @@ .container { padding-bottom: 5em; - - @extend .boxed-shadow; - .column:last-of-type { text-align: right; } diff --git a/src/styles/themes/_light.scss b/src/styles/themes/_light.scss index 7b12ab78..88f2628c 100644 --- a/src/styles/themes/_light.scss +++ b/src/styles/themes/_light.scss @@ -1,6 +1,4 @@ #big_container { - background: $primary; - &.theme-light-watermelon { .big-header { .container {