Merge branch 'asonix/changes' into asonix/downstream
This commit is contained in:
commit
98a7ed1a53
|
@ -100,7 +100,7 @@ class ComposeForm extends ImmutablePureComponent {
|
||||||
const fulltext = this.getFulltextForCharacterCounting();
|
const fulltext = this.getFulltextForCharacterCounting();
|
||||||
const isOnlyWhitespace = fulltext.length !== 0 && fulltext.trim().length === 0;
|
const isOnlyWhitespace = fulltext.length !== 0 && fulltext.trim().length === 0;
|
||||||
|
|
||||||
return !(isSubmitting || isUploading || isChangingUpload || length(fulltext) > 500 || (isOnlyWhitespace && !anyMedia));
|
return !(isSubmitting || isUploading || isChangingUpload || length(fulltext) > 2000 || (isOnlyWhitespace && !anyMedia));
|
||||||
};
|
};
|
||||||
|
|
||||||
handleSubmit = (e) => {
|
handleSubmit = (e) => {
|
||||||
|
@ -297,7 +297,7 @@ class ComposeForm extends ImmutablePureComponent {
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div className='character-counter__wrapper'>
|
<div className='character-counter__wrapper'>
|
||||||
<CharacterCounter max={500} text={this.getFulltextForCharacterCounting()} />
|
<CharacterCounter max={2000} text={this.getFulltextForCharacterCounting()} />
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -1,6 +1,12 @@
|
||||||
// Commonly used web colors
|
// Commonly used web colors
|
||||||
$black: #3b3633; // Black
|
$black: #3b3633; // Black
|
||||||
$white: #fafafa; // White
|
$white: #fafafa; // White
|
||||||
|
$red-600: #a3360a; // Cerise
|
||||||
|
$red-500: #a3360a; // Cerise
|
||||||
|
$blurple-600: #40b6c5;
|
||||||
|
$blurple-500: #48b9c7;
|
||||||
|
$blurple-400: #48b9c7;
|
||||||
|
$blurple-300: #48b9c7;
|
||||||
|
|
||||||
$classic-base-color: #49423e; // Midnight Express
|
$classic-base-color: #49423e; // Midnight Express
|
||||||
$classic-primary-color: #c9c7c5; // Echo Blue
|
$classic-primary-color: #c9c7c5; // Echo Blue
|
||||||
|
@ -24,7 +30,7 @@ $darker-text-color: $classic-base-color !default;
|
||||||
$dark-text-color: #0c0c0c;
|
$dark-text-color: #0c0c0c;
|
||||||
$action-button-color: #635d58;
|
$action-button-color: #635d58;
|
||||||
|
|
||||||
$error-red: #a3360a; // Cerise
|
$error-red: $red-500; // Cerise
|
||||||
$warning-red: #f9dfb6; // Sunset Orange
|
$warning-red: #f9dfb6; // Sunset Orange
|
||||||
$gold-star: #faa41a; // Dark Goldenrod
|
$gold-star: #faa41a; // Dark Goldenrod
|
||||||
|
|
||||||
|
@ -37,7 +43,7 @@ $base-overlay-background: #3b3633;
|
||||||
$base-border-color: #fafafa;
|
$base-border-color: #fafafa;
|
||||||
$simple-background-color: #fafafa;
|
$simple-background-color: #fafafa;
|
||||||
$valid-value-color: #3e935b;
|
$valid-value-color: #3e935b;
|
||||||
$error-value-color: #a3360a;
|
$error-value-color: $warning-red;
|
||||||
|
|
||||||
//Newly added colors
|
//Newly added colors
|
||||||
$account-background-color: $white !default;
|
$account-background-color: $white !default;
|
||||||
|
|
|
@ -1,8 +1,15 @@
|
||||||
// Commonly used web colors
|
// Commonly used web colors
|
||||||
$black: #3b3633; // Black
|
$black: #3b3633; // Black
|
||||||
$white: #fafafa; // White
|
$white: #fafafa; // White
|
||||||
|
$red-600: #a3360a;
|
||||||
|
$red-500: #a3360a;
|
||||||
|
$blurple-600: #40b6c5;
|
||||||
|
$blurple-500: #48b9c7;
|
||||||
|
$blurple-400: #48b9c7;
|
||||||
|
$blurple-300: #48b9c7;
|
||||||
|
|
||||||
$success-green: #3e935b; // Padua
|
$success-green: #3e935b; // Padua
|
||||||
$error-red: #a3360a; // Cerise
|
$error-red: $red-500; // Cerise
|
||||||
$warning-red: #f9dfb6; // Sunset Orange
|
$warning-red: #f9dfb6; // Sunset Orange
|
||||||
$gold-star: #faa41a; // Dark Goldenrod
|
$gold-star: #faa41a; // Dark Goldenrod
|
||||||
|
|
||||||
|
@ -12,7 +19,7 @@ $base-border-color: #fafafa;
|
||||||
$simple-background-color: #fafafa;
|
$simple-background-color: #fafafa;
|
||||||
$primary-text-color: #fafafa;
|
$primary-text-color: #fafafa;
|
||||||
$valid-value-color: #3e935b;
|
$valid-value-color: #3e935b;
|
||||||
$error-value-color: #a3360a;
|
$error-value-color: $warning-red;
|
||||||
|
|
||||||
// Values from the classic Mastodon UI
|
// Values from the classic Mastodon UI
|
||||||
$classic-base-color: #49423e; // Midnight Express
|
$classic-base-color: #49423e; // Midnight Express
|
||||||
|
|
|
@ -1,8 +1,15 @@
|
||||||
// Commonly used web colors
|
// Commonly used web colors
|
||||||
$black: #3b3633; // Black
|
$black: #3b3633; // Black
|
||||||
$white: #fafafa; // White
|
$white: #fafafa; // White
|
||||||
|
$red-500: #a3360a;
|
||||||
|
$red-600: #a3360a;
|
||||||
|
$blurple-600: #1c70ce;
|
||||||
|
$blurple-500: #1c70ce;
|
||||||
|
$blurple-400: #1c70ce;
|
||||||
|
$blurple-300: #1c70ce;
|
||||||
|
|
||||||
$success-green: #3e935b; // Padua
|
$success-green: #3e935b; // Padua
|
||||||
$error-red: #a3360a; // Cerise
|
$error-red: $red-500; // Cerise
|
||||||
$warning-red: #f9dfb6; // Sunset Orange
|
$warning-red: #f9dfb6; // Sunset Orange
|
||||||
$gold-star: #faa41a; // Dark Goldenrod
|
$gold-star: #faa41a; // Dark Goldenrod
|
||||||
|
|
||||||
|
@ -12,7 +19,7 @@ $base-border-color: #fafafa;
|
||||||
$simple-background-color: #fafafa;
|
$simple-background-color: #fafafa;
|
||||||
$primary-text-color: #fafafa;
|
$primary-text-color: #fafafa;
|
||||||
$valid-value-color: #3e935b;
|
$valid-value-color: #3e935b;
|
||||||
$error-value-color: #a3360a;
|
$error-value-color: $warning-red;
|
||||||
|
|
||||||
// Values from the classic Mastodon UI
|
// Values from the classic Mastodon UI
|
||||||
$classic-base-color: #2a2a2a; // WS Black
|
$classic-base-color: #2a2a2a; // WS Black
|
||||||
|
|
Loading…
Reference in a new issue