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

[Jan Holesovsky]

 loleaflet/dist/spreadsheet.css        |   50 +++++++++++++++++++---------------
 loleaflet/dist/toolbar.css            |    2 -
 loleaflet/src/control/Control.Tabs.js |    6 ++--
 3 files changed, 32 insertions(+), 26 deletions(-)

New commits:
commit 2c5c0d056b17dd45cd1523bc8e8638fecf95f6da
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Mon Apr 25 19:05:01 2016 +0200

    loleaflet: Many visual improvements in the spreadsheet.
    
    Sheet buttons better aligned, no overlaps in sheet scrolling buttons, more
    consistent colors, no remnants of scrollbars, etc.

diff --git a/loleaflet/dist/spreadsheet.css b/loleaflet/dist/spreadsheet.css
index 8278234..aabd15e 100644
--- a/loleaflet/dist/spreadsheet.css
+++ b/loleaflet/dist/spreadsheet.css
@@ -2,47 +2,53 @@
 	border-top: 1px solid #B6B6B6 !important;
 	top: 100px !important;
 	left: 50px !important;
-	bottom: 49px !important;
+	bottom: 56px !important;
 	}
 
 .spreadsheet-tab {
 	margin: 0;
 	padding: 0;
 	left: 108px;
-	bottom: 34px;
+	right: 0;
+	bottom: 33px;
 	position: absolute;
 	cursor: pointer;
-	height: 20px;
-	width: 90%;
+	height: 24px;
 	overflow-x: hidden;
 	white-space: nowrap;
-	}
 
-.spreadsheet-tab-scroll {
-	width: 90%;
-	overflow-x: auto;
+	background-color: #efefef;
 	}
 
+.spreadsheet-tab-scroll {
+	width: 100%;
+	height: 100%;
+	overflow: auto;
+	padding-bottom: 20px; /* to hide the scroolbar */
 
-.spreadsheet-tab li {
-	margin: 0;
-	padding: 0;
-	margin-left: 2px;
+	margin-left: 6px;
 	}
 
+.spreadsheet-context-menu {
+	margin: 0px;
+	margin-right: 3px;
+	padding-left: 7px;
+	padding-right: 7px;
+	padding-top: 1px;
+	padding-bottom: 1px;
 
-.spreadsheet-tab li {
+	font: 12px/1.5 "Helvetica Neue", Arial, Helvetica, sans-serif;
 	display: inline-block;
-	border: #B9B9B9 1px solid;
-	background: #A8A8A8;
-	color: #FFFFFF;
-	text-decoration: none;
+	border: 1px solid darkgrey;
+	background-color: lightgrey;
 	}
 
-.spreadsheet-tab li.selected {
-	background: #FFFFFF;
-	color: #7E7E7E;
-	border-top: #FFF 1px solid;
+.spreadsheet-context-menu-selected {
+	background: white;
+	border-top: 1px solid lightgrey;
+	border-left: 1px solid lightgrey;
+	border-right: 1px solid lightgrey;
+	border-bottom: 1px solid lightgrey;
 	}
 
 .spreadsheet-header-corner {
@@ -125,7 +131,7 @@
 	left: 0;
 	top: 100px;
 	width: 48px;
-	bottom: 54px;
+	bottom: 57px;
 	overflow: hidden;
 	}
 
diff --git a/loleaflet/dist/toolbar.css b/loleaflet/dist/toolbar.css
index c6abe47..3c70486 100644
--- a/loleaflet/dist/toolbar.css
+++ b/loleaflet/dist/toolbar.css
@@ -36,7 +36,7 @@
 #spreadsheet-toolbar {
     left: 0;
     text-align: center;
-    bottom: 29px;
+    bottom: 33px;
     padding: 0;
     position: absolute;
 }
diff --git a/loleaflet/src/control/Control.Tabs.js b/loleaflet/src/control/Control.Tabs.js
index e44e9d9..7fdc3e3 100644
--- a/loleaflet/src/control/Control.Tabs.js
+++ b/loleaflet/src/control/Control.Tabs.js
@@ -85,7 +85,7 @@ L.Control.Tabs = L.Control.extend({
 
 				for (var i = 0; i < parts; i++) {
 					var id = 'spreadsheet-tab' + i;
-					var tab = L.DomUtil.create('li', 'spreadsheet-context-menu', ssTabScroll);
+					var tab = L.DomUtil.create('div', 'spreadsheet-context-menu', ssTabScroll);
 					tab.innerHTML = e.partNames[i];
 					tab.id = id;
 
@@ -99,9 +99,9 @@ L.Control.Tabs = L.Control.extend({
 			}
 			for (var key in this._spreadsheetTabs) {
 				var part =  parseInt(key.match(/\d+/g)[0]);
-				L.DomUtil.removeClass(this._spreadsheetTabs[key], 'selected');
+				L.DomUtil.removeClass(this._spreadsheetTabs[key], 'spreadsheet-context-menu-selected');
 				if (part === selectedPart) {
-					L.DomUtil.addClass(this._spreadsheetTabs[key], 'selected');
+					L.DomUtil.addClass(this._spreadsheetTabs[key], 'spreadsheet-context-menu-selected');
 				}
 			}
 		}