[Libreoffice-commits] online.git: loleaflet/css loleaflet/src

[Muhammet Kara (via logerrit)]

 loleaflet/css/mobilewizard.css                   |   79 -----------------------
 loleaflet/src/control/Control.JSDialogBuilder.js |    4 -
 2 files changed, 4 insertions(+), 79 deletions(-)

New commits:
commit 94c3896809259d8857f2026417a6c844f7c3771c
Author:     Muhammet Kara <muhammet.kara at collabora.com>
AuthorDate: Wed Nov 6 18:09:33 2019 +0300
Commit:     Muhammet Kara <muhammet.kara at collabora.com>
CommitDate: Wed Nov 6 18:22:47 2019 +0100

    Smarter(?) valueset image handling
    
    Instead of adding one entry per image into the
    css, just adding the image of a valueset element
    into the loleaflet/images directory is enough now.
    
    Change-Id: I5deff7c9537ede713120f581f96bfb2aefb11fa0
    Reviewed-on: https://gerrit.libreoffice.org/82162
    Reviewed-by: Muhammet Kara <muhammet.kara at collabora.com>
    Tested-by: Muhammet Kara <muhammet.kara at collabora.com>

diff --git a/loleaflet/css/mobilewizard.css b/loleaflet/css/mobilewizard.css
index 41b44f019..5c66db9c3 100644
--- a/loleaflet/css/mobilewizard.css
+++ b/loleaflet/css/mobilewizard.css
@@ -53,86 +53,9 @@ span#main-menu-btn-icon {
 	overflow: hidden;
 	margin: 2px 2px !important;
 	display: inline-block;
-}
-
-.layout.layout_empty {
-	background: url('images/layout_empty.svg') no-repeat center !important;
-}
-
-.layout.layout_head03 {
-	background: url('images/layout_head03.svg') no-repeat center !important;
-}
-
-.layout.layout_head02 {
-	background: url('images/layout_head02.svg') no-repeat center !important;
-}
-
-.layout.layout_head02a {
-	background: url('images/layout_head02a.svg') no-repeat center !important;
-}
-
-.layout.layout_head01 {
-	background: url('images/layout_head01.svg') no-repeat center !important;
-}
-
-.layout.layout_textonly {
-	background: url('images/layout_textonly.svg') no-repeat center !important;
-}
-
-.layout.layout_head03b {
-	background: url('images/layout_head03b.svg') no-repeat center !important;
-}
-
-.layout.layout_head03c {
-	background: url('images/layout_head03c.svg') no-repeat center !important;
-}
-
-.layout.layout_head03a {
-	background: url('images/layout_head03a.svg') no-repeat center !important;
-}
-
-.layout.layout_head02b {
-	background: url('images/layout_head02b.svg') no-repeat center !important;
-}
-
-.layout.layout_head04 {
-	background: url('images/layout_head04.svg') no-repeat center !important;
-}
-
-.layout.layout_head06 {
-	background: url('images/layout_head06.svg') no-repeat center !important;
-}
-
-.layout.layout_vertical02 {
-	background: url('images/layout_vertical02.svg') no-repeat center !important;
-}
-
-.layout.layout_vertical01 {
-	background: url('images/layout_vertical01.svg') no-repeat center !important;
-}
-
-.layout.layout_head02 {
-	background: url('images/layout_head02.svg') no-repeat center !important;
-}
-
-.layout.layout_head02a {
-	background: url('images/layout_head02a.svg') no-repeat center !important;
-}
-
-.layout.columns_52x60 {
-	background: url('images/columns_52x60.svg') no-repeat center !important;
-}
-
-.layout.columnstack_52x60 {
-	background: url('images/columnstack_52x60.svg') no-repeat center !important;
-}
-
-.layout.columnpercent_52x60 {
-	background: url('images/columnpercent_52x60.svg') no-repeat center !important;
-}
-.layout{
 	border: 1px solid #fff;
 }
+
 .layout.loleaflet-context-down {
 	background-color: #dddddd;
 	box-shadow: inset 0px -1px 2px 5px #eee;
diff --git a/loleaflet/src/control/Control.JSDialogBuilder.js b/loleaflet/src/control/Control.JSDialogBuilder.js
index fb5282869..cb496b70e 100644
--- a/loleaflet/src/control/Control.JSDialogBuilder.js
+++ b/loleaflet/src/control/Control.JSDialogBuilder.js
@@ -592,12 +592,14 @@ L.Control.JSDialogBuilder = L.Control.extend({
 			image = data.entries[index].image;
 			image = image.substr(0, image.lastIndexOf('.'));
 			image = image.substr(image.lastIndexOf('/') + 1);
-			elem = L.DomUtil.create('div', 'layout ' + image +
+			elem = L.DomUtil.create('div', 'layout ' +
 				(data.entries[index].selected ? ' loleaflet-context-down' : ''), parentContainer);
 			$(elem).data('id', data.entries[index].id);
 			$(elem).click(function () {
 				builder.callback('valueset', 'selected', { id: data.id }, $(this).data('id'), builder);
 			});
+			elem.style.setProperty('background', 'url("images/' + image +
+				'.svg") no-repeat center', 'important');
 		}
 
 		return false;