diff --git a/app/javascript/styles/modern-dark-wobbl-old.scss b/app/javascript/styles/modern-dark-wobbl-old.scss new file mode 100644 index 000000000..abe21eb33 --- /dev/null +++ b/app/javascript/styles/modern-dark-wobbl-old.scss @@ -0,0 +1,8 @@ +@import 'wobbl-old/variables'; +@import 'application'; +@import 'modern/modern'; + +.layout-multiple-columns .column { + flex-grow: 1; + max-width: 500px; +} diff --git a/app/javascript/styles/modern-light-wobbl-old.scss b/app/javascript/styles/modern-light-wobbl-old.scss new file mode 100644 index 000000000..9b6d61b68 --- /dev/null +++ b/app/javascript/styles/modern-light-wobbl-old.scss @@ -0,0 +1,9 @@ +@import 'wobbl-old-light/variables'; +@import 'application'; +@import 'modern/modern'; +@import 'mastodon-light/diff'; + +.layout-multiple-columns .column { + flex-grow: 1; + max-width: 500px; +} diff --git a/app/javascript/styles/wobbl-old-light.scss b/app/javascript/styles/wobbl-old-light.scss new file mode 100644 index 000000000..5b75db98a --- /dev/null +++ b/app/javascript/styles/wobbl-old-light.scss @@ -0,0 +1,4 @@ +@import 'wobbl-old-light/variables'; +@import 'application'; +@import 'mastodon-light/diff'; + diff --git a/app/javascript/styles/wobbl-old-light/variables.scss b/app/javascript/styles/wobbl-old-light/variables.scss new file mode 100644 index 000000000..9e1d09906 --- /dev/null +++ b/app/javascript/styles/wobbl-old-light/variables.scss @@ -0,0 +1,44 @@ +// Dependent colors +$black: #000000; +$white: #ffffff; + +$classic-base-color: #191919;// Dark Gray +$classic-primary-color: #E7E7E7;// Platinum +$classic-secondary-color: #8c562a; // Paler red +$classic-highlight-color: #c45302; // Red highlights + +// Differences +$success-green: lighten(#3c754d, 8%); + +$base-overlay-background: $white !default; +$valid-value-color: $success-green !default; + +$ui-base-color: $classic-primary-color !default; +$ui-base-lighter-color: #b0c0cf; +$ui-primary-color: #9bcbed; +$ui-secondary-color: $classic-base-color !default; +$ui-highlight-color: $classic-highlight-color !default; + +$primary-text-color: $black !default; +$darker-text-color: $classic-base-color !default; +$highlight-text-color: darken($ui-highlight-color, 8%) !default; +$dark-text-color: #444b5d; +$action-button-color: #606984; + +$inverted-text-color: $black !default; +$lighter-text-color: $classic-base-color !default; +$light-text-color: #444b5d; + +// Newly added colors +$account-background-color: $white !default; + +// Invert darkened and lightened colors +@function darken($color, $amount) { + @return hsl(hue($color), saturation($color), lightness($color) + $amount); +} + +@function lighten($color, $amount) { + @return hsl(hue($color), saturation($color), lightness($color) - $amount); +} + +$emojis-requiring-inversion: 'chains'; diff --git a/app/javascript/styles/wobbl-old.scss b/app/javascript/styles/wobbl-old.scss new file mode 100644 index 000000000..5090b7902 --- /dev/null +++ b/app/javascript/styles/wobbl-old.scss @@ -0,0 +1,2 @@ +@import 'wobbl-old/variables'; +@import 'application'; diff --git a/app/javascript/styles/wobbl-old/variables.scss b/app/javascript/styles/wobbl-old/variables.scss new file mode 100644 index 000000000..7da727a4a --- /dev/null +++ b/app/javascript/styles/wobbl-old/variables.scss @@ -0,0 +1,60 @@ +// Commonly used web colors +$black: #000000; // Black +$white: #ffffff; // White +$success-green: #79bd9a !default; // Padua +$error-red: #df405a !default; // Cerise +$warning-red: #ff5050 !default; // Sunset Orange +$gold-star: #ca8f04 !default; // Dark Goldenrod + +$red-bookmark: $warning-red; + +// Values from the classic Mastodon UI +$classic-base-color: #37210f;// Dark Brown +$classic-primary-color: #E7E7E7;// Platinum +$classic-secondary-color: #E7E7E7; // Paler red +$classic-highlight-color: #c45302; // Red highlights + +// 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; +$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: lighten($ui-base-color, 26%) !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; + +// 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: lighten($ui-highlight-color, 8%) !default; +$action-button-color: $ui-base-lighter-color !default; +$passive-text-color: $gold-star !default; +$active-passive-text-color: $success-green !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; + +// 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-gap-breakpoint: 1175px; + +$font-sans-serif: 'mastodon-font-sans-serif' !default; +$font-display: 'mastodon-font-display' !default; +$font-monospace: 'mastodon-font-monospace' !default; diff --git a/config/locales/en.yml b/config/locales/en.yml index b81fe85e0..f001c9ba0 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1600,10 +1600,14 @@ en: mastodon-light: Mastodon (Light) wobbl: Mastodon (Dark - Wobbl theme) wobbl-light: Mastodon (Light - Wobbl theme) + wobbl-old: Mastodon (Dark - Original Wobbl Theme) + wobbl-old-light: Mastodon (Light - Original Wobbl Theme) modern-dark: Modern (Dark) modern-light: Modern (Light) - modern-light-wobbl: Modern (Light - Wobbl theme) default: Modern (Dark - Wobbl theme) (Default) + modern-light-wobbl: Modern (Light - Wobbl theme) + modern-dark-wobbl-old: Modern (Dark - Original Wobbl Theme) + modern-light-wobbl-old: Modern (Light - Original Wobbl Theme) time: formats: default: "%b %d, %Y, %H:%M" diff --git a/config/themes.yml b/config/themes.yml index e0a902f0e..17ff6b514 100644 --- a/config/themes.yml +++ b/config/themes.yml @@ -7,3 +7,7 @@ modern-dark: styles/modern-dark.scss modern-light: styles/modern-light.scss modern-light-wobbl: styles/modern-light-wobbl.scss default: styles/modern-dark-wobbl.scss +wobbl-old: styles/wobbl-old.scss +wobbl-old-light: styles/wobbl-old-light.scss +modern-dark-wobbl-old: styles/modern-dark-wobbl-old.scss +modern-light-wobbl-old: styles/modern-light-wobbl-old.scss