diff --git a/app/helpers/mascot_helper.rb b/app/helpers/mascot_helper.rb index 0124c74f1..a9c77afb3 100644 --- a/app/helpers/mascot_helper.rb +++ b/app/helpers/mascot_helper.rb @@ -2,7 +2,7 @@ module MascotHelper 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 private diff --git a/app/javascript/images/bliss/a_travers_pic_mastodon_grey.jpg b/app/javascript/images/bliss/a_travers_pic_mastodon_grey.jpg new file mode 100644 index 000000000..f82bce31d Binary files /dev/null and b/app/javascript/images/bliss/a_travers_pic_mastodon_grey.jpg differ diff --git a/app/javascript/images/bliss/home2.jpg b/app/javascript/images/bliss/home2.jpg new file mode 100644 index 000000000..05207c3bb Binary files /dev/null and b/app/javascript/images/bliss/home2.jpg differ diff --git a/app/javascript/images/bliss/originals/elephant_ui_greeting.svg b/app/javascript/images/bliss/originals/elephant_ui_greeting.svg new file mode 100644 index 000000000..f3eb4b142 --- /dev/null +++ b/app/javascript/images/bliss/originals/elephant_ui_greeting.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/javascript/images/bliss/originals/elephant_ui_plane.svg b/app/javascript/images/bliss/originals/elephant_ui_plane.svg new file mode 100644 index 000000000..ca675c9eb --- /dev/null +++ b/app/javascript/images/bliss/originals/elephant_ui_plane.svg @@ -0,0 +1 @@ + diff --git a/app/javascript/images/bliss/originals/preview.jpg b/app/javascript/images/bliss/originals/preview.jpg new file mode 100644 index 000000000..ec2856748 Binary files /dev/null and b/app/javascript/images/bliss/originals/preview.jpg differ diff --git a/app/javascript/images/bliss/preview_bliss.xcf b/app/javascript/images/bliss/preview_bliss.xcf new file mode 100644 index 000000000..dcd9ed519 Binary files /dev/null and b/app/javascript/images/bliss/preview_bliss.xcf differ diff --git a/app/javascript/images/elephant_ui_greeting.jpg b/app/javascript/images/elephant_ui_greeting.jpg new file mode 100644 index 000000000..8f44769ef Binary files /dev/null and b/app/javascript/images/elephant_ui_greeting.jpg differ diff --git a/app/javascript/images/elephant_ui_greeting.xcf b/app/javascript/images/elephant_ui_greeting.xcf new file mode 100644 index 000000000..103476e67 Binary files /dev/null and b/app/javascript/images/elephant_ui_greeting.xcf differ diff --git a/app/javascript/images/elephant_ui_plane.jpg b/app/javascript/images/elephant_ui_plane.jpg new file mode 100644 index 000000000..24e29c1ff Binary files /dev/null and b/app/javascript/images/elephant_ui_plane.jpg differ diff --git a/app/javascript/images/elephant_ui_plane.xcf b/app/javascript/images/elephant_ui_plane.xcf new file mode 100644 index 000000000..86d7f1834 Binary files /dev/null and b/app/javascript/images/elephant_ui_plane.xcf differ diff --git a/app/javascript/images/preview.jpg b/app/javascript/images/preview.jpg index ec2856748..b15f59a38 100644 Binary files a/app/javascript/images/preview.jpg and b/app/javascript/images/preview.jpg differ diff --git a/app/javascript/mastodon/features/compose/components/compose_form.js b/app/javascript/mastodon/features/compose/components/compose_form.js index a57e8e2d4..ae3cb57cf 100644 --- a/app/javascript/mastodon/features/compose/components/compose_form.js +++ b/app/javascript/mastodon/features/compose/components/compose_form.js @@ -21,7 +21,7 @@ import { length } from 'stringz'; import { countableText } from '../util/counter'; 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'; diff --git a/app/javascript/mastodon/features/follow_recommendations/index.js b/app/javascript/mastodon/features/follow_recommendations/index.js index b5a71aef5..411362d99 100644 --- a/app/javascript/mastodon/features/follow_recommendations/index.js +++ b/app/javascript/mastodon/features/follow_recommendations/index.js @@ -11,7 +11,7 @@ import { markAsPartial } from 'mastodon/actions/timelines'; import Column from 'mastodon/features/ui/components/column'; import Account from './components/account'; 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'; const mapStateToProps = state => ({ diff --git a/app/javascript/mastodon/features/getting_started/components/announcements.js b/app/javascript/mastodon/features/getting_started/components/announcements.js index 24db8cede..441ddad4b 100644 --- a/app/javascript/mastodon/features/getting_started/components/announcements.js +++ b/app/javascript/mastodon/features/getting_started/components/announcements.js @@ -7,7 +7,7 @@ import IconButton from 'mastodon/components/icon_button'; import Icon from 'mastodon/components/icon'; import { defineMessages, injectIntl, FormattedMessage, FormattedDate } from 'react-intl'; 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 unicodeMapping from 'mastodon/features/emoji/emoji_unicode_mapping_light'; import classNames from 'classnames'; diff --git a/app/javascript/styles/bliss/_general_overrides.scss b/app/javascript/styles/bliss/_general_overrides.scss index d37bc4972..c7e027df2 100644 --- a/app/javascript/styles/bliss/_general_overrides.scss +++ b/app/javascript/styles/bliss/_general_overrides.scss @@ -2,7 +2,7 @@ .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 { diff --git a/app/views/about/more.html.haml b/app/views/about/more.html.haml index f4429622c..004fc61db 100644 --- a/app/views/about/more.html.haml +++ b/app/views/about/more.html.haml @@ -25,7 +25,7 @@ %span= t 'about.status_count_after', count: @instance_presenter.status_count .row__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 .contact-widget diff --git a/app/views/about/show.html.haml b/app/views/about/show.html.haml index 6d4f6c63e..8d89b81ee 100644 --- a/app/views/about/show.html.haml +++ b/app/views/about/show.html.haml @@ -8,7 +8,7 @@ .landing .landing__custom_img = 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' .landing__brand = link_to root_url, class: 'brand' do