loleaflet/dist/loleaflet.css | 2 +-
loleaflet/dist/partsPreviewControl.css | 2 +-
loleaflet/dist/spreadsheet.css | 29 +++++++++++------------------
loleaflet/dist/toolbar.css | 19 +++++++++----------
loleaflet/dist/toolbar/toolbar.js | 2 --
5 files changed, 22 insertions(+), 32 deletions(-)
New commits:
commit 6f868ed74d682329fe1dd3273f3f9633c43a1159
Author: Jan Holesovsky <ke...@collabora.com>
Date: Thu May 19 09:22:56 2016 +0200
loleaflet: Pack the toolbars a bit to take less space.
diff --git a/loleaflet/dist/loleaflet.css b/loleaflet/dist/loleaflet.css
index 15aaa66..c985eb2 100644
--- a/loleaflet/dist/loleaflet.css
+++ b/loleaflet/dist/loleaflet.css
@@ -2,7 +2,7 @@
border-top: 1px solid #B6B6B6;
background: #DFDFDF;
position: absolute;
- top: 47px;
+ top: 45px;
bottom: 33px;
right: 0px;
left: 0px;
diff --git a/loleaflet/dist/partsPreviewControl.css
b/loleaflet/dist/partsPreviewControl.css
index 946aa6b..fcf441f 100644
--- a/loleaflet/dist/partsPreviewControl.css
+++ b/loleaflet/dist/partsPreviewControl.css
@@ -5,7 +5,7 @@
.parts-preview {
background: #DFDFDF;
position: absolute;
- top: 47px;
+ top: 45px;
left: 0px;
bottom: 33px;
max-width: 214px;
diff --git a/loleaflet/dist/spreadsheet.css b/loleaflet/dist/spreadsheet.css
index bce6aee..3b2f7b8 100644
--- a/loleaflet/dist/spreadsheet.css
+++ b/loleaflet/dist/spreadsheet.css
@@ -1,6 +1,6 @@
.spreadsheet-document {
border-top: 1px solid #B6B6B6 !important;
- top: 100px !important;
+ top: 98px !important;
left: 50px !important;
bottom: 65px !important;
}
@@ -8,7 +8,7 @@
.spreadsheet-tab {
margin: 0;
padding: 0;
- left: 140px;
+ left: 132px;
right: 0;
bottom: 33px;
position: absolute;
@@ -59,10 +59,7 @@
}
.spreadsheet-header-corner {
- border-top: 1px solid darkgrey;
- border-left: 1px solid darkgrey;
- border-right: 1px solid darkgrey;
- border-bottom: 1px solid darkgrey;
+ border: 1px solid darkgrey;
background-color: lightgrey;
cursor: pointer;
@@ -70,23 +67,20 @@
padding: 0px;
margin: 0px;
left: 0px;
- top: 80px;
- width: 49px;
+ top: 78px;
+ width: 48px;
height: 19px;
}
.spreadsheet-header-columns-container {
- border-top: 1px solid darkgrey;
- border-left: 1px solid darkgrey;
- border-right: 1px solid darkgrey;
- border-bottom: 1px solid darkgrey;
+ border: 1px solid darkgrey;
background-color: lightgrey;
position: absolute;
display: inline-block;
white-space: nowrap;
left: 49px;
- top: 80px;
+ top: 78px;
right: 0;
height: 19px;
overflow: hidden;
@@ -97,6 +91,7 @@
white-space: nowrap;
width: 100%;
height: 100%;
+ border-spacing: 0px !important;
position: relative;
margin: 0px;
padding: 0px;
@@ -111,6 +106,7 @@
text-overflow: ellipsis;
white-space: nowrap;
padding: 0px;
+ padding-top: 1px;
margin: 0px;
height: 100%;
cursor: pointer;
@@ -128,15 +124,12 @@
}
.spreadsheet-header-rows-container {
- border-top: 1px solid darkgrey;
- border-left: 1px solid darkgrey;
- border-right: 1px solid darkgrey;
- border-bottom: 1px solid darkgrey;
+ border: 1px solid darkgrey;
background-color: lightgrey;
position: absolute;
left: 0;
- top: 100px;
+ top: 98px;
width: 48px;
bottom: 65px;
overflow: hidden;
diff --git a/loleaflet/dist/toolbar.css b/loleaflet/dist/toolbar.css
index 62bb5c6..0af793c 100644
--- a/loleaflet/dist/toolbar.css
+++ b/loleaflet/dist/toolbar.css
@@ -12,8 +12,8 @@
right: 0;
text-align: center;
padding: 6px;
- padding-top: 7px;
- padding-bottom: 5px;
+ padding-top: 6px;
+ padding-bottom: 4px;
z-index: 1000;
}
@@ -79,20 +79,19 @@
width: 100%;
}
-/*.w2ui-icon{
- background-repeat:no-repeat;
- height:16px;
- width:16px;
- overflow:hidden;
- margin:2px;
- display:inline-block
-}*/
+.w2ui-button{
+ margin:0 !important;
+}
.w2ui-tb-image {
width: 24px !important;
height: 24px !important;
}
+.w2ui-break {
+ margin:0 4px !important;
+}
+
.leaflet-bar a {
float: left;
}
commit 3b6cdcb7905576373a94c175470649f47c93692e
Author: Jan Holesovsky <ke...@collabora.com>
Date: Thu May 19 08:48:40 2016 +0200
loleaflet: Don't check the 'Take edit' button, only enable/disable.
diff --git a/loleaflet/dist/toolbar/toolbar.js
b/loleaflet/dist/toolbar/toolbar.js
index 1b59006..8aa22a7 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -904,14 +904,12 @@ map.on('hyperlinkclicked', function (e) {
map.on('editlock', function (e) {
var toolbar = w2ui['toolbar-down'];
if (e.value) {
- toolbar.check('takeedit');
toolbar.disable('takeedit');
toolbar.set('takeedit', {hint: _('You are editing (others can
only view)')});
$('#takeeditlabel').html('EDITING');
}
else {
- toolbar.uncheck('takeedit');
toolbar.enable('takeedit');
toolbar.set('takeedit', {hint: _('Take edit lock (others can
only view)')});
$('#takeeditlabel').html('VIEWING');
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
