[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-3' - loleaflet/dist

[Jan Holesovsky]

 loleaflet/dist/toolbar.css        |   15 ++++++++++-----
 loleaflet/dist/toolbar/toolbar.js |    8 ++++----
 2 files changed, 14 insertions(+), 9 deletions(-)

New commits:
commit 4468f7a26e0a170f774d18a770c270f5d48da183
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Tue Jun 19 11:29:33 2018 +0200

    borders: Improve the look.
    
    Change-Id: Ib7ca90285bb012a09f5fd2d867a3d588e831ec3a
    Reviewed-on: https://gerrit.libreoffice.org/56092
    Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
    Tested-by: Ashod Nakashian <ashnakash at gmail.com>

diff --git a/loleaflet/dist/toolbar.css b/loleaflet/dist/toolbar.css
index 0ea6834a0..23bd74115 100644
--- a/loleaflet/dist/toolbar.css
+++ b/loleaflet/dist/toolbar.css
@@ -270,12 +270,17 @@ button.leaflet-control-search-next
 .w2ui-icon.frame11 { background: url('../images/fr011.svg') no-repeat center !important; }
 .w2ui-icon.frame12 { background: url('../images/fr012.svg') no-repeat center !important; }
 
-#insertborder-grid tr td {
-    border-style: inset;
+#setborderstyle-grid tr td {
+    box-sizing: border-box;
+    background: rgba(255, 255, 255, 0.5);
+    position: relative;
+    padding: 2px;
+    border: 1px solid #ccc;
+    overflow: auto; /* child margins otherwise don't expand *this* element (parent) */
 }
 
-#insertborder-grid tr td:hover {
-    border-style: solid;
+#setborderstyle-grid td:hover {
+    border: 1px solid #888;
 }
 
 .w2ui-icon.accepttrackedchanges{ background: url('../images/lc_accepttrackedchanges.svg') no-repeat center !important; }
@@ -302,7 +307,7 @@ button.leaflet-control-search-next
 .w2ui-icon.italic{ background: url('../images/lc_italic.svg') no-repeat center !important; }
 .w2ui-icon.insertgraphic{ background: url('../images/lc_gallery.svg') no-repeat center !important; }
 .w2ui-icon.inserttable{ background: url('../images/lc_inserttable.svg') no-repeat center !important; }
-.w2ui-icon.insertborder{ background: url('../images/lc_setborderstyle.svg') no-repeat center !important; }
+.w2ui-icon.setborderstyle{ background: url('../images/lc_setborderstyle.svg') no-repeat center !important; }
 .w2ui-icon.next{ background: url('../images/lc_downsearch.svg') no-repeat center !important; }
 .w2ui-icon.numbering{ background: url('../images/lc_defaultnumbering.svg') no-repeat center !important; }
 .w2ui-icon.presentation{ background: url('../images/lc_dia.svg') no-repeat center !important; }
diff --git a/loleaflet/dist/toolbar/toolbar.js b/loleaflet/dist/toolbar/toolbar.js
index f232ebce3..f47b120b9 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -242,7 +242,7 @@ function onClick(e, id, item, subItem) {
 }
 
 function insertBorder() {
-	var $grid = $('#insertborder-grid');
+	var $grid = $('#setborderstyle-grid');
 
 	$grid.on({
 		click: function() {
@@ -883,9 +883,9 @@ map.on('doclayerinit', function () {
 	switch (docType) {
 	case 'spreadsheet':
 		toolbarUp.remove('inserttable', 'styles', 'justifypara', 'defaultbullet', 'defaultnumbering', 'break-numbering');
-		toolbarUp.insert('insertshapes',
-			{type: 'drop',  id: 'insertborder',  img: 'insertborder', hint: _('Borders'), overlay: {onShow: insertBorder},
-				html: '<table id="insertborder-grid"><tr><td class="w2ui-tb-image w2ui-icon frame01"></td>' +
+		toolbarUp.insert('setborderstyle',
+			{type: 'drop',  id: 'setborderstyle',  img: 'setborderstyle', hint: _('Borders'), overlay: {onShow: insertBorder},
+				html: '<table id="setborderstyle-grid"><tr><td class="w2ui-tb-image w2ui-icon frame01"></td>' +
 				      '<td class="w2ui-tb-image w2ui-icon frame02"></td><td class="w2ui-tb-image w2ui-icon frame03"></td>' +
 				      '<td class="w2ui-tb-image w2ui-icon frame04"></td></tr><tr><td class="w2ui-tb-image w2ui-icon frame05"></td>' +
 				      '<td class="w2ui-tb-image w2ui-icon frame06"></td><td class="w2ui-tb-image w2ui-icon frame07"></td>' +