github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-12-12 08:27:26 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'pr-v2-history-ui' of github.com:sharelatex/web-sharelatex-internal into pr-v2-history-ui

Browse source
This commit is contained in:
Paulo Reis 2018-06-05 10:32:06 +01:00
commit 1624639bc8
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
services/web/app/views/project/editor/history/entriesListV2.pug
View file

@ -150,7 +150,10 @@ script(type="text/ng-template", id="historyEntryTpl")
span.history-entry-change-doc {{ ::$ctrl.getProjectOpDoc(project_op) }} span.history-entry-change-doc {{ ::$ctrl.getProjectOpDoc(project_op) }}
.history-entry-metadata .history-entry-metadata
time.history-entry-metadata-time {{ ::$ctrl.entry.meta.end_ts | formatDate:'h:mm a' }} time.history-entry-metadata-time {{ ::$ctrl.entry.meta.end_ts | formatDate:'h:mm a' }}
span  •  span
|
| •
|
ol.history-entry-metadata-users ol.history-entry-metadata-users
li.history-entry-metadata-user(ng-repeat="update_user in ::$ctrl.entry.meta.users") li.history-entry-metadata-user(ng-repeat="update_user in ::$ctrl.entry.meta.users")
span.name( span.name(

4
services/web/public/stylesheets/app/editor/history-v2.less
View file

@ -58,7 +58,7 @@
margin-bottom: 3px; margin-bottom: 3px;
} }
.history-entry-change { .history-entry-change {
display: flex;
} }
.history-entry-change-action { .history-entry-change-action {
margin-right: 0.5em; margin-right: 0.5em;
@ -76,7 +76,7 @@
} }
.history-entry-metadata-time { .history-entry-metadata-time {
white-space: nowrap;
} }
.history-entry-metadata-users { .history-entry-metadata-users {