Merge remote-tracking branch 'origin/master' into afc-multiple-managers

This commit is contained in:
Alberto Fernández Capel
2018-07-16 09:45:11 +01:00
3 changed files with 9 additions and 1 deletions
@@ -26,7 +26,10 @@ div.full-size(
'rp-loading-threads': reviewPanel.loadingThreads,\
}"
)
.loading-panel(ng-show="!editor.sharejs_doc || editor.opening")
.loading-panel(
ng-show="!editor.sharejs_doc || editor.opening",
style=showRichText ? "top: 32px" : "",
)
span(ng-show="editor.open_doc_id")
i.fa.fa-spin.fa-refresh
|   #{translate("loading")}...