Merge branch 'styles' into 'develop'

Improve search input styles on aliases/list editor pages

See merge request soapbox-pub/soapbox-fe!833
merge-requests/834/merge
Alex Gleason 2021-10-31 21:06:54 +00:00
commit 21a5c3215a
6 zmienionych plików z 14 dodań i 15 usunięć

Wyświetl plik

@ -72,8 +72,7 @@ class Search extends React.PureComponent {
</label>
<div role='button' tabIndex='0' className='search__icon' onClick={this.handleClear}>
<Icon id='search' className={classNames({ active: !hasValue })} />
<Icon id='times-circle' aria-label={intl.formatMessage(messages.search)} className={classNames({ active: hasValue })} />
<Icon src={require('@tabler/icons/icons/backspace.svg')} aria-label={intl.formatMessage(messages.search)} className={classNames('svg-icon--backspace', { active: hasValue })} />
</div>
<Button onClick={this.handleSubmit}>{intl.formatMessage(messages.searchTitle)}</Button>
</div>

Wyświetl plik

@ -72,8 +72,7 @@ class Search extends React.PureComponent {
</label>
<div role='button' tabIndex='0' className='search__icon' onClick={this.handleClear}>
<Icon id='search' className={classNames({ active: !hasValue })} />
<Icon id='times-circle' aria-label={intl.formatMessage(messages.search)} className={classNames({ active: hasValue })} />
<Icon src={require('@tabler/icons/icons/backspace.svg')} aria-label={intl.formatMessage(messages.search)} className={classNames('svg-icon--backspace', { active: hasValue })} />
</div>
<Button onClick={this.handleSubmit}>{intl.formatMessage(messages.searchTitle)}</Button>
</div>

Wyświetl plik

@ -18,24 +18,21 @@
}
}
&_search {
&_search.search {
display: flex;
align-items: center;
flex-direction: row;
margin: 10px;
border-bottom: none;
.search__input {
padding: 7px 30px 6px 10px;
background: none;
}
> label {
flex: 1 1;
}
> .search__icon .fa {
top: 8px;
right: 102px !important;
}
> .button {
width: 80px;
margin-left: 10px;

Wyświetl plik

@ -97,4 +97,8 @@
}
}
}
.simple_form select {
margin-top: 0;
}
}

Wyświetl plik

@ -39,8 +39,8 @@
flex: 1 1;
}
> .search__icon .fa {
right: 102px !important;
> .search__icon {
position: relative;
}
> .button {

Wyświetl plik

@ -183,8 +183,8 @@
padding: 12px 36px 12px 16px;
}
.search__icon .svg-icon {
right: 24px;
.search__icon {
position: relative;
}
}