aboutsummaryrefslogtreecommitdiff
path: root/FrontEnd/src/app/views/common/SearchInput.tsx
diff options
context:
space:
mode:
authorcrupest <crupest@outlook.com>2020-11-04 12:29:55 +0800
committerGitHub <noreply@github.com>2020-11-04 12:29:55 +0800
commit013baff7500c773082d79b03a44a5e2aa2072ae2 (patch)
treec03aaf0842a526e47c29e4b24a414cc7016b4d07 /FrontEnd/src/app/views/common/SearchInput.tsx
parentfc3c2de7b4f431f0edcabb5ead2a2e1aa79d665a (diff)
parenta20b15c1c79cd49ee4be7ac3fba80955704122d3 (diff)
downloadtimeline-013baff7500c773082d79b03a44a5e2aa2072ae2.tar.gz
timeline-013baff7500c773082d79b03a44a5e2aa2072ae2.tar.bz2
timeline-013baff7500c773082d79b03a44a5e2aa2072ae2.zip
Merge pull request #165 from crupest/timeline
Redesign timeline ui.
Diffstat (limited to 'FrontEnd/src/app/views/common/SearchInput.tsx')
-rw-r--r--FrontEnd/src/app/views/common/SearchInput.tsx12
1 files changed, 7 insertions, 5 deletions
diff --git a/FrontEnd/src/app/views/common/SearchInput.tsx b/FrontEnd/src/app/views/common/SearchInput.tsx
index 9833d515..1373bd68 100644
--- a/FrontEnd/src/app/views/common/SearchInput.tsx
+++ b/FrontEnd/src/app/views/common/SearchInput.tsx
@@ -36,7 +36,7 @@ const SearchInput: React.FC<SearchInputProps> = (props) => {
);
return (
- <Form inline className={clsx("my-2", props.className)}>
+ <Form inline className={clsx(" flex-sm-nowrap", props.className)}>
<Form.Control
className="mr-sm-2 flex-grow-1"
value={props.value}
@@ -44,10 +44,12 @@ const SearchInput: React.FC<SearchInputProps> = (props) => {
onKeyPress={onInputKeyPress}
placeholder={props.placeholder}
/>
- <div className="mt-2 mt-sm-0 order-sm-last ml-sm-3">
- {props.additionalButton}
- </div>
- <div className="mt-2 mt-sm-0 ml-auto ml-sm-0">
+ {props.additionalButton ? (
+ <div className="mt-2 mt-sm-0 flex-shrink-0 order-sm-last ml-sm-2">
+ {props.additionalButton}
+ </div>
+ ) : null}
+ <div className="mt-2 mt-sm-0 flex-shrink-0 ml-auto ml-sm-0">
{props.loading ? (
<Spinner variant="primary" animation="border" />
) : (