[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2' - loleaflet/css

[Pedro Pinto Silva (via logerrit)]

 loleaflet/css/toolbar.css |   12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

New commits:
commit 4fe32b6d640d7ff0f7cb9e198c13eb8a741f7dc3
Author:     Pedro Pinto Silva <pedro.silva at collabora.com>
AuthorDate: Tue Jul 14 11:47:17 2020 +0200
Commit:     Pedro Silva <pedro.silva at collabora.com>
CommitDate: Tue Sep 1 10:21:32 2020 +0200

    Desktop: Document name input and pencil: remove unused styles
    
    and make sure that no default browser properties gets in the way
    
    Change-Id: I2f536c47f4e7db73e4cf77bec03d42b8ad73bd07
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98715
    Tested-by: Jenkins
    Reviewed-by: Pedro Silva <pedro.silva at collabora.com>
    (cherry picked from commit c1730cf7c1d3f84141f33e7ee516ab7a8cad05f6)
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/101685
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Tested-by: Pedro Silva <pedro.silva at collabora.com>

diff --git a/loleaflet/css/toolbar.css b/loleaflet/css/toolbar.css
index aed7e7e2b..d1f9c3637 100644
--- a/loleaflet/css/toolbar.css
+++ b/loleaflet/css/toolbar.css
@@ -156,6 +156,10 @@ w2ui-toolbar {
 	position: absolute;
 	right: 10px;
 	background: url('images/baseline-edit.svg') right center no-repeat, radial-gradient(circle, #fff 20%, #fff0 100%);
+	top: 5px;
+	padding: 1px 0px;
+	margin: 0px;
+	border: none;
 }
 
 #document-title-pencil:not(.editable){
@@ -171,10 +175,14 @@ w2ui-toolbar {
 #document-name-input.editable {
 	border: none;
 	box-shadow: 0 0 0.1px 1px #ebebeb, 0 0 2px 1px #f0f0f0;
-	background-position: right;
-	background-repeat: no-repeat;
 	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 {