From a4a9ab883923a4622443e0d13cbf97380ceb9c3d Mon Sep 17 00:00:00 2001 From: Robin Mayorga Date: Mon, 19 Dec 2022 15:46:05 -0500 Subject: [PATCH] Entirely remove beach city theme --- app/javascript/styles/beachcity.scss | 3 -- app/javascript/styles/beachcity/colors.scss | 5 -- app/javascript/styles/beachcity/diff.scss | 60 --------------------- config/locales/en.yml | 2 - 4 files changed, 70 deletions(-) delete mode 100644 app/javascript/styles/beachcity.scss delete mode 100644 app/javascript/styles/beachcity/colors.scss delete mode 100644 app/javascript/styles/beachcity/diff.scss diff --git a/app/javascript/styles/beachcity.scss b/app/javascript/styles/beachcity.scss deleted file mode 100644 index 1cb7ccc90c688..0000000000000 --- a/app/javascript/styles/beachcity.scss +++ /dev/null @@ -1,3 +0,0 @@ -@import 'beachcity/colors'; -@import 'application'; -@import 'beachcity/diff'; \ No newline at end of file diff --git a/app/javascript/styles/beachcity/colors.scss b/app/javascript/styles/beachcity/colors.scss deleted file mode 100644 index 1086557ee4693..0000000000000 --- a/app/javascript/styles/beachcity/colors.scss +++ /dev/null @@ -1,5 +0,0 @@ -$ui-base-color: #661848; -$ui-base-lighter-color: #FE86AA; -$ui-primary-color: #FED6B8; -$ui-secondary-color: #FFFFD9; -$ui-highlight-color: #C4385F; diff --git a/app/javascript/styles/beachcity/diff.scss b/app/javascript/styles/beachcity/diff.scss deleted file mode 100644 index a19886ea17f57..0000000000000 --- a/app/javascript/styles/beachcity/diff.scss +++ /dev/null @@ -1,60 +0,0 @@ -.ui { - background: none !important; - background-image: url(https://beach.city/beach_city.jpg) !important; - background-size: cover !important; -} - -.drawer__inner { - background-color: rgba(70, 0, 50, 0.9) !important; -} - -.column > .scrollable, .empty-column-indicator { - background: rgba(70, 0, 50, 0.9) !important; -} - -.drawer__inner__mastodon { - background: none !important; -} - -/* Temporary changes for fixing single column mode - ag */ -.navigation-panel, .compose-panel { - background:rgba(70, 0, 50, 0.9); - height: auto -} - -.navigation-bar, .navigation-panel a:nth-child(1) { - background: #771c54 -} - -/* end temp changes */ - -.compose-form textarea, .compose-form__modifiers, .compose-form .spoiler-input__input { - background-color: #FFFFD9 !important; -} - -.compose-form .compose-form__upload-description textarea { - background-color: transparent !important; -} - -.compose-form__buttons-wrapper { - background-color: #FED6B8 !important; -} - -.search-popout { - background-color: #FFFFD9 !important; - color: #C5827A !important; - h4 { - color: #C4385F !important; - } - em { - color: #C4385F !important; - } -} - -.onboarding-modal__dot { - background: #FED6B8 !important; -} - -.onboarding-modal__dot.active { - background: #FE86AA !important; -} \ No newline at end of file diff --git a/config/locales/en.yml b/config/locales/en.yml index ec6dc1d16b92a..d67612d99b924 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1735,8 +1735,6 @@ en: contrast: Mastodon (High contrast) default: Mastodon (Dark) mastodon-light: Mastodon (Light) - mastodon-dark: Mastodon (Dark) - beach-city: Beach City time: formats: default: "%b %d, %Y, %H:%M"