Theming and such
This commit is contained in:
parent
977131845e
commit
02f81fb4b7
8
app/javascript/styles/modern-dark-wobbl.scss
Normal file
8
app/javascript/styles/modern-dark-wobbl.scss
Normal file
@ -0,0 +1,8 @@
|
||||
@import 'wobbl/variables';
|
||||
@import 'application';
|
||||
@import 'modern/modern';
|
||||
|
||||
.layout-multiple-columns .column {
|
||||
flex-grow: 1;
|
||||
max-width: 500px;
|
||||
}
|
8
app/javascript/styles/modern-dark.scss
Normal file
8
app/javascript/styles/modern-dark.scss
Normal file
@ -0,0 +1,8 @@
|
||||
@import 'mastodon/variables';
|
||||
@import 'application';
|
||||
@import 'modern/modern';
|
||||
|
||||
.layout-multiple-columns .column {
|
||||
flex-grow: 1;
|
||||
max-width: 500px;
|
||||
}
|
9
app/javascript/styles/modern-light-wobbl.scss
Normal file
9
app/javascript/styles/modern-light-wobbl.scss
Normal file
@ -0,0 +1,9 @@
|
||||
@import 'wobbl-light/variables';
|
||||
@import 'application';
|
||||
@import 'modern/modern';
|
||||
@import 'mastodon-light/diff';
|
||||
|
||||
.layout-multiple-columns .column {
|
||||
flex-grow: 1;
|
||||
max-width: 500px;
|
||||
}
|
9
app/javascript/styles/modern-light.scss
Normal file
9
app/javascript/styles/modern-light.scss
Normal file
@ -0,0 +1,9 @@
|
||||
@import 'mastodon-light/variables';
|
||||
@import 'application';
|
||||
@import 'modern/modern';
|
||||
@import 'mastodon-light/diff';
|
||||
|
||||
.layout-multiple-columns .column {
|
||||
flex-grow: 1;
|
||||
max-width: 500px;
|
||||
}
|
4640
app/javascript/styles/modern/modern.scss
Normal file
4640
app/javascript/styles/modern/modern.scss
Normal file
File diff suppressed because it is too large
Load Diff
4
app/javascript/styles/wobbl-light.scss
Normal file
4
app/javascript/styles/wobbl-light.scss
Normal file
@ -0,0 +1,4 @@
|
||||
@import 'wobbl-light/variables';
|
||||
@import 'application';
|
||||
@import 'mastodon-light/diff';
|
||||
|
44
app/javascript/styles/wobbl-light/variables.scss
Normal file
44
app/javascript/styles/wobbl-light/variables.scss
Normal file
@ -0,0 +1,44 @@
|
||||
// Dependent colors
|
||||
$black: #000000;
|
||||
$white: #ffffff;
|
||||
|
||||
$classic-base-color: #191919;// Dark Gray
|
||||
$classic-primary-color: #E7E7E7;// Platinum
|
||||
$classic-secondary-color: #FF8680; // Paler red
|
||||
$classic-highlight-color: #850700; // 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';
|
2
app/javascript/styles/wobbl.scss
Normal file
2
app/javascript/styles/wobbl.scss
Normal file
@ -0,0 +1,2 @@
|
||||
@import 'wobbl/variables';
|
||||
@import 'application';
|
60
app/javascript/styles/wobbl/variables.scss
Normal file
60
app/javascript/styles/wobbl/variables.scss
Normal file
@ -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: #191919;// Dark Gray
|
||||
$classic-primary-color: #E7E7E7;// Platinum
|
||||
$classic-secondary-color: #FF8680; // Paler red
|
||||
$classic-highlight-color: #850700; // 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;
|
@ -11,7 +11,7 @@ class REST::InstanceSerializer < ActiveModel::Serializer
|
||||
|
||||
attributes :domain, :title, :version, :source_url, :description,
|
||||
:usage, :thumbnail, :languages, :configuration,
|
||||
:registrations
|
||||
:registrations, :max_toot_chars
|
||||
|
||||
has_one :contact, serializer: ContactSerializer
|
||||
has_many :rules, serializer: REST::RuleSerializer
|
||||
@ -95,6 +95,10 @@ class REST::InstanceSerializer < ActiveModel::Serializer
|
||||
}
|
||||
end
|
||||
|
||||
def max_toot_chars
|
||||
1500
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def registrations_enabled?
|
||||
|
@ -1772,7 +1772,12 @@ en:
|
||||
contrast: Mastodon (High contrast)
|
||||
default: Mastodon (Dark)
|
||||
mastodon-light: Mastodon (Light)
|
||||
system: Automatic (use system theme)
|
||||
wobbl: Mastodon (Dark - Wobbl theme)
|
||||
wobbl-light: Mastodon (Light - Wobbl theme)
|
||||
modern-dark: Modern (Dark)
|
||||
modern-light: Modern (Light)
|
||||
modern-light-wobbl: Modern (Light - Wobbl theme)
|
||||
default: Modern (Dark - Wobbl theme) (Default)
|
||||
time:
|
||||
formats:
|
||||
default: "%b %d, %Y, %H:%M"
|
||||
|
Loading…
x
Reference in New Issue
Block a user