From 43c0067865ef7cea21b3d2dd7135ad6a2ae730d5 Mon Sep 17 00:00:00 2001 From: Tykayn Date: Fri, 4 Feb 2022 10:52:07 +0100 Subject: [PATCH] hop --- app/javascript/styles/application.scss | 7 +++ app/javascript/styles/mastodon/_custom.scss | 12 ++++- app/views/about/show.html.haml | 4 +- db/schema.rb | 52 ++++++++++++++++++++- 4 files changed, 71 insertions(+), 4 deletions(-) diff --git a/app/javascript/styles/application.scss b/app/javascript/styles/application.scss index e248acd98..c456a93bf 100644 --- a/app/javascript/styles/application.scss +++ b/app/javascript/styles/application.scss @@ -27,3 +27,10 @@ @import 'mastodon/dashboard'; @import 'mastodon/rtl'; @import 'mastodon/accessibility'; + +// 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 322267e8d..979bbfdad 100644 --- a/app/javascript/styles/mastodon/_custom.scss +++ b/app/javascript/styles/mastodon/_custom.scss @@ -11,12 +11,21 @@ text-align: center; } .page-show{ - min-height: 100vh; + height: 50vh; + min-height: 50vh; position: relative; top: 0; width: 100%; background: url('../images/home.jpg') 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; @@ -57,3 +66,4 @@ margin-bottom: 0.5em; } } + diff --git a/app/views/about/show.html.haml b/app/views/about/show.html.haml index 7170bb3e5..e47ee8551 100644 --- a/app/views/about/show.html.haml +++ b/app/views/about/show.html.haml @@ -5,10 +5,10 @@ - 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' .landing - - %span.brand__tagline=t 'about.tagline' .landing__brand = link_to root_url, class: 'brand' do = svg_logo_full diff --git a/db/schema.rb b/db/schema.rb index 4ec50f89e..2bc0dbf72 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2021_06_30_000137) do +ActiveRecord::Schema.define(version: 2021_08_08_071221) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -114,6 +114,23 @@ ActiveRecord::Schema.define(version: 2021_06_30_000137) do t.index ["account_id"], name: "index_account_stats_on_account_id", unique: true end + create_table "account_statuses_cleanup_policies", force: :cascade do |t| + t.bigint "account_id", null: false + t.boolean "enabled", default: true, null: false + t.integer "min_status_age", default: 1209600, null: false + t.boolean "keep_direct", default: true, null: false + t.boolean "keep_pinned", default: true, null: false + t.boolean "keep_polls", default: false, null: false + t.boolean "keep_media", default: false, null: false + t.boolean "keep_self_fav", default: true, null: false + t.boolean "keep_self_bookmark", default: true, null: false + t.integer "min_favs" + t.integer "min_reblogs" + t.datetime "created_at", precision: 6, null: false + t.datetime "updated_at", precision: 6, null: false + t.index ["account_id"], name: "index_account_statuses_cleanup_policies_on_account_id" + end + create_table "account_warning_presets", force: :cascade do |t| t.text "text", default: "", null: false t.datetime "created_at", null: false @@ -236,6 +253,13 @@ ActiveRecord::Schema.define(version: 2021_06_30_000137) do t.bigint "status_ids", array: true end + create_table "articles", force: :cascade do |t| + t.string "title" + t.text "text" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + create_table "backups", force: :cascade do |t| t.bigint "user_id" t.string "dump_file_name" @@ -494,6 +518,18 @@ ActiveRecord::Schema.define(version: 2021_06_30_000137) do t.index ["account_id"], name: "index_lists_on_account_id" end + create_table "login_activities", force: :cascade do |t| + t.bigint "user_id", null: false + t.string "authentication_method" + t.string "provider" + t.boolean "success" + t.string "failure_reason" + t.inet "ip" + t.string "user_agent" + t.datetime "created_at" + t.index ["user_id"], name: "index_login_activities_on_user_id" + end + create_table "markers", force: :cascade do |t| t.bigint "user_id" t.string "timeline", default: "", null: false @@ -868,6 +904,17 @@ ActiveRecord::Schema.define(version: 2021_06_30_000137) do t.index ["domain"], name: "index_unavailable_domains_on_domain", unique: true end + create_table "user_groups", force: :cascade do |t| + t.string "name", null: false + t.datetime "createdAt" + t.string "visibility" + t.integer "account_id" + t.integer "creator_id" + t.integer "statuses_count" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + create_table "user_invite_requests", force: :cascade do |t| t.bigint "user_id" t.text "text" @@ -915,6 +962,7 @@ ActiveRecord::Schema.define(version: 2021_06_30_000137) do t.datetime "sign_in_token_sent_at" t.string "webauthn_id" t.inet "sign_up_ip" + t.boolean "skip_sign_in_token" t.index ["account_id"], name: "index_users_on_account_id" t.index ["confirmation_token"], name: "index_users_on_confirmation_token", unique: true t.index ["created_by_application_id"], name: "index_users_on_created_by_application_id" @@ -971,6 +1019,7 @@ ActiveRecord::Schema.define(version: 2021_06_30_000137) do add_foreign_key "account_pins", "accounts", column: "target_account_id", on_delete: :cascade add_foreign_key "account_pins", "accounts", on_delete: :cascade add_foreign_key "account_stats", "accounts", on_delete: :cascade + add_foreign_key "account_statuses_cleanup_policies", "accounts", on_delete: :cascade add_foreign_key "account_warnings", "accounts", column: "target_account_id", on_delete: :cascade add_foreign_key "account_warnings", "accounts", on_delete: :nullify add_foreign_key "accounts", "accounts", column: "moved_to_account_id", on_delete: :nullify @@ -1010,6 +1059,7 @@ ActiveRecord::Schema.define(version: 2021_06_30_000137) do add_foreign_key "list_accounts", "follows", on_delete: :cascade add_foreign_key "list_accounts", "lists", on_delete: :cascade add_foreign_key "lists", "accounts", on_delete: :cascade + add_foreign_key "login_activities", "users", on_delete: :cascade add_foreign_key "markers", "users", on_delete: :cascade add_foreign_key "media_attachments", "accounts", name: "fk_96dd81e81b", on_delete: :nullify add_foreign_key "media_attachments", "scheduled_statuses", on_delete: :nullify