diff --git a/src/app/app.component.ts b/src/app/app.component.ts index c8ed1498..6bbd694d 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -72,9 +72,7 @@ export class AppComponent implements OnInit, OnDestroy, AfterViewInit { this.onHomePage = evt.url === '/'; - let mainelem = this.document.querySelector('#big_container'); - console.log('mainelem', mainelem); - window.scrollTo(0, mainelem.offsetTop); + window.scrollTo(0, 0); }); if (!environment.production) { diff --git a/src/app/features/administration/form/date/list/day/day-list.component.html b/src/app/features/administration/form/date/list/day/day-list.component.html index 3a678595..c417474b 100644 --- a/src/app/features/administration/form/date/list/day/day-list.component.html +++ b/src/app/features/administration/form/date/list/day/day-list.component.html @@ -21,7 +21,8 @@
JJ/MM/AAAA
diff --git a/src/app/features/administration/form/date/list/day/day-list.component.scss b/src/app/features/administration/form/date/list/day/day-list.component.scss index d8ca87b9..82359c8a 100644 --- a/src/app/features/administration/form/date/list/day/day-list.component.scss +++ b/src/app/features/administration/form/date/list/day/day-list.component.scss @@ -1,5 +1,7 @@ @import '../../../../../../../styles/variables'; - +.day-list-container { + padding-bottom: 2rem; +} .day-weekend { background: #dccfed; } diff --git a/src/app/features/administration/form/steps/step-seven/step-seven.component.html b/src/app/features/administration/form/steps/step-seven/step-seven.component.html index 15b58767..9521a247 100644 --- a/src/app/features/administration/form/steps/step-seven/step-seven.component.html +++ b/src/app/features/administration/form/steps/step-seven/step-seven.component.html @@ -80,11 +80,11 @@
- + 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 8607c88a..9bd9de4a 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 @@ -41,10 +41,9 @@ - + diff --git a/src/app/features/administration/nav-steps/nav-steps.component.html b/src/app/features/administration/nav-steps/nav-steps.component.html index ef25ec53..a341ba6a 100644 --- a/src/app/features/administration/nav-steps/nav-steps.component.html +++ b/src/app/features/administration/nav-steps/nav-steps.component.html @@ -1,30 +1,24 @@ -
-
-
-
- -
-
- -
-
-
+
+ + +
diff --git a/src/app/features/administration/nav-steps/nav-steps.component.scss b/src/app/features/administration/nav-steps/nav-steps.component.scss index e879abb0..45a533cd 100644 --- a/src/app/features/administration/nav-steps/nav-steps.component.scss +++ b/src/app/features/administration/nav-steps/nav-steps.component.scss @@ -1,10 +1 @@ @import '../../../../styles/variables'; -.bottom-step-buttons { - padding: 8px 16px; -} -.button { - &.is-secondary { - color: $secondary_color !important; - border-color: $secondary_color !important; - } -} diff --git a/src/app/features/administration/stepper/stepper.component.html b/src/app/features/administration/stepper/stepper.component.html index 86ff54d9..0d4a19c3 100644 --- a/src/app/features/administration/stepper/stepper.component.html +++ b/src/app/features/administration/stepper/stepper.component.html @@ -53,11 +53,7 @@
- + accueil FramaDate

diff --git a/src/app/features/administration/stepper/stepper.component.scss b/src/app/features/administration/stepper/stepper.component.scss index b482ac3c..45bf18e1 100644 --- a/src/app/features/administration/stepper/stepper.component.scss +++ b/src/app/features/administration/stepper/stepper.component.scss @@ -4,7 +4,7 @@ #creation_stepper { @extend .fixed-box; background: $white; - height: 56px; + height: 64px; a { @extend .clickable; diff --git a/src/styles.scss b/src/styles.scss index e3635b48..ed2e4f51 100644 --- a/src/styles.scss +++ b/src/styles.scss @@ -44,26 +44,26 @@ @import './styles/themes/all'; // most general dom elements @import './styles/partials/global'; -@import './styles/partials/logo'; -@import './styles/partials/navigation'; // main content elements @import './styles/partials/main'; @import './styles/partials/tables'; @import './styles/partials/buttons'; -// @import './styles/partials/links'; +@import './styles/partials/logo'; +@import './styles/partials/navigation'; +@import './styles/partials/links'; @import './styles/partials/forms'; @import './styles/partials/form-controls'; @import './styles/partials/images'; -// responsive, mobile first goal +// responsive, mobile first @import './styles/partials/responsive'; // reset suggested by material-angular -html, -body { - height: 100%; -} +//html, +//body { +// height: 100%; +//} body { margin: 0; - font-family: Roboto, 'Helvetica Neue', sans-serif; + font-family: $default_font; } diff --git a/src/styles/partials/_forms.scss b/src/styles/partials/_forms.scss index 27815dae..c9a9c07f 100644 --- a/src/styles/partials/_forms.scss +++ b/src/styles/partials/_forms.scss @@ -201,11 +201,9 @@ mat-checkbox { } } -.admin-form { - .step { - max-width: $main-column-width; - margin: 0 auto; - } +.step { + max-width: $main-column-width; + margin: 0 auto; } .fa { diff --git a/src/styles/partials/_links.scss b/src/styles/partials/_links.scss index f215174a..9f44090c 100644 --- a/src/styles/partials/_links.scss +++ b/src/styles/partials/_links.scss @@ -1,50 +1 @@ @charset "UTF-8"; -a { - color: $primary !important; - @extend .button, .is-hoverable; - - &:hover, - &:focus { - color: $dark !important; - background: $pale-purple; - } - - &.active { - color: $dark !important; - - &:hover, - &:focus { - color: $white !important; - background: $pale-purple; - } - } - .fa { - margin-right: 1ch; - } -} -.button, -.btn { - .fa { - margin-right: 1ch; - } -} -.list-my-polls { - a { - @extend .is-block; - } - - sub { - margin-left: 2em; - } -} - -.preview-url { - a { - overflow: hidden; - @extend .text-ellipsis; - } - - framadate-copy-text { - float: right; - } -} diff --git a/src/styles/partials/_navigation.scss b/src/styles/partials/_navigation.scss index c1b45546..9cf0d4be 100644 --- a/src/styles/partials/_navigation.scss +++ b/src/styles/partials/_navigation.scss @@ -109,16 +109,25 @@ a span.ui-steps-number { .bottom-step-buttons { box-shadow: 0px -2px 4px rgba(0, 0, 0, 0.05); - position: fixed; bottom: 0; left: 0; - width: 100%; z-index: 10; height: auto; background: $white; - padding: 0.85rem; + + padding: 8px 16px; + position: fixed !important; + width: 100vw; + position: fixed; + right: 0; + .button { - width: 100%; - display: block; + display: inline-block; + } + .button { + &.is-secondary { + color: $secondary_color !important; + border-color: $secondary_color !important; + } } } diff --git a/src/styles/partials/global.scss b/src/styles/partials/global.scss index 33e8015c..491bc7a5 100644 --- a/src/styles/partials/global.scss +++ b/src/styles/partials/global.scss @@ -41,7 +41,7 @@ main { .columns { &.half-columns { - max-width: $main-column-width; + max-width: 100%; margin: 0 auto; padding: 0; @@ -73,8 +73,6 @@ main { } .button { - width: 100%; - .is-half-offseted { float: right; } diff --git a/src/styles/variables.scss b/src/styles/variables.scss index c085e8f7..2e6dfada 100644 --- a/src/styles/variables.scss +++ b/src/styles/variables.scss @@ -68,5 +68,5 @@ $default_font: 'helvetica', 'proza_libre', 'Arial', 'DejaVu Sans Mono'; $title_font: 'helvetica', 'proza_libre', 'Arial', 'DejaVu Sans Mono'; // sizes and breakpoints -$main-column-width: 900px; -$mobile-size: 380px; +$main-column-width: 400px; +$mobile-size: 400px;