diff --git a/.yarn/install-state.gz b/.yarn/install-state.gz index 2781e4a90..e3ac97cdc 100644 Binary files a/.yarn/install-state.gz and b/.yarn/install-state.gz differ diff --git a/app/javascript/flavours/glitch/styles/_custom_tk.scss b/app/javascript/flavours/glitch/styles/_custom_tk.scss index fe569dd3c..3f55e1e6d 100644 --- a/app/javascript/flavours/glitch/styles/_custom_tk.scss +++ b/app/javascript/flavours/glitch/styles/_custom_tk.scss @@ -1,19 +1,45 @@ +.auth-land { -.auth-container-bg-img{ + .login-instance-name { + font-size: 3rem; + text-align: center; + margin-top: 1.5rem; + background: url('~flavours/glitch/images/bliss/home.jpg'); + background-repeat: no-repeat; + background-position: center bottom; + background-repeat: no-repeat; + height: 5rem; + background-size: 3.5rem; + } - width: 100%; - height: 100vh; - opacity: 0.15; - filter: alpha(opacity=15); - background: url('~flavours/glitch/images/bliss/home2.jpg'); - background-position: center; - background-repeat: no-repeat; - left: 0; - top: 0; - margin: 0 auto; - overflow: hidden; - position: fixed; -} -.dismissable-banner{ - background: $base-overlay-background; + .auth-container-bg-img { + width: 100%; + height: 100vh; + opacity: 0.15; + filter: alpha(opacity=15); + background: url('~flavours/glitch/images/bliss/home2.jpg'); + background-position: right; + background-repeat: no-repeat; + left: 0; + top: 0; + margin: 0 auto; + overflow: hidden; + position: fixed; + z-index: -1; + } + + .container-alt { + z-index: 10; + margin: auto; + float:left; + } + + .dismissable-banner { + background: $base-overlay-background; + } + + .mention.status-link { + background: $base-overlay-background; + border-radius: 100%; + } } diff --git a/app/javascript/mastodon/features/ui/components/link_footer.js b/app/javascript/mastodon/features/ui/components/link_footer.js index c29aac418..c50d7153b 100644 --- a/app/javascript/mastodon/features/ui/components/link_footer.js +++ b/app/javascript/mastodon/features/ui/components/link_footer.js @@ -57,6 +57,15 @@ class LinkFooter extends React.PureComponent {

{domain}: {' '} + + Cipherbliss.com + + + contactez l'admin + + + Supportez + Cipherbliss {canInvite && ( <> diff --git a/app/views/layouts/auth.html.haml b/app/views/layouts/auth.html.haml index 6b0653906..c43cdd5af 100644 --- a/app/views/layouts/auth.html.haml +++ b/app/views/layouts/auth.html.haml @@ -1,14 +1,18 @@ - content_for :content do - .auth-container-bg-img - .container-alt - .logo-container - %h1 - = link_to root_path do - = logo_as_symbol(:wordmark) + .auth-land + .container-alt + .logo-container + %h1 + = link_to root_path do + = logo_as_symbol(:wordmark) + .login-instance-name + CipherBliss - .form-container - = render 'flashes' + .form-container + = render 'flashes' + + = yield + .auth-container-bg-img - = yield = render template: 'layouts/application'