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/auth_background.jpg b/app/javascript/images/bliss/auth_background.jpg new file mode 100644 index 000000000..f82bce31d Binary files /dev/null and b/app/javascript/images/bliss/auth_background.jpg differ diff --git a/app/javascript/images/bliss/home.jpg b/app/javascript/images/bliss/home.jpg new file mode 100644 index 000000000..418033a2d Binary files /dev/null and b/app/javascript/images/bliss/home.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/login.jpg b/app/javascript/images/bliss/login.jpg new file mode 100644 index 000000000..8389e7407 Binary files /dev/null and b/app/javascript/images/bliss/login.jpg differ diff --git a/app/javascript/images/bliss/login.xcf b/app/javascript/images/bliss/login.xcf new file mode 100644 index 000000000..d20b0ed28 Binary files /dev/null and b/app/javascript/images/bliss/login.xcf 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/bliss/register.jpg b/app/javascript/images/bliss/register.jpg new file mode 100644 index 000000000..cfb0eec35 Binary files /dev/null and b/app/javascript/images/bliss/register.jpg differ diff --git a/app/javascript/images/bliss/register.xcf b/app/javascript/images/bliss/register.xcf new file mode 100644 index 000000000..538bc74ba Binary files /dev/null and b/app/javascript/images/bliss/register.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..bbc6335a4 Binary files /dev/null and b/app/javascript/images/elephant_ui_plane.xcf differ diff --git a/app/javascript/images/home.jpg b/app/javascript/images/home.jpg new file mode 100644 index 000000000..279e0ff16 Binary files /dev/null and b/app/javascript/images/home.jpg 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/application.scss b/app/javascript/styles/application.scss index 8ebc45b62..e248acd98 100644 --- a/app/javascript/styles/application.scss +++ b/app/javascript/styles/application.scss @@ -6,6 +6,7 @@ @import 'mastodon/reset'; @import 'mastodon/basics'; +@import 'mastodon/custom'; @import 'mastodon/containers'; @import 'mastodon/lists'; @import 'mastodon/footer'; 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/javascript/styles/mastodon/_custom.scss b/app/javascript/styles/mastodon/_custom.scss new file mode 100644 index 000000000..322267e8d --- /dev/null +++ b/app/javascript/styles/mastodon/_custom.scss @@ -0,0 +1,59 @@ +.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{ + min-height: 100vh; + position: relative; + top: 0; + width: 100%; + background: url('../images/home.jpg') no-repeat fixed center; + background-size: cover; +} +.auth-page { + min-height: 100vh; + position: absolute; + top: 0; + width: 100%; + background: url('../images/bliss/auth_background.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; + 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/models/account.rb b/app/models/account.rb index 8a234a95f..291d3e571 100644 --- a/app/models/account.rb +++ b/app/models/account.rb @@ -3,6 +3,7 @@ # # Table name: accounts # +# id :bigint(8) not null, primary key # username :string default(""), not null # domain :string # private_key :text @@ -15,11 +16,11 @@ # url :string # avatar_file_name :string # avatar_content_type :string -# avatar_file_size :bigint(8) +# avatar_file_size :integer # avatar_updated_at :datetime # header_file_name :string # header_content_type :string -# header_file_size :bigint(8) +# header_file_size :integer # header_updated_at :datetime # avatar_remote_url :string # locked :boolean default(FALSE), not null @@ -30,7 +31,6 @@ # shared_inbox_url :string default(""), not null # followers_url :string default(""), not null # protocol :integer default("ostatus"), not null -# id :bigint(8) not null, primary key # memorial :boolean default(FALSE), not null # moved_to_account_id :bigint(8) # featured_collection_url :string diff --git a/app/models/account_statuses_cleanup_policy.rb b/app/models/account_statuses_cleanup_policy.rb index 0a9551ec2..0f78c1a54 100644 --- a/app/models/account_statuses_cleanup_policy.rb +++ b/app/models/account_statuses_cleanup_policy.rb @@ -4,8 +4,8 @@ # # Table name: account_statuses_cleanup_policies # -# id :bigint not null, primary key -# account_id :bigint not null +# id :bigint(8) not null, primary key +# account_id :bigint(8) not null # enabled :boolean default(TRUE), not null # min_status_age :integer default(1209600), not null # keep_direct :boolean default(TRUE), not null diff --git a/app/models/custom_emoji.rb b/app/models/custom_emoji.rb index bafbcbb8e..a85feb73a 100644 --- a/app/models/custom_emoji.rb +++ b/app/models/custom_emoji.rb @@ -8,7 +8,7 @@ # domain :string # image_file_name :string # image_content_type :string -# image_file_size :bigint(8) +# image_file_size :integer # image_updated_at :datetime # created_at :datetime not null # updated_at :datetime not null diff --git a/app/models/import.rb b/app/models/import.rb index 1d8617b88..00a54892e 100644 --- a/app/models/import.rb +++ b/app/models/import.rb @@ -3,16 +3,16 @@ # # Table name: imports # +# id :bigint(8) not null, primary key # type :integer not null # approved :boolean default(FALSE), not null # created_at :datetime not null # updated_at :datetime not null # data_file_name :string # data_content_type :string -# data_file_size :bigint(8) +# data_file_size :integer # data_updated_at :datetime # account_id :bigint(8) not null -# id :bigint(8) not null, primary key # overwrite :boolean default(FALSE), not null # diff --git a/app/models/media_attachment.rb b/app/models/media_attachment.rb index ae74fc83b..1741d20e9 100644 --- a/app/models/media_attachment.rb +++ b/app/models/media_attachment.rb @@ -3,10 +3,11 @@ # # Table name: media_attachments # +# id :bigint(8) not null, primary key # status_id :bigint(8) # file_file_name :string # file_content_type :string -# file_file_size :bigint(8) +# file_file_size :integer # file_updated_at :datetime # remote_url :string default(""), not null # created_at :datetime not null @@ -15,7 +16,6 @@ # type :integer default("image"), not null # file_meta :json # account_id :bigint(8) -# id :bigint(8) not null, primary key # description :text # scheduled_status_id :bigint(8) # blurhash :string diff --git a/app/models/preview_card.rb b/app/models/preview_card.rb index e43d7d9a8..bca3a3ce8 100644 --- a/app/models/preview_card.rb +++ b/app/models/preview_card.rb @@ -9,7 +9,7 @@ # description :string default(""), not null # image_file_name :string # image_content_type :string -# image_file_size :bigint(8) +# image_file_size :integer # image_updated_at :datetime # type :integer default("link"), not null # html :text default(""), not null diff --git a/app/models/site_upload.rb b/app/models/site_upload.rb index 108115e3e..cf10b30fc 100644 --- a/app/models/site_upload.rb +++ b/app/models/site_upload.rb @@ -7,7 +7,7 @@ # var :string default(""), not null # file_file_name :string # file_content_type :string -# file_file_size :bigint(8) +# file_file_size :integer # file_updated_at :datetime # meta :json # created_at :datetime not null diff --git a/app/views/about/_login.html.haml b/app/views/about/_login.html.haml index fa58f04d7..baa629458 100644 --- a/app/views/about/_login.html.haml +++ b/app/views/about/_login.html.haml @@ -1,4 +1,7 @@ = simple_form_for(new_user, url: user_session_path, namespace: 'login') do |f| + .before-stuff + %h2.custom_message_heading= t('auth.login') + .fields-group - 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 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 6ae9e6ae0..adf0dfc45 100644 --- a/app/views/about/show.html.haml +++ b/app/views/about/show.html.haml @@ -1,79 +1,82 @@ -- content_for :page_title do - = site_hostname +.page-show + - content_for :page_title do + = site_hostname -- content_for :header_tags do - %link{ rel: 'canonical', href: about_url }/ - = render partial: 'shared/og' + - content_for :header_tags do + %link{ rel: 'canonical', href: about_url }/ + = render partial: 'shared/og' -.landing - .landing__brand - = link_to root_url, class: 'brand' do - = svg_logo_full - %span.brand__tagline=t 'about.tagline' + .landing - .landing__grid - .landing__grid__column.landing__grid__column-registration - .box-widget - = render 'registration' + %span.brand__tagline=t 'about.tagline' + .landing__brand + = link_to root_url, class: 'brand' do + = svg_logo_full + %span.brand__tagline=t 'about.tagline' + + .landing__grid + .landing__grid__column.landing__grid__column-registration + .box-widget + = render 'registration' + + .directory + - if Setting.profile_directory + .directory__tag + = optional_link_to Setting.profile_directory, explore_path do + %h4 + = fa_icon 'address-book fw' + = t('about.discover_users') + %small= t('about.browse_directory') + + .avatar-stack + - @instance_presenter.sample_accounts.each do |account| + = image_tag current_account&.user&.setting_auto_play_gif ? account.avatar_original_url : account.avatar_static_url, alt: '', class: 'account__avatar' + + - if Setting.timeline_preview + .directory__tag + = optional_link_to Setting.timeline_preview, public_timeline_path do + %h4 + = fa_icon 'globe fw fa-3x' + = t('about.see_whats_happening') + %small= t('about.browse_public_posts') - .directory - - if Setting.profile_directory .directory__tag - = optional_link_to Setting.profile_directory, explore_path do + = link_to 'https://joinmastodon.org/apps', target: '_blank', rel: 'noopener noreferrer' do %h4 - = fa_icon 'address-book fw' - = t('about.discover_users') - %small= t('about.browse_directory') + = fa_icon 'tablet fw' + = t('about.get_apps') + %small= t('about.apps_platforms') - .avatar-stack - - @instance_presenter.sample_accounts.each do |account| - = image_tag current_account&.user&.setting_auto_play_gif ? account.avatar_original_url : account.avatar_static_url, alt: '', class: 'account__avatar' + .landing__grid__column.landing__grid__column-login + .box-widget + = render 'login' - - if Setting.timeline_preview - .directory__tag - = optional_link_to Setting.timeline_preview, public_timeline_path do - %h4 - = fa_icon 'globe fw' - = t('about.see_whats_happening') - %small= t('about.browse_public_posts') + .hero-widget + .hero-widget__img + = image_tag @instance_presenter.hero&.file&.url || @instance_presenter.thumbnail&.file&.url || asset_pack_path('media/images/preview.jpg'), alt: @instance_presenter.site_title - .directory__tag - = link_to 'https://joinmastodon.org/apps', target: '_blank', rel: 'noopener noreferrer' do - %h4 - = fa_icon 'tablet fw' - = t('about.get_apps') - %small= t('about.apps_platforms') + .hero-widget__text + %p + = @instance_presenter.site_short_description.html_safe.presence || t('about.about_mastodon_html') + = link_to about_more_path do + = t('about.learn_more') + = fa_icon 'angle-double-right' - .landing__grid__column.landing__grid__column-login - .box-widget - = render 'login' + .hero-widget__footer + .hero-widget__footer__column + %h4= t 'about.administered_by' - .hero-widget - .hero-widget__img - = image_tag @instance_presenter.hero&.file&.url || @instance_presenter.thumbnail&.file&.url || asset_pack_path('media/images/preview.jpg'), alt: @instance_presenter.site_title + = account_link_to @instance_presenter.contact_account - .hero-widget__text - %p - = @instance_presenter.site_short_description.html_safe.presence || t('about.about_mastodon_html') - = link_to about_more_path do - = t('about.learn_more') - = fa_icon 'angle-double-right' + .hero-widget__footer__column + %h4= t 'about.server_stats' - .hero-widget__footer - .hero-widget__footer__column - %h4= t 'about.administered_by' - - = account_link_to @instance_presenter.contact_account - - .hero-widget__footer__column - %h4= t 'about.server_stats' - - .hero-widget__counters__wrapper - .hero-widget__counter - %strong= friendly_number_to_human @instance_presenter.user_count - %span= t 'about.user_count_after', count: @instance_presenter.user_count - .hero-widget__counter - %strong= friendly_number_to_human @instance_presenter.active_user_count - %span - = t 'about.active_count_after' - %abbr{ title: t('about.active_footnote') } * + .hero-widget__counters__wrapper + .hero-widget__counter + %strong= friendly_number_to_human @instance_presenter.user_count + %span= t 'about.user_count_after', count: @instance_presenter.user_count + .hero-widget__counter + %strong= friendly_number_to_human @instance_presenter.active_user_count + %span + = t 'about.active_count_after' + %abbr{ title: t('about.active_footnote') } * diff --git a/app/views/layouts/auth.html.haml b/app/views/layouts/auth.html.haml index 0ea3bbe3b..e8e24beec 100644 --- a/app/views/layouts/auth.html.haml +++ b/app/views/layouts/auth.html.haml @@ -2,15 +2,23 @@ = javascript_pack_tag 'public', crossorigin: 'anonymous' - content_for :content do - .container-alt - .logo-container - %h1 - = link_to root_path do - = svg_logo_full + .auth-page.content + .container-alt + .logo-container + %h1 + = link_to root_path do + = svg_logo_full + .img-custom + %h2.title.is-2 + = t('auth.login') - .form-container - = render 'flashes' + = image_tag asset_pack_path('media/images/bliss/login.jpg'), alt: @instance_presenter.site_title - = yield + .form-container + = render 'flashes' + + + + = yield = render template: 'layouts/application' diff --git a/app/views/layouts/public.html.haml b/app/views/layouts/public.html.haml index bdb8a3a8e..47b128bcf 100644 --- a/app/views/layouts/public.html.haml +++ b/app/views/layouts/public.html.haml @@ -25,7 +25,7 @@ = link_to t('auth.login'), new_user_session_path, class: 'webapp-btn nav-link nav-button' = link_to t('auth.register'), available_sign_up_path, class: 'webapp-btn nav-link nav-button' - .container= yield + .main-container= yield .container .footer diff --git a/db/schema.rb b/db/schema.rb index 621647033..2bc0dbf72 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -162,11 +162,11 @@ ActiveRecord::Schema.define(version: 2021_08_08_071221) do t.string "url" t.string "avatar_file_name" t.string "avatar_content_type" - t.bigint "avatar_file_size" + t.integer "avatar_file_size" t.datetime "avatar_updated_at" t.string "header_file_name" t.string "header_content_type" - t.bigint "header_file_size" + t.integer "header_file_size" t.datetime "header_updated_at" t.string "avatar_remote_url" t.boolean "locked", default: false, null: false @@ -191,8 +191,8 @@ ActiveRecord::Schema.define(version: 2021_08_08_071221) do t.integer "avatar_storage_schema_version" t.integer "header_storage_schema_version" t.string "devices_url" - t.datetime "sensitized_at" t.integer "suspension_origin" + t.datetime "sensitized_at" t.index "(((setweight(to_tsvector('simple'::regconfig, (display_name)::text), 'A'::\"char\") || setweight(to_tsvector('simple'::regconfig, (username)::text), 'B'::\"char\")) || setweight(to_tsvector('simple'::regconfig, (COALESCE(domain, ''::character varying))::text), 'C'::\"char\")))", name: "search_index", using: :gin t.index "lower((username)::text), COALESCE(lower((domain)::text), ''::text)", name: "index_accounts_on_username_and_domain_lower", unique: true t.index ["moved_to_account_id"], name: "index_accounts_on_moved_to_account_id" @@ -324,7 +324,7 @@ ActiveRecord::Schema.define(version: 2021_08_08_071221) do t.string "domain" t.string "image_file_name" t.string "image_content_type" - t.bigint "image_file_size" + t.integer "image_file_size" t.datetime "image_updated_at" t.datetime "created_at", null: false t.datetime "updated_at", null: false @@ -471,7 +471,7 @@ ActiveRecord::Schema.define(version: 2021_08_08_071221) do t.datetime "updated_at", null: false t.string "data_file_name" t.string "data_content_type" - t.bigint "data_file_size" + t.integer "data_file_size" t.datetime "data_updated_at" t.bigint "account_id", null: false t.boolean "overwrite", default: false, null: false @@ -492,12 +492,12 @@ ActiveRecord::Schema.define(version: 2021_08_08_071221) do end create_table "ip_blocks", force: :cascade do |t| - t.inet "ip", default: "0.0.0.0", null: false - t.integer "severity", default: 0, null: false - t.datetime "expires_at" - t.text "comment", default: "", null: false t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.datetime "expires_at" + t.inet "ip", default: "0.0.0.0", null: false + t.integer "severity", default: 0, null: false + t.text "comment", default: "", null: false end create_table "list_accounts", force: :cascade do |t| @@ -544,7 +544,7 @@ ActiveRecord::Schema.define(version: 2021_08_08_071221) do t.bigint "status_id" t.string "file_file_name" t.string "file_content_type" - t.bigint "file_file_size" + t.integer "file_file_size" t.datetime "file_updated_at" t.string "remote_url", default: "", null: false t.datetime "created_at", null: false @@ -702,7 +702,7 @@ ActiveRecord::Schema.define(version: 2021_08_08_071221) do t.string "description", default: "", null: false t.string "image_file_name" t.string "image_content_type" - t.bigint "image_file_size" + t.integer "image_file_size" t.datetime "image_updated_at" t.integer "type", default: 0, null: false t.text "html", default: "", null: false @@ -804,7 +804,7 @@ ActiveRecord::Schema.define(version: 2021_08_08_071221) do t.string "var", default: "", null: false t.string "file_file_name" t.string "file_content_type" - t.bigint "file_file_size" + t.integer "file_file_size" t.datetime "file_updated_at" t.json "meta" t.datetime "created_at", null: false @@ -815,8 +815,8 @@ ActiveRecord::Schema.define(version: 2021_08_08_071221) do create_table "status_pins", force: :cascade do |t| t.bigint "account_id", null: false t.bigint "status_id", null: false - t.datetime "created_at", default: -> { "CURRENT_TIMESTAMP" }, null: false - t.datetime "updated_at", default: -> { "CURRENT_TIMESTAMP" }, null: false + t.datetime "created_at", default: -> { "now()" }, null: false + t.datetime "updated_at", default: -> { "now()" }, null: false t.index ["account_id", "status_id"], name: "index_status_pins_on_account_id_and_status_id", unique: true end diff --git a/public/avatars/original/icon_redface.gif b/public/avatars/original/icon_redface.gif new file mode 100755 index 000000000..d4dda578a Binary files /dev/null and b/public/avatars/original/icon_redface.gif differ diff --git a/public/avatars/original/missing.png b/public/avatars/original/missing.png index 34c8e45e6..f45f0b4f8 100644 Binary files a/public/avatars/original/missing.png and b/public/avatars/original/missing.png differ diff --git a/public/avatars/original/missing_o.png b/public/avatars/original/missing_o.png new file mode 100644 index 000000000..34c8e45e6 Binary files /dev/null and b/public/avatars/original/missing_o.png differ