diff options
| author | crupest <crupest@outlook.com> | 2020-12-06 17:06:08 +0800 |
|---|---|---|
| committer | crupest <crupest@outlook.com> | 2020-12-06 17:06:08 +0800 |
| commit | 43d7d1444f61be250a04d9cd628d394baaccc8df (patch) | |
| tree | dea906e44da7ffe9b2135d5057cbf330d197c677 | |
| parent | 3971aeb4b0d1a7566b6c9d3c88984c488fdf8074 (diff) | |
| parent | 828da7516df1a7612c3b24b4a27ba680eaf821f8 (diff) | |
| download | timeline-43d7d1444f61be250a04d9cd628d394baaccc8df.tar.gz timeline-43d7d1444f61be250a04d9cd628d394baaccc8df.tar.bz2 timeline-43d7d1444f61be250a04d9cd628d394baaccc8df.zip | |
Merge branch 'master' into highlight-timeline
| -rw-r--r-- | BackEnd/Timeline/Properties/launchSettings.json | 1 | ||||
| -rw-r--r-- | FrontEnd/src/app/views/common/AppBar.tsx | 2 | ||||
| -rw-r--r-- | FrontEnd/src/app/views/timeline-common/timeline-common.sass | 3 |
3 files changed, 4 insertions, 2 deletions
diff --git a/BackEnd/Timeline/Properties/launchSettings.json b/BackEnd/Timeline/Properties/launchSettings.json index de8186db..6d58040a 100644 --- a/BackEnd/Timeline/Properties/launchSettings.json +++ b/BackEnd/Timeline/Properties/launchSettings.json @@ -2,6 +2,7 @@ "profiles": {
"Development": {
"commandName": "Project",
+ "applicationUrl": "http://0.0.0.0:5000",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development",
"ASPNETCORE_USEPROXYFRONTEND": "true",
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 |