bigbuffet/bigbuffet-rw
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'site-preview' into 'develop'

Browse source 
SoapboxConfig: style improvements

See merge request soapbox-pub/soapbox-fe!287
This commit is contained in:
Alex Gleason 2020-10-02 02:14:37 +00:00
commit 58b89abfc9
2 changed files with 39 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/soapbox/features/soapbox_config/index.js
View file

@ -204,11 +204,16 @@ class SoapboxConfig extends ImmutablePureComponent {
value={soapbox.get('brandColor')} value={soapbox.get('brandColor')}
onChange={this.handleChange(['brandColor'], (e) => e.hex)} onChange={this.handleChange(['brandColor'], (e) => e.hex)}
/> />
<div className='input with_label toggle'>
<div className='label_input'>
<label>Default theme</label>
<ThemeToggle <ThemeToggle
onToggle={this.handleChange(['defaultSettings', 'themeMode'], value => value)} onToggle={this.handleChange(['defaultSettings', 'themeMode'], value => value)}
settings={settings} settings={settings}
/> />
</div> </div>
</div>
</div>
<div className='fields-row__column fields-group fields-row__column-6'> <div className='fields-row__column fields-group fields-row__column-6'>
<FileChooserLogo <FileChooserLogo
label={<FormattedMessage id='soapbox_config.fields.logo_label' defaultMessage='Logo' />} label={<FormattedMessage id='soapbox_config.fields.logo_label' defaultMessage='Logo' />}
@ -269,6 +274,8 @@ class SoapboxConfig extends ImmutablePureComponent {
</div> </div>
</div> </div>
</div> </div>
</FieldsGroup>
<FieldsGroup>
<div className='input with_block_label'> <div className='input with_block_label'>
<label><FormattedMessage id='soapbox_config.fields.home_footer_fields_label' defaultMessage='Home footer items' /></label> <label><FormattedMessage id='soapbox_config.fields.home_footer_fields_label' defaultMessage='Home footer items' /></label>
<span className='hint'> <span className='hint'>

33
app/styles/forms.scss
View file

@ -471,19 +471,23 @@ code {
cursor: pointer; cursor: pointer;
} }
.select-wrapper::after { .select-wrapper {
display: block; display: flex;
font-family: 'ForkAwesome'; align-items: center;
content: '';
width: 10px; &::after {
display: flex;
align-items: center;
font-family: "ForkAwesome";
content: "";
position: absolute; position: absolute;
right: 12px; right: 12px;
top: 1px;
border-left: 1px solid var(--highlight-text-color); border-left: 1px solid var(--highlight-text-color);
height: 39px; height: calc(100% - 8px);
padding: 12px; padding-left: 12px;
box-sizing: border-box;
pointer-events: none; pointer-events: none;
margin-top: 8px;
}
} }
.label_input { .label_input {
@ -704,6 +708,7 @@ code {
right: 7px; right: 7px;
cursor: pointer; cursor: pointer;
color: $error-red; color: $error-red;
transform: translateY(9px);
} }
.site-preview { .site-preview {
@ -735,3 +740,13 @@ code {
height: 100%; height: 100%;
} }
} }
.input.with_label.toggle .label_input {
display: flex;
font-size: 14px;
align-items: center;
.theme-toggle {
margin-left: 10px;
}
}