diff --git a/app/javascript/flavours/glitch/styles/about.scss b/app/javascript/flavours/glitch/styles/about.scss index 2cc43afec..8065d4ad6 100644 --- a/app/javascript/flavours/glitch/styles/about.scss +++ b/app/javascript/flavours/glitch/styles/about.scss @@ -906,3 +906,105 @@ $small-breakpoint: 960px; color: $primary-text-color; } } + + +.custom-img img { + width: 100%; + max-width: 50vw; + display: block; + margin: 0 auto; +} + +.custom_message_heading { + font-size: 2em; + margin-bottom: 0.5em; + text-align: center; +} +.landing, +.page-show{ + height: 50vh; + min-height: 50vh; + position: relative; + top: 0; + width: 100%; + background: url('~flavours/glitch/images/bliss/home2.jpg') no-repeat fixed center; + //background: url('~flavours/glitch/images/wave-drawer.png') no-repeat fixed center; + background-size: cover; + + +} +// landing +h1.main_brand_title{ + margin: 2rem auto !important; + font-size: 5rem !important; + text-shadow: 0 0 1rem #ccc; +} +.auth-page { + min-height: 100vh; + position: absolute; + top: 0; + width: 100%; + background: url('~flavours/glitch/images/bliss/auth_background.jpg') no-repeat fixed center; + //background: url('~flavours/glitch/images/wave-drawer.png') no-repeat fixed center; + background-size: cover; + + .form-container { + background: rgba(0, 0, 0, 0.5); + } + + .logo-container { + width: 200px; + } + + .img-custom { + text-align: center; + width: 440px; + background: rgba(0, 0, 0, 0.5); + margin: 0 auto; + display: block; + + img { + width: 400px; + max-width: 90vw; + margin: 1em auto; + display: inline-block; + border: solid 2px #111; + } + } + + .title { + + padding: 1em; + font-size: 3em; + margin-bottom: 0.5em; + } +} +// landing +h1.main_brand_title{ + text-shadow: 0 0 1rem #ccc; + text-align: center; + position: absolute; + top: 2rem; + height: 0; + background: transparent; + z-index: 10; + width: 100%; +} + + +.getting-started__footer { + a { + margin-right: 1ch; + display: inline-block; + .fa { + margin-right: 1ch; + } + } +} +.main-container{ + min-height: 1200px; +} +.container-footer{ + margin: 1rem auto; + max-width: 900px; +} diff --git a/app/javascript/flavours/glitch/styles/footer.scss b/app/javascript/flavours/glitch/styles/footer.scss index 073ebda7e..ca7bcda36 100644 --- a/app/javascript/flavours/glitch/styles/footer.scss +++ b/app/javascript/flavours/glitch/styles/footer.scss @@ -1,5 +1,6 @@ .public-layout { .footer { + position:static; text-align: left; padding-top: 20px; padding-bottom: 60px; diff --git a/app/javascript/skins/glitch/mastodon-light/common.scss b/app/javascript/skins/glitch/mastodon-light/common.scss index c37f407b3..602da56af 100644 --- a/app/javascript/skins/glitch/mastodon-light/common.scss +++ b/app/javascript/skins/glitch/mastodon-light/common.scss @@ -1 +1,2 @@ @import 'flavours/glitch/styles/mastodon-light'; + diff --git a/app/javascript/styles/application.scss b/app/javascript/styles/application.scss index c456a93bf..0678570bb 100644 --- a/app/javascript/styles/application.scss +++ b/app/javascript/styles/application.scss @@ -27,10 +27,5 @@ @import 'mastodon/dashboard'; @import 'mastodon/rtl'; @import 'mastodon/accessibility'; +@import 'custom'; -// landing -h1.main_brand_title{ - margin: 2rem auto !important; - font-size: 5rem !important; - text-shadow: 0 0 1rem #ccc; -} diff --git a/app/javascript/styles/mastodon/_custom.scss b/app/javascript/styles/mastodon/_custom.scss index afbce9455..e69de29bb 100644 --- a/app/javascript/styles/mastodon/_custom.scss +++ b/app/javascript/styles/mastodon/_custom.scss @@ -1,71 +0,0 @@ -.custom-img img { - width: 100%; - max-width: 50vw; - display: block; - margin: 0 auto; -} - -.custom_message_heading { - font-size: 2em; - margin-bottom: 0.5em; - text-align: center; -} -.page-show{ - height: 50vh; - min-height: 50vh; - position: relative; - top: 0; - width: 100%; - //background: url('~flavours/glitch/bliss/images/home.jpg') no-repeat fixed center; - background: url('~flavours/glitch/images/wave-drawer.png') no-repeat fixed center; - background-size: cover; - - // landing - h1.main_brand_title{ - margin: 2rem auto !important; - font-size: 5rem !important; - text-shadow: 0 0 1rem #ccc; - } - -} -.auth-page { - min-height: 100vh; - position: absolute; - top: 0; - width: 100%; - //background: url('~flavours/glitch/bliss/images/auth_background.jpg') no-repeat fixed center; - background: url('~flavours/glitch/images/wave-drawer.png') no-repeat fixed center; - background-size: cover; - - .form-container { - background: rgba(0, 0, 0, 0.5); - } - - .logo-container { - width: 200px; - } - - .img-custom { - text-align: center; - width: 440px; - background: rgba(0, 0, 0, 0.5); - margin: 0 auto; - display: block; - - img { - width: 400px; - max-width: 90vw; - margin: 1em auto; - display: inline-block; - border: solid 2px #111; - } - } - - .title { - - padding: 1em; - font-size: 3em; - margin-bottom: 0.5em; - } -} - diff --git a/app/javascript/styles/win95.scss b/app/javascript/styles/win95.scss index fdf2e59b6..5e0ecab1e 100644 --- a/app/javascript/styles/win95.scss +++ b/app/javascript/styles/win95.scss @@ -1443,7 +1443,7 @@ body.admin { color: black; padding-top:24px; flex-direction:column; - overflow:hidden; + overflow:auto; } @media screen and (max-width: 1120px) { diff --git a/app/views/about/show.html.haml b/app/views/about/show.html.haml index eaee3afcd..0f866e940 100644 --- a/app/views/about/show.html.haml +++ b/app/views/about/show.html.haml @@ -5,8 +5,8 @@ - content_for :header_tags do %link{ rel: 'canonical', href: about_url }/ = render partial: 'shared/og' - %h1.main_brand_title= 'Mastodon Bliss' - %span.brand__tagline=t 'about.tagline' + .homepage-welcome_container + %h1.main_brand_title= 'Mastodon Bliss' .landing .landing__brand diff --git a/app/views/layouts/public.html.haml b/app/views/layouts/public.html.haml index eed85c8ba..07d559e5d 100644 --- a/app/views/layouts/public.html.haml +++ b/app/views/layouts/public.html.haml @@ -26,7 +26,7 @@ .main-container= yield - .container + .container-footer .footer .grid .column-0