From 83bd3ee0516bc6a4a0e926851d4992fda14091ae Mon Sep 17 00:00:00 2001 From: Mike Barnes Date: Sun, 14 Oct 2018 15:13:33 +1100 Subject: [PATCH] Definitely remove old Chinwag theme and not accidentally re-import it from another branch again this time. --- app/javascript/styles/chinwag_light.scss | 24 -- .../styles/chinwag_light/overrides.scss | 259 ------------------ .../styles/chinwag_light/variables.scss | 64 ----- config/locales/en.yml | 1 - config/themes.yml | 3 +- 5 files changed, 1 insertion(+), 350 deletions(-) delete mode 100644 app/javascript/styles/chinwag_light.scss delete mode 100644 app/javascript/styles/chinwag_light/overrides.scss delete mode 100644 app/javascript/styles/chinwag_light/variables.scss diff --git a/app/javascript/styles/chinwag_light.scss b/app/javascript/styles/chinwag_light.scss deleted file mode 100644 index 52bb20570..000000000 --- a/app/javascript/styles/chinwag_light.scss +++ /dev/null @@ -1,24 +0,0 @@ -@import 'mastodon/mixins'; -@import 'chinwag_light/variables'; -@import 'fonts/roboto'; -@import 'fonts/roboto-mono'; -@import 'fonts/montserrat'; - -@import 'mastodon/reset'; -@import 'mastodon/basics'; -@import 'mastodon/containers'; -@import 'mastodon/lists'; -@import 'mastodon/footer'; -@import 'mastodon/compact_header'; -@import 'mastodon/landing_strip'; -@import 'mastodon/forms'; -@import 'mastodon/accounts'; -@import 'mastodon/stream_entries'; -@import 'mastodon/components'; -@import 'mastodon/emoji_picker'; -@import 'mastodon/about'; -@import 'mastodon/tables'; -@import 'mastodon/admin'; -@import 'mastodon/rtl'; - -@import 'chinwag_light/overrides'; diff --git a/app/javascript/styles/chinwag_light/overrides.scss b/app/javascript/styles/chinwag_light/overrides.scss deleted file mode 100644 index cfabde12a..000000000 --- a/app/javascript/styles/chinwag_light/overrides.scss +++ /dev/null @@ -1,259 +0,0 @@ -@import 'variables'; - -// Text-icons status buttons -.status, -.status.status-direct { - .icon-button { - color: $status-buttons-base-color; - - &:hover, - &:active, - &:focus { - color: $status-buttons-active-color; - } - - &.disabled { - color: $status-buttons-disabled-color; - } - } -} - -.status__content p { - color: $black; -} - -.icon-button.overlayed { - background: rgba($white, .6); - - &:hover { - background: rgba($white, .6); - } -} - -// Boost button -@function hex-color($color) { - @if type-of($color) == 'color' { - $color: str-slice(ie-hex-str($color), 4); - } - @return '%23' + unquote($color) -} - -button.icon-button i.fa-retweet { - background-image: url("data:image/svg+xml;utf8,"); - - &:hover { - background-image: url("data:image/svg+xml;utf8,"); - } -} - -button.icon-button.disabled i.fa-retweet { - background-image: url("data:image/svg+xml;utf8,"); - - &:hover { - background-image: url("data:image/svg+xml;utf8,"); - } -} - -// Spoilers button -.status__content, -.reply-indicator__content, { - .status__content__spoiler-link { - background-color: lighten($classic-secondary-color, 10%); - color: $black; - - &:focus, - &:hover, - &:active { - background-color: lighten($classic-highlight-color, 10%); - } - - &:disabled { - background-color: rgba($classic-secondary-color, .4); - color: rgba($black, .4); - } - } -} - -// Toot input -.drawer__inner { - background: darken($classic-base-color, 15%); -} - -.drawer__inner__mastodon { - background: darken($classic-base-color, 15%); -} - -.compose-form .autosuggest-textarea__textarea, -.compose-form .spoiler-input__input, -.compose-form .compose-form__buttons-wrapper .character-counter__wrapper .character-counter { - color: $black; -} - -.compose-form__buttons { - background: rgba($white, 0.3); - - .icon-button.inverted, - .text-icon-button { - color: $status-buttons-base-color; - - &:hover, - &:active, - &:focus { - color: $status-buttons-active-color; - } - - &.disabled { - color: $status-buttons-disabled-color; - } - } -} - -.compose-form__warning { - background: $classic-base-color; -} - -.reply-indicator { - background: $classic-base-color; - color: $black; - - * { - color: inherit; - } -} - -.privacy-dropdown__option, -.privacy-dropdown__option__content strong { - color: $classic-primary-color; -} - -.media-spoiler { - color: $classic-primary-color; - background: lighten($classic-base-color, 15%); - - &:hover { - color: $classic-highlight-color; - } -} - -.button { - background-color: lighten($classic-secondary-color, 10%); - color: $black; - - &:focus, - &:hover, - &:active { - background-color: lighten($classic-highlight-color, 10%); - } - - &:disabled { - background-color: rgba($classic-secondary-color, .4); - color: rgba($black, .4); - } - &.button-alternative { - color: $white; - background: $ui-primary-color; - - &:active, - &:focus, - &:hover { - background-color: lighten($ui-primary-color, 4%); - } - } -} - -.upload-progress__tracker { - background: $classic-primary-color; -} - -.activity-stream .detailed-status.light .detailed-status__display-name .display-name strong { - color: $ui-highlight-color; -} - -.activity-stream-tabs a.active, -.activity-stream .status.light .status__content { - color: $ui-highlight-color; -} - -.empty-column-indicator, -.error-column { - color: $classic-primary-color; -} - -// Dropdown Menu -.dropdown-menu__separator { - border-bottom: 1px solid lighten($ui-primary-color, 20%); -} - -.dropdown-menu { - background: $ui-base-color; -} - -.dropdown-menu__item { - a { - background: $ui-base-color; - color: $ui-primary-color; - - &:focus, - &:hover, - &:active { - background: $ui-highlight-color; - color: $ui-primary-color; - } - } -} - -.dropdown-menu__arrow { - &.left { - border-left-color: $ui-base-color; - } - &.top { - border-top-color: $ui-base-color; - } - &.bottom { - border-bottom-color: $ui-base-color; - } - &.right { - border-right-color: $ui-base-color; - } -} - -// Landing Page -.simple_form .input-with-append .append { - color: $ui-primary-color; -} - -.landing-page__forms, -.landing-page__information, -.landing-page__call-to-action { - background: #f9fcf9; -} - -.landing-page__logo img { - mix-blend-mode: darken; -} - -.muted { - .status__content p, - .status__content a { - color: $darker-text-color; - } - - .status__display-name strong { - color: $darker-text-color; - } - - .status__avatar { - opacity: 0.5; - } - - a.status__content__spoiler-link { - background: $ui-base-lighter-color; - color: $inverted-text-color; - - &:hover { - background: lighten($ui-base-lighter-color, 7%); - text-decoration: none; - } - } -} - diff --git a/app/javascript/styles/chinwag_light/variables.scss b/app/javascript/styles/chinwag_light/variables.scss deleted file mode 100644 index 9729e1bf6..000000000 --- a/app/javascript/styles/chinwag_light/variables.scss +++ /dev/null @@ -1,64 +0,0 @@ -// Commonly used web colors -$black: #000; // Black -$white: #fff; // White -$success-green: #79bd9a; // Padua -$error-red: #df405a; // Cerise -$warning-red: #ff5050; // Sunset Orange -$gold-star: #ca8f04; // Dark Goldenrod - -// Chinwag Greens -$classic-base-color: #e9f2e1; // Light Base -$classic-primary-color: #28372c; // Very Dark -$classic-secondary-color: #638f37; // Darker Green -$classic-highlight-color: #85c04b; // Lighter Green - -// Variables for defaults in UI -$base-shadow-color: $black !default; -$base-overlay-background: $black !default; -$base-border-color: $white !default; -$simple-background-color: $white !default; -$primary-text-color: $black !default; -$darker-text-color: rgba($primary-text-color, 0.7) !default; -$highlight-text-color: $classic-highlight-color !default; -$inverted-text-color: $black !default; -$lighter-text-color: rgba($inverted-text-color, 0.7) !default; -$action-button-color: #8d9ac2; -$valid-value-color: $success-green !default; -$error-value-color: $error-red !default; - -// Tell UI to use selected colors -$ui-base-color: $classic-base-color !default; // Darkest -$ui-base-lighter-color: darken($ui-base-color, 36%) !default; // Lighter darkest -$ui-primary-color: $classic-primary-color !default; // Lighter -$ui-secondary-color: $classic-secondary-color !default; // Lightest -$ui-highlight-color: $classic-highlight-color !default; // Vibrant - -// Variables for texts -$primary-text-color: $white !default; -$darker-text-color: $ui-primary-color !default; -$dark-text-color: $ui-base-lighter-color !default; -$secondary-text-color: $ui-secondary-color !default; -$highlight-text-color: $ui-highlight-color !default; -$action-button-color: $ui-base-lighter-color !default; -// For texts on inverted backgrounds -$inverted-text-color: $ui-base-color !default; -$lighter-text-color: $ui-base-lighter-color !default; -$light-text-color: $ui-primary-color !default; - -// Buttons colors -$status-buttons-base-color: $ui-primary-color; -$status-buttons-active-color: $classic-highlight-color; -$status-buttons-disabled-color: rgba($status-buttons-base-color, .4); - -// Spoilers - Show More button -$status-spoilers-background: $classic-primary-color; -$status-spoilers-text: $white; -$status-spoilers-active-background: $classic-highlight-color; - -// Language codes that uses CJK fonts -$cjk-langs: ja, ko, zh-CN, zh-HK, zh-TW; - -// Variables for components -$media-modal-media-max-width: 100%; -// put margins on top and bottom of image to avoid the screen covered by image. -$media-modal-media-max-height: 80%; \ No newline at end of file diff --git a/config/locales/en.yml b/config/locales/en.yml index 11ef5a62b..79484454e 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -867,7 +867,6 @@ en: themes: default: Chinwag mastodon: Mastodon Dark - chinwag_light: Chinwag (Old) contrast: High Contrast time: formats: diff --git a/config/themes.yml b/config/themes.yml index 867b3144b..ac992643f 100644 --- a/config/themes.yml +++ b/config/themes.yml @@ -1,4 +1,3 @@ default: styles/mastodon-light.scss mastodon: styles/application.scss -chinwag_light: styles/chinwag_light.scss -contrast: styles/contrast.scss \ No newline at end of file +contrast: styles/contrast.scss