[Libreoffice-commits] online.git: Branch 'distro/collabora/cloudsuite-rc3' - 3 commits - loleaflet/dist loleaflet/src loolwsd/loolwsd.spec.in
Jan Holesovsky
kendy at collabora.com
Tue Apr 26 10:18:25 UTC 2016
loleaflet/dist/spreadsheet.css | 50 +++++++++++++++++++---------------
loleaflet/dist/toolbar.css | 2 -
loleaflet/src/control/Control.Tabs.js | 6 ++--
loolwsd/loolwsd.spec.in | 4 +-
4 files changed, 34 insertions(+), 28 deletions(-)
New commits:
commit 36523414d12e170e3b30b7f1770c1162a0689116
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');
}
}
}
commit 3bc1b60679384d7aa48ae8ba3bf9e088cd59963a
Author: Andras Timar <andras.timar at collabora.com>
Date: Tue Apr 26 10:16:19 2016 +0200
fix more package names on SUSE
diff --git a/loolwsd/loolwsd.spec.in b/loolwsd/loolwsd.spec.in
index fa0b1d9..e16be10 100644
--- a/loolwsd/loolwsd.spec.in
+++ b/loolwsd/loolwsd.spec.in
@@ -31,9 +31,9 @@ Requires: poco-crypto >= 1.7.1 poco-foundation >= 1.7.1 poco-json >= 1.7.1
Requires: atk avahi-glib avahi-libs bzip2-libs cairo cups-libs dbus-glib dbus-libs fontconfig freetype GConf2 gdk-pixbuf2 glib2 gnome-vfs2 graphite2 gstreamer gstreamer-plugins-base gtk2 harfbuzz libdrm libffi libICE libSM libuuid libX11 libXau libxcb libXcomposite libXcursor libXdamage libXext libXfixes libXi libXinerama libXrandr libXrender libxshmfence libXt libXxf86vm mesa-libEGL mesa-libgbm mesa-libGL mesa-libglapi pango pixman
%else
%if 0%{?suse_version}
-Requires: libcap2 libpng12 libpcre1 libz1 %{?systemd_requires} %{fillup_prereq}
+Requires: libcap2 libpng12-0 libpcre1 libz1 %{?systemd_requires} %{fillup_prereq}
Requires: libPocoCrypto42 >= 1.7.1 libPocoFoundation42 >= 1.7.1 libPocoJSON42 >= 1.7.1 libPocoNet42 >= 1.7.1 libPocoNetSSL42 >= 1.7.1 libPocoUtil42 >= 1.7.1 libPocoXML42 >= 1.7.1
-Requires: Mesa-libEGL1 Mesa-libGL1 Mesa-libglapi0 cups-libs dbus-1-glib fontconfig krb5 libatk-1_0-0 libavahi-client3 libavahi-common3 libavahi-glib1 libbz2-1 libcairo2 libcom_err2 libdbus libdrm2 libexpat1 libfreetype6 libgbm1 libgio-2_0-0 libglib-2_0-0 libgmodule-2_0-0 libgobject-2_0-0 libgraphite2 libgthread-2_0-0 libgtk-2_0-0 libharfbuzz0 libkeyutils1 liblzma5 libpixman-1-0 libpng16-16 libuuid1 libxml2
+Requires: Mesa-libEGL1 Mesa-libGL1 Mesa-libglapi0 cups-libs dbus-1-glib fontconfig krb5 libatk-1_0-0 libavahi-client3 libavahi-common3 libavahi-glib1 libbz2-1 libcairo2 libcom_err2 libdbus-1-3 libdrm2 libexpat1 libfreetype6 libgbm1 libgio-2_0-0 libglib-2_0-0 libgmodule-2_0-0 libgobject-2_0-0 libgraphite2-3 libgthread-2_0-0 libgtk-2_0-0 libharfbuzz0 libkeyutils1 liblzma5 libpixman-1-0 libpng16-16 libuuid1 libxml2
%endif
%endif
Provides: loleaflet = 1.5.8
commit 025c949a325322c34ad829c60089508d766303bb
Author: Andras Timar <andras.timar at collabora.com>
Date: Tue Apr 26 10:01:08 2016 +0200
fix libatk package name
diff --git a/loolwsd/loolwsd.spec.in b/loolwsd/loolwsd.spec.in
index 1b34538..fa0b1d9 100644
--- a/loolwsd/loolwsd.spec.in
+++ b/loolwsd/loolwsd.spec.in
@@ -33,7 +33,7 @@ Requires: atk avahi-glib avahi-libs bzip2-libs cairo cups-libs dbus-glib d
%if 0%{?suse_version}
Requires: libcap2 libpng12 libpcre1 libz1 %{?systemd_requires} %{fillup_prereq}
Requires: libPocoCrypto42 >= 1.7.1 libPocoFoundation42 >= 1.7.1 libPocoJSON42 >= 1.7.1 libPocoNet42 >= 1.7.1 libPocoNetSSL42 >= 1.7.1 libPocoUtil42 >= 1.7.1 libPocoXML42 >= 1.7.1
-Requires: Mesa-libEGL1 Mesa-libGL1 Mesa-libglapi0 cups-libs dbus-1-glib fontconfig krb5 libatk libavahi-client3 libavahi-common3 libavahi-glib1 libbz2-1 libcairo2 libcom_err2 libdbus libdrm2 libexpat1 libfreetype6 libgbm1 libgio-2_0-0 libglib-2_0-0 libgmodule-2_0-0 libgobject-2_0-0 libgraphite2 libgthread-2_0-0 libgtk-2_0-0 libharfbuzz0 libkeyutils1 liblzma5 libpixman-1-0 libpng16-16 libuuid1 libxml2
+Requires: Mesa-libEGL1 Mesa-libGL1 Mesa-libglapi0 cups-libs dbus-1-glib fontconfig krb5 libatk-1_0-0 libavahi-client3 libavahi-common3 libavahi-glib1 libbz2-1 libcairo2 libcom_err2 libdbus libdrm2 libexpat1 libfreetype6 libgbm1 libgio-2_0-0 libglib-2_0-0 libgmodule-2_0-0 libgobject-2_0-0 libgraphite2 libgthread-2_0-0 libgtk-2_0-0 libharfbuzz0 libkeyutils1 liblzma5 libpixman-1-0 libpng16-16 libuuid1 libxml2
%endif
%endif
Provides: loleaflet = 1.5.8
More information about the Libreoffice-commits
mailing list