aboutsummaryrefslogtreecommitdiff
path: root/FrontEnd
diff options
context:
space:
mode:
authorcrupest <crupest@outlook.com>2020-12-06 17:06:08 +0800
committercrupest <crupest@outlook.com>2020-12-06 17:06:08 +0800
commit43d7d1444f61be250a04d9cd628d394baaccc8df (patch)
treedea906e44da7ffe9b2135d5057cbf330d197c677 /FrontEnd
parent3971aeb4b0d1a7566b6c9d3c88984c488fdf8074 (diff)
parent828da7516df1a7612c3b24b4a27ba680eaf821f8 (diff)
downloadtimeline-43d7d1444f61be250a04d9cd628d394baaccc8df.tar.gz
timeline-43d7d1444f61be250a04d9cd628d394baaccc8df.tar.bz2
timeline-43d7d1444f61be250a04d9cd628d394baaccc8df.zip
Merge branch 'master' into highlight-timeline
Diffstat (limited to 'FrontEnd')
-rw-r--r--FrontEnd/src/app/views/common/AppBar.tsx2
-rw-r--r--FrontEnd/src/app/views/timeline-common/timeline-common.sass3
2 files changed, 3 insertions, 2 deletions
diff --git a/FrontEnd/src/app/views/common/AppBar.tsx b/FrontEnd/src/app/views/common/AppBar.tsx
index c862a6d3..319bca74 100644
--- a/FrontEnd/src/app/views/common/AppBar.tsx
+++ b/FrontEnd/src/app/views/common/AppBar.tsx
@@ -67,7 +67,7 @@ const AppBar: React.FC = (_) => {
</NavLink>
)}
</Nav>
- <Nav className="ml-auto mr-2">
+ <Nav className="ml-auto mr-2 align-items-center">
{user != null ? (
<LinkContainer to={`/users/${user.username}`}>
<BlobImage
diff --git a/FrontEnd/src/app/views/timeline-common/timeline-common.sass b/FrontEnd/src/app/views/timeline-common/timeline-common.sass
index 58c2abc8..1aa5e731 100644
--- a/FrontEnd/src/app/views/timeline-common/timeline-common.sass
+++ b/FrontEnd/src/app/views/timeline-common/timeline-common.sass
@@ -3,7 +3,8 @@
.timeline
z-index: 0
position: relative
- overflow-wrap: anywhere
+ width: 100%
+ overflow-wrap: break-word
&-item
position: relative