Compare commits
3 Commits
9a26f79300
...
b98f47b196
Author | SHA1 | Date |
---|---|---|
Tykayn | b98f47b196 | |
Tykayn | cf48a6d89d | |
Tykayn | d13093200b |
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
module MascotHelper
|
module MascotHelper
|
||||||
def mascot_url
|
def mascot_url
|
||||||
full_asset_url(instance_presenter.mascot&.file&.url || asset_pack_path('media/images/elephant_ui_plane.svg'))
|
full_asset_url(instance_presenter.mascot&.file&.url || asset_pack_path('media/images/elephant_ui_plane.jpg'))
|
||||||
end
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|
After Width: | Height: | Size: 112 KiB |
After Width: | Height: | Size: 147 KiB |
After Width: | Height: | Size: 124 KiB |
After Width: | Height: | Size: 17 KiB |
After Width: | Height: | Size: 11 KiB |
After Width: | Height: | Size: 285 KiB |
After Width: | Height: | Size: 134 KiB |
After Width: | Height: | Size: 38 KiB |
After Width: | Height: | Size: 9.0 KiB |
Before Width: | Height: | Size: 285 KiB After Width: | Height: | Size: 214 KiB |
|
@ -21,7 +21,7 @@ import { length } from 'stringz';
|
||||||
import { countableText } from '../util/counter';
|
import { countableText } from '../util/counter';
|
||||||
import Icon from 'mastodon/components/icon';
|
import Icon from 'mastodon/components/icon';
|
||||||
|
|
||||||
// import elephantUIPlane from '../../../images/elephant_ui_plane.svg';
|
// import elephantUIPlane from '../../../images/elephant_ui_plane.jpg';
|
||||||
// import { mascot } from '../../initial_state';
|
// import { mascot } from '../../initial_state';
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -11,7 +11,7 @@ import { markAsPartial } from 'mastodon/actions/timelines';
|
||||||
import Column from 'mastodon/features/ui/components/column';
|
import Column from 'mastodon/features/ui/components/column';
|
||||||
import Account from './components/account';
|
import Account from './components/account';
|
||||||
import Logo from 'mastodon/components/logo';
|
import Logo from 'mastodon/components/logo';
|
||||||
import imageGreeting from 'mastodon/../images/elephant_ui_greeting.svg';
|
import imageGreeting from 'mastodon/../images/elephant_ui_greeting.jpg';
|
||||||
import Button from 'mastodon/components/button';
|
import Button from 'mastodon/components/button';
|
||||||
|
|
||||||
const mapStateToProps = state => ({
|
const mapStateToProps = state => ({
|
||||||
|
|
|
@ -7,7 +7,7 @@ import IconButton from 'mastodon/components/icon_button';
|
||||||
import Icon from 'mastodon/components/icon';
|
import Icon from 'mastodon/components/icon';
|
||||||
import { defineMessages, injectIntl, FormattedMessage, FormattedDate } from 'react-intl';
|
import { defineMessages, injectIntl, FormattedMessage, FormattedDate } from 'react-intl';
|
||||||
import { autoPlayGif, reduceMotion, disableSwiping } from 'mastodon/initial_state';
|
import { autoPlayGif, reduceMotion, disableSwiping } from 'mastodon/initial_state';
|
||||||
import elephantUIPlane from 'mastodon/../images/elephant_ui_plane.svg';
|
import elephantUIPlane from 'mastodon/../images/elephant_ui_plane.jpg';
|
||||||
import { mascot } from 'mastodon/initial_state';
|
import { mascot } from 'mastodon/initial_state';
|
||||||
import unicodeMapping from 'mastodon/features/emoji/emoji_unicode_mapping_light';
|
import unicodeMapping from 'mastodon/features/emoji/emoji_unicode_mapping_light';
|
||||||
import classNames from 'classnames';
|
import classNames from 'classnames';
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
.columns-area__panels {
|
.columns-area__panels {
|
||||||
|
|
||||||
background: url('../images/elephant_ui_plane.svg') no-repeat left bottom fixed, url('../images/logo_cipherbliss.png') no-repeat right bottom fixed;
|
background: url('../images/elephant_ui_plane.jpg') no-repeat left bottom fixed, url('../images/logo_cipherbliss.png') no-repeat right bottom fixed;
|
||||||
}
|
}
|
||||||
|
|
||||||
.status__content {
|
.status__content {
|
||||||
|
|
|
@ -1,6 +1,40 @@
|
||||||
.custom-img img{
|
.custom-img img {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
max-width: 50vw;
|
max-width: 50vw;
|
||||||
display: block;
|
display: block;
|
||||||
margin: 0 auto;
|
margin: 0 auto;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.custom_message_heading {
|
||||||
|
font-size: 2em;
|
||||||
|
margin-bottom: 0.5em;
|
||||||
|
text-align: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
.auth-page {
|
||||||
|
position: absolute;
|
||||||
|
top: 0;
|
||||||
|
width: 100%;
|
||||||
|
background: url('../images/bliss/a_travers_pic_mastodon_grey.jpg') 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;
|
||||||
|
img {
|
||||||
|
width: 400px;
|
||||||
|
max-width: 90vw;
|
||||||
|
margin: 1em auto;
|
||||||
|
display:inline-block;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
.title{
|
||||||
|
font-size: 3em;
|
||||||
|
margin-bottom: 0.5em;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
|
@ -1,4 +1,9 @@
|
||||||
= simple_form_for(new_user, url: user_session_path, namespace: 'login') do |f|
|
= simple_form_for(new_user, url: user_session_path, namespace: 'login') do |f|
|
||||||
|
%h2.custom_message_heading= t('auth.login')
|
||||||
|
.landing__custom_img
|
||||||
|
= class: 'custom-img' do
|
||||||
|
= image_tag asset_pack_path('media/images/bliss/login.jpg'), alt: @instance_presenter.site_title
|
||||||
|
%span.brand__tagline=t 'about.tagline'
|
||||||
.fields-group
|
.fields-group
|
||||||
- if use_seamless_external_login?
|
- if use_seamless_external_login?
|
||||||
= f.input :email, placeholder: t('simple_form.labels.defaults.username_or_email'), input_html: { 'aria-label' => t('simple_form.labels.defaults.username_or_email') }, hint: false
|
= f.input :email, placeholder: t('simple_form.labels.defaults.username_or_email'), input_html: { 'aria-label' => t('simple_form.labels.defaults.username_or_email') }, hint: false
|
||||||
|
|
|
@ -1,6 +1,9 @@
|
||||||
.simple_form__overlay-area{ class: (closed_registrations? && @instance_presenter.closed_registrations_message.present?) ? 'simple_form__overlay-area__blurred' : '' }
|
.simple_form__overlay-area{ class: (closed_registrations? && @instance_presenter.closed_registrations_message.present?) ? 'simple_form__overlay-area__blurred' : '' }
|
||||||
= simple_form_for(new_user, url: user_registration_path, namespace: 'registration', html: { novalidate: false }) do |f|
|
= simple_form_for(new_user, url: user_registration_path, namespace: 'registration', html: { novalidate: false }) do |f|
|
||||||
%p.lead= t('about.federation_hint_html', instance: content_tag(:strong, site_hostname))
|
%h3.custom_message_heading= t('auth.register')
|
||||||
|
.landing__custom_img
|
||||||
|
= class: 'custom-img' do
|
||||||
|
= image_tag asset_pack_path('media/images/bliss/register.jpg'), alt: @instance_presenter.site_title
|
||||||
|
|
||||||
.fields-group
|
.fields-group
|
||||||
= f.simple_fields_for :account do |account_fields|
|
= f.simple_fields_for :account do |account_fields|
|
||||||
|
|
|
@ -25,7 +25,7 @@
|
||||||
%span= t 'about.status_count_after', count: @instance_presenter.status_count
|
%span= t 'about.status_count_after', count: @instance_presenter.status_count
|
||||||
.row__mascot
|
.row__mascot
|
||||||
.landing-page__mascot
|
.landing-page__mascot
|
||||||
= image_tag @instance_presenter.mascot&.file&.url || asset_pack_path('media/images/elephant_ui_plane.svg'), alt: ''
|
= image_tag @instance_presenter.mascot&.file&.url || asset_pack_path('media/images/elephant_ui_plane.jpg'), alt: ''
|
||||||
|
|
||||||
.column-2
|
.column-2
|
||||||
.contact-widget
|
.contact-widget
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
.landing
|
.landing
|
||||||
.landing__custom_img
|
.landing__custom_img
|
||||||
= link_to root_url, class: 'custom-img' do
|
= link_to root_url, class: 'custom-img' do
|
||||||
= image_tag asset_pack_path('media/images/bliss/home.jpg'), alt: @instance_presenter.site_title
|
= image_tag asset_pack_path('media/images/bliss/a_travers_pic_mastodon_grey.jpg'), alt: @instance_presenter.site_title
|
||||||
%span.brand__tagline=t 'about.tagline'
|
%span.brand__tagline=t 'about.tagline'
|
||||||
.landing__brand
|
.landing__brand
|
||||||
= link_to root_url, class: 'brand' do
|
= link_to root_url, class: 'brand' do
|
||||||
|
@ -37,7 +37,7 @@
|
||||||
.directory__tag
|
.directory__tag
|
||||||
= optional_link_to Setting.timeline_preview, public_timeline_path do
|
= optional_link_to Setting.timeline_preview, public_timeline_path do
|
||||||
%h4
|
%h4
|
||||||
= fa_icon 'globe fw'
|
= fa_icon 'globe fw fa-3x'
|
||||||
= t('about.see_whats_happening')
|
= t('about.see_whats_happening')
|
||||||
%small= t('about.browse_public_posts')
|
%small= t('about.browse_public_posts')
|
||||||
|
|
||||||
|
|
|
@ -2,15 +2,21 @@
|
||||||
= javascript_pack_tag 'public', crossorigin: 'anonymous'
|
= javascript_pack_tag 'public', crossorigin: 'anonymous'
|
||||||
|
|
||||||
- content_for :content do
|
- content_for :content do
|
||||||
.container-alt
|
.auth-page.content
|
||||||
.logo-container
|
.container-alt
|
||||||
%h1
|
.logo-container
|
||||||
= link_to root_path do
|
%h1
|
||||||
= svg_logo_full
|
= link_to root_path do
|
||||||
|
= svg_logo_full
|
||||||
|
.img-custom
|
||||||
|
= image_tag asset_pack_path('media/images/bliss/login.jpg'), alt: @instance_presenter.site_title
|
||||||
|
|
||||||
.form-container
|
.form-container
|
||||||
= render 'flashes'
|
= render 'flashes'
|
||||||
|
|
||||||
= yield
|
%h2.title.is-2
|
||||||
|
= t('auth.login')
|
||||||
|
|
||||||
|
= yield
|
||||||
|
|
||||||
= render template: 'layouts/application'
|
= render template: 'layouts/application'
|
||||||
|
|
After Width: | Height: | Size: 1.3 KiB |
Before Width: | Height: | Size: 3.2 KiB After Width: | Height: | Size: 22 KiB |
After Width: | Height: | Size: 3.2 KiB |