about summary refs log tree commit diff
path: root/app/javascript/mastodon/features/search
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2019-05-25 21:27:00 +0200
committerGitHub <noreply@github.com>2019-05-25 21:27:00 +0200
commit1e5532e693d9533ee37f553aeb191e284178fa52 (patch)
treed56b1cf2111722d744d675d750c6dfd514392752 /app/javascript/mastodon/features/search
parent5cdb4c483f732235d3b0b07eeed34757b33b0f83 (diff)
Add responsive panels to the single-column layout (#10820)
* Add responsive panels to the single-column layout

* Fixes

* Fix not being able to save the preference

* Fix code style issues

* Set max-height on the compose textarea and add a link to relationship manager
Diffstat (limited to 'app/javascript/mastodon/features/search')
-rw-r--r--app/javascript/mastodon/features/search/index.js17
1 files changed, 17 insertions, 0 deletions
diff --git a/app/javascript/mastodon/features/search/index.js b/app/javascript/mastodon/features/search/index.js
new file mode 100644
index 000000000..76bf70d4b
--- /dev/null
+++ b/app/javascript/mastodon/features/search/index.js
@@ -0,0 +1,17 @@
+import React from 'react';
+import SearchContainer from 'mastodon/features/compose/containers/search_container';
+import SearchResultsContainer from 'mastodon/features/compose/containers/search_results_container';
+
+const Search = () => (
+  <div className='column search-page'>
+    <SearchContainer />
+
+    <div className='drawer__pager'>
+      <div className='drawer__inner darker'>
+        <SearchResultsContainer />
+      </div>
+    </div>
+  </div>
+);
+
+export default Search;