loleaflet/css/toolbar.css | 3 ---
1 file changed, 3 deletions(-)
New commits:
commit b5b7c4147c34c7a411492c62ca3d5c534547d143
Author: Pedro Silva <[email protected]>
AuthorDate: Tue Sep 1 13:46:12 2020 +0200
Commit: Pedro Silva <[email protected]>
CommitDate: Tue Sep 1 13:56:26 2020 +0200
Remove merge conflicts introduced in
4fe32b6d640d7ff0f7cb9e198c13eb8a741f7dc3
Change-Id: Ibda1f155fbcbe7088ac1e403dcc27a0315ad0b51
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/101687
Tested-by: Pedro Silva <[email protected]>
Reviewed-by: Pedro Silva <[email protected]>
diff --git a/loleaflet/css/toolbar.css b/loleaflet/css/toolbar.css
index d1f9c3637..b6619f968 100644
--- a/loleaflet/css/toolbar.css
+++ b/loleaflet/css/toolbar.css
@@ -177,12 +177,9 @@ w2ui-toolbar {
box-shadow: 0 0 0.1px 1px #ebebeb, 0 0 2px 1px #f0f0f0;
padding-right: 24px;
max-width: 100%;
-<<<<<<< HEAD (dcbaeb loleaflet: Slides preview section improvements.)
-=======
overflow: hidden;
text-overflow:ellipsis;
height: 18px;
->>>>>>> CHANGE (c1730c Desktop: Document name input and pencil: remove unused
style)
}
#document-name-input.editable:focus {
_______________________________________________
Libreoffice-commits mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
