[Libreoffice-commits] online.git: 2 commits - loleaflet/dist loolwsd/Connect.cpp

[Jan Holesovsky]

 loleaflet/dist/toolbar.css        |    2 +-
 loleaflet/dist/toolbar/toolbar.js |    2 +-
 loolwsd/Connect.cpp               |    4 ++++
 3 files changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 0545001add4b0a6e4891c52a93e59450f9c471c7
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Tue May 24 14:24:50 2016 +0200

    bccu#1833: Fix closing button in the help.

diff --git a/loleaflet/dist/toolbar.css b/loleaflet/dist/toolbar.css
index 3c51c1e..bbe7ab2 100644
--- a/loleaflet/dist/toolbar.css
+++ b/loleaflet/dist/toolbar.css
@@ -265,7 +265,7 @@ button.leaflet-control-search-next
 	z-index:3200;
 	position:absolute;
 	top:0px;
-	right:-10px;
+	right:-1px;
 	cursor:pointer;
 }
 
diff --git a/loleaflet/dist/toolbar/toolbar.js b/loleaflet/dist/toolbar/toolbar.js
index f6a1d5d..5d5cf7a 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -335,7 +335,7 @@ function onClick(id) {
 			containerCss: {
 				overflow : "hidden",
 				backgroundColor : "#fff",
-				padding : "12px",
+				padding : "20px",
 				border : "2px solid #000"
 			}
 		});
commit 294bc982666315a1018fccb86820fbff13edc1a4
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Tue May 24 14:13:58 2016 +0200

    Fix non-ssl build.

diff --git a/loolwsd/Connect.cpp b/loolwsd/Connect.cpp
index e81e668..eef9a66 100644
--- a/loolwsd/Connect.cpp
+++ b/loolwsd/Connect.cpp
@@ -49,7 +49,11 @@ using namespace LOOLProtocol;
 
 using Poco::Net::AcceptCertificateHandler;
 using Poco::Net::Context;
+#if ENABLE_SSL
 using Poco::Net::HTTPSClientSession;
+#else
+using Poco::Net::HTTPClientSession;
+#endif
 using Poco::Net::HTTPRequest;
 using Poco::Net::HTTPResponse;
 using Poco::Net::InvalidCertificateHandler;