diff --git a/public/img/logo-dark.svg b/public/img/logo-dark.svg index e500b44aa6..115df44e7d 100644 --- a/public/img/logo-dark.svg +++ b/public/img/logo-dark.svg @@ -1,3 +1,3 @@ - + diff --git a/public/img/logo-light.svg b/public/img/logo-light.svg index faef5d032c..c9b5c4225d 100644 --- a/public/img/logo-light.svg +++ b/public/img/logo-light.svg @@ -1,3 +1,3 @@ - + diff --git a/resources/sass/pages/_homepage.scss b/resources/sass/pages/_homepage.scss index 90d4a161c6..a20a5817f2 100644 --- a/resources/sass/pages/_homepage.scss +++ b/resources/sass/pages/_homepage.scss @@ -3,7 +3,56 @@ @import "../../feature/theme/theme"; @import "bootstrap/scss/mixins/breakpoints"; +header nav.navbar { + .logo { + height: 30px; + } +} + body.lookAndFeelModern { + $primary-color-light: #00a538; + $primary-color-dark: #78de13; + + .text-primary { + @include light { + color: $primary-color-light !important; + } + @include dark { + color: $primary-color-dark !important; + } + } + + .is-online { + width: 13px; + height: 13px; + border: none; + @include light { + background-color: $primary-color-light; + } + @include dark { + background-color: $primary-color-dark; + } + } + + header nav.navbar { + .logo { + width: 15px; + height: 20px; + } + + .btn-register { + @include light { + background: $primary-color-light; + border-color: $primary-color-light; + + } + @include dark { + background: $primary-color-dark; + border-color: $primary-color-dark; + } + } + } + @mixin size($size) { @if ($size == 'intermediate') { @include media-breakpoint-only(sm) { @@ -29,126 +78,124 @@ body.lookAndFeelModern { background: #0f0f0f; } - .scope-homepage { - h2 { - font-size: 0.9em; - color: inherit; - } + h2 { + font-size: 0.9em; + color: inherit; + } - h4.heading { - font-size: 0.9em; - color: inherit; - @include theme { // this just overrides previous dark theme - border: none; - } + h4.heading { + font-size: 0.9em; + color: inherit; + @include theme { // this just overrides previous dark theme + border: none; + } - i { - display: none; - } + i { + display: none; } + } - a { - @include light { - color: #005b12; - } - @include dark { - color: #bdd5c3; - } + a { + @include light { + color: #005b12; + } + @include dark { + color: #bdd5c3; } + } - .nav-pills { - .nav-link { - transition: none; - } + .nav-pills { + .nav-link { + transition: none; + } - .nav-link[href] { - cursor: pointer; - } + .nav-link[href] { + cursor: pointer; + } - @include theme { - .nav-link { - color: #777777; + @include theme { + .nav-link { + color: #777777; - &.active { - color: black; - } + &.active { + color: black; } } + } - .nav-link.active { - @include light { - border-bottom-color: #00a538; - } - @include dark { - border-bottom-color: #78de13; - } + .nav-link.active { + @include light { + border-bottom-color: $primary-color-light; + } + @include dark { + border-bottom-color: $primary-color-dark; } } + } - .microblog { - .media > .media-body { - .media-heading a { - @include dark { - color: #bdd5c3; - } - } - - .microblog-comments .media a.username { - @include dark { - color: #bdd5c3; - } + .microblog { + .media > .media-body { + .media-heading a { + @include dark { + color: #bdd5c3; } } - .microblog-actions .btn { - @include light { - color: #777777; - } + .microblog-comments .media a.username { @include dark { - color: #8f9ba5; + color: #bdd5c3; } } } - .default-avatar { + .microblog-actions .btn { @include light { - color: #00a538; - background: #e7f7e6; + color: #777777; } @include dark { - color: #78de13; - background: #0a1203; + color: #8f9ba5; } } + } - .card { - border: none; - box-shadow: none; - border-radius: 8px; + .default-avatar { + @include light { + color: $primary-color-light; + background: #e7f7e6; + } + @include dark { + color: $primary-color-dark; + background: #0a1203; } + } - .card-tile { - border-radius: 6px; - @include light { - background: #eaecf1; - } - @include dark { - background: transparent; - } + .card { + border: none; + box-shadow: none; + border-radius: 8px; + } + + .card-tile { + border-radius: 6px; + @include light { + background: #eaecf1; } + @include dark { + background: transparent; + } + } - @include theme { - .viewers-online { - .viewer-pill { - border: none; - } + @include theme { + .viewers-online { + .viewer-pill { + border: none; + } - .viewers-users .circle { - border: 2px solid white; + .viewers-users .circle { + border: 2px solid white; - &.circle-number { - line-height: 32px; - } + &.circle-number { + line-height: 32px; } } } @@ -188,7 +235,7 @@ body.lookAndFeelModern { height: 3px; border-radius: 3px; @include light { - background: linear-gradient(270deg, #00a538 0%, #ffffff 100%); + background: linear-gradient(270deg, $primary-color-light 0%, #ffffff 100%); } @include dark { diff --git a/resources/views/home.twig b/resources/views/home.twig index d0e315bbc0..650acb763d 100644 --- a/resources/views/home.twig +++ b/resources/views/home.twig @@ -8,7 +8,7 @@ {% block container %} {{ render_block('homepage_banner') }} -
+

diff --git a/resources/views/layout.twig b/resources/views/layout.twig index fc3ac4bc32..a53df49b73 100644 --- a/resources/views/layout.twig +++ b/resources/views/layout.twig @@ -70,7 +70,6 @@