Fix full-dark theme
This commit is contained in:
parent
3af223275f
commit
3c43f84cdb
6 changed files with 37 additions and 4 deletions
|
@ -107,7 +107,7 @@ class Circles extends ImmutablePureComponent {
|
||||||
>
|
>
|
||||||
{circles.map(circle =>
|
{circles.map(circle =>
|
||||||
(<div key={circle.get('id')} className='circle-item'>
|
(<div key={circle.get('id')} className='circle-item'>
|
||||||
<ColumnLink to={`#`} data-id={circle.get('id')} onClick={this.handleEditClick} icon='user-circle' text={circle.get('title')} />,
|
<ColumnLink to={`#`} data-id={circle.get('id')} onClick={this.handleEditClick} icon='user-circle' text={circle.get('title')} />
|
||||||
<IconButton icon='trash' data_id={circle.get('id')} onClick={this.handleRemoveClick} />
|
<IconButton icon='trash' data_id={circle.get('id')} onClick={this.handleRemoveClick} />
|
||||||
</div>)
|
</div>)
|
||||||
)}
|
)}
|
||||||
|
|
|
@ -11,7 +11,7 @@ import Warning from '../components/warning';
|
||||||
|
|
||||||
const mapStateToProps = state => ({
|
const mapStateToProps = state => ({
|
||||||
needsLockWarning: state.getIn(['compose', 'privacy']) === 'private' && !state.getIn(['accounts', me, 'locked']),
|
needsLockWarning: state.getIn(['compose', 'privacy']) === 'private' && !state.getIn(['accounts', me, 'locked']),
|
||||||
hashtagWarning: ['public', 'public_unlisted', 'login'].includes(state.getIn(['compose', 'privacy'])) && state.getIn(['compose', 'searchability']) !== 'public' && HASHTAG_PATTERN_REGEX.test(state.getIn(['compose', 'text'])),
|
hashtagWarning: !['public', 'public_unlisted', 'login'].includes(state.getIn(['compose', 'privacy'])) && state.getIn(['compose', 'searchability']) !== 'public' && HASHTAG_PATTERN_REGEX.test(state.getIn(['compose', 'text'])),
|
||||||
directMessageWarning: state.getIn(['compose', 'privacy']) === 'direct',
|
directMessageWarning: state.getIn(['compose', 'privacy']) === 'direct',
|
||||||
searchabilityWarning: state.getIn(['compose', 'searchability']) === 'limited',
|
searchabilityWarning: state.getIn(['compose', 'searchability']) === 'limited',
|
||||||
limitedPostWarning: ['mutual', 'circle'].includes(state.getIn(['compose', 'privacy'])),
|
limitedPostWarning: ['mutual', 'circle'].includes(state.getIn(['compose', 'privacy'])),
|
||||||
|
|
|
@ -2,8 +2,40 @@ input,
|
||||||
textarea {
|
textarea {
|
||||||
background: $ui-base-color !important;
|
background: $ui-base-color !important;
|
||||||
color: $primary-text-color !important;
|
color: $primary-text-color !important;
|
||||||
|
|
||||||
|
&::placeholder {
|
||||||
|
color: lighten($dark-text-color, 36%) !important;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.emoji-mart-category-label {
|
.emoji-mart-category-label {
|
||||||
color: $lighter-text-color !important;
|
color: $lighter-text-color !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.compose-form .compose-form__warning {
|
||||||
|
color: $ui-base-color;
|
||||||
|
}
|
||||||
|
|
||||||
|
.column-content-select__control,
|
||||||
|
.column-content-select__menu {
|
||||||
|
background: $ui-base-color !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.column-content-select__single-value {
|
||||||
|
color: $classic-secondary-color !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.modal-root__modal {
|
||||||
|
background: lighten($classic-base-color, 12%);
|
||||||
|
}
|
||||||
|
|
||||||
|
.boost-modal__action-bar,
|
||||||
|
.confirmation-modal__action-bar,
|
||||||
|
.mute-modal__action-bar,
|
||||||
|
.block-modal__action-bar {
|
||||||
|
background: lighten($classic-base-color, 2%);
|
||||||
|
}
|
||||||
|
|
||||||
|
.searchability-dropdown__value-overlay {
|
||||||
|
color: #ff9bf8 !important;
|
||||||
|
}
|
||||||
|
|
|
@ -40,7 +40,7 @@ $error-value-color: $error-red !default;
|
||||||
$ui-base-color: $classic-base-color !default; // Darkest
|
$ui-base-color: $classic-base-color !default; // Darkest
|
||||||
$ui-base-lighter-color: #969fbc !default; // Lighter darkest
|
$ui-base-lighter-color: #969fbc !default; // Lighter darkest
|
||||||
$ui-primary-color: $classic-primary-color !default; // Lighter
|
$ui-primary-color: $classic-primary-color !default; // Lighter
|
||||||
$ui-secondary-color: lighten($classic-base-color, 12%) !default; // Lightest
|
$ui-secondary-color: $classic-secondary-color !default; // Lightest
|
||||||
$ui-highlight-color: $classic-highlight-color !default;
|
$ui-highlight-color: $classic-highlight-color !default;
|
||||||
$ui-button-color: $white !default;
|
$ui-button-color: $white !default;
|
||||||
$ui-button-background-color: $blurple-500 !default;
|
$ui-button-background-color: $blurple-500 !default;
|
||||||
|
|
|
@ -7533,7 +7533,7 @@ noscript {
|
||||||
line-height: 40px;
|
line-height: 40px;
|
||||||
margin: 16px 0;
|
margin: 16px 0;
|
||||||
background: lighten($ui-base-color, 4%);
|
background: lighten($ui-base-color, 4%);
|
||||||
color: $secondary-text-color;
|
color: $darker-text-color;
|
||||||
border: 0;
|
border: 0;
|
||||||
|
|
||||||
&__active {
|
&__active {
|
||||||
|
|
|
@ -128,6 +128,7 @@ class REST::V1::InstanceSerializer < ActiveModel::Serializer
|
||||||
:kmyblue_visibility_login,
|
:kmyblue_visibility_login,
|
||||||
:status_reference,
|
:status_reference,
|
||||||
:visibility_mutual,
|
:visibility_mutual,
|
||||||
|
:visibility_limited,
|
||||||
:kmyblue_limited_scope,
|
:kmyblue_limited_scope,
|
||||||
:kmyblue_antenna,
|
:kmyblue_antenna,
|
||||||
]
|
]
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue