diff --git a/js/public/img/icons/favicon-16x16.png b/js/public/img/icons/favicon-16x16.png index 42b6b3523..ba0fe61d0 100644 Binary files a/js/public/img/icons/favicon-16x16.png and b/js/public/img/icons/favicon-16x16.png differ diff --git a/js/public/img/icons/favicon-32x32.png b/js/public/img/icons/favicon-32x32.png index 8813cc5f9..ba0fe61d0 100644 Binary files a/js/public/img/icons/favicon-32x32.png and b/js/public/img/icons/favicon-32x32.png differ diff --git a/js/public/img/icons/favicon_chapril_mobilizon.png b/js/public/img/icons/favicon_chapril_mobilizon.png new file mode 100644 index 000000000..ba0fe61d0 Binary files /dev/null and b/js/public/img/icons/favicon_chapril_mobilizon.png differ diff --git a/js/public/img/icons/original/favicon-16x16.png b/js/public/img/icons/original/favicon-16x16.png new file mode 100644 index 000000000..42b6b3523 Binary files /dev/null and b/js/public/img/icons/original/favicon-16x16.png differ diff --git a/js/public/img/icons/original/favicon-32x32.png b/js/public/img/icons/original/favicon-32x32.png new file mode 100644 index 000000000..8813cc5f9 Binary files /dev/null and b/js/public/img/icons/original/favicon-32x32.png differ diff --git a/js/src/common.scss b/js/src/common.scss index f8b8f762e..7146d4f61 100644 --- a/js/src/common.scss +++ b/js/src/common.scss @@ -20,7 +20,7 @@ } main > .container { - background: $body-background-color; + background: $whitest; min-height: 70vh; } .step-content{ @@ -46,6 +46,15 @@ main { } } > #homepage{ + background: $whitest; + #featured_events{ + background: $whitest; + } + #picture{ + .container, .section{ + background: $whitest; + } + } > .container{ min-height: 25vh; } @@ -97,21 +106,22 @@ $color-black: #000; } body { - // background: #f7f8fa; background: $body-background-color; font-family: BlinkMacSystemFont, Roboto, Oxygen, Ubuntu, Cantarell, "Segoe UI", "Fira Sans", "Droid Sans", "Helvetica Neue", Helvetica, Arial, sans-serif; - /*main {*/ - /* margin: 1rem auto 0;*/ - /*}*/ } -#mobilizon > .container > .message { - margin: 1rem auto auto; - .message-header { - button.delete { - background: #4a4a4a; +#mobilizon{ + > main{ + background: $body-background-color; + } + > .container > .message { + margin: 1rem auto auto; + .message-header { + button.delete { + background: $chapril_grey; + } } } } @@ -185,7 +195,7 @@ a.list-item { } .columns{ - background: white; + background: $whitest; } .setting-menu-item { background-color: $yellow-4; @@ -215,7 +225,7 @@ a.list-item { color: $white; background: $chapril_blue_light; span.month { - color: $white; + color: $whitest; } } @@ -225,5 +235,5 @@ footer */ footer.footer[data-v-40ab164b] span.select select{ background: $chapril_blue_light; - color: #000; + color: $footer-text-color; } diff --git a/js/src/variables.scss b/js/src/variables.scss index bed9ddf7d..0f5b72220 100644 --- a/js/src/variables.scss +++ b/js/src/variables.scss @@ -4,6 +4,8 @@ // chapril colors $chapril_blue: #2e5281; $chapril_blue_light: #bcd0e5; +$white: mix( #fff,#bcd0e5); +$whitest: #fff; $chapril_orange: #ff5e00; $chapril_grey: #5f5f5f; // other @@ -103,6 +105,7 @@ $navbar-height: 4rem; // Footer $footer-padding: 3rem 1.5rem 1rem; $footer-background-color: $violet-2; +$footer-text-color: mix( #000, $violet-2); $body-background-color: mix( $chapril_blue, #efeef4); $fullhd-enabled: false; diff --git a/js/src/views/Home.vue b/js/src/views/Home.vue index dd1a84e23..e2a1f22b2 100644 --- a/js/src/views/Home.vue +++ b/js/src/views/Home.vue @@ -399,7 +399,7 @@ export default class Home extends Vue { @import "~bulma/sass/utilities/mixins.sass"; main > div > .container { - background: $white; + background: $whitest; padding: 1rem 1.5rem 3rem; } @@ -519,7 +519,6 @@ section.hero { } .container.section { - background: $white; @include tablet { margin-top: -4rem; @@ -537,8 +536,4 @@ section.hero { } } } - -#homepage { - background: $white; -}