diff --git a/public/res/helpers/teamserverHelper.js b/public/res/helpers/teamserverHelper.js
index 8eb6a0ac..46cbd9ac 100644
--- a/public/res/helpers/teamserverHelper.js
+++ b/public/res/helpers/teamserverHelper.js
@@ -1,4 +1,3 @@
-/*global gapi, google */
define([
"underscore",
"jquery",
@@ -33,7 +32,7 @@ define([
return task.chain();
}
$.ajax({
- url: settings.teamserverURL + '/ping',
+ url: constants.TEAM_SERVER_URL + 'ping',
timeout: constants.AJAX_TIMEOUT
}).fail(function(jqXHR) {
var error = {
diff --git a/public/res/html/bodyIndex.html b/public/res/html/bodyIndex.html
index d808f18b..96dbad32 100644
--- a/public/res/html/bodyIndex.html
+++ b/public/res/html/bodyIndex.html
@@ -117,6 +117,10 @@
class="icon-provider-gdrive"> Open from Google Drive
(3rd account)
+
+
'
].join(""),
pdfPageSize: 'A4',
- teamserverURL: constants.TEAM_SERVER_URL,
sshProxy: constants.SSH_PROXY_URL,
extensionSettings: {}
};
diff --git a/public/res/styles/main.less b/public/res/styles/main.less
index 4cbc0243..827fa09e 100644
--- a/public/res/styles/main.less
+++ b/public/res/styles/main.less
@@ -244,6 +244,8 @@ a {
.list-group-item {
padding: 10px 15px;
+ border-left-width: 0;
+ border-right-width: 0;
margin-bottom: 0;
.list-group & {
border-radius: 0;
@@ -251,9 +253,24 @@ a {
a&:hover,
a&:focus {
color: darken(@secondary, 30%);
- border-top-color: @list-group-hover-border-color;
- border-bottom-color: @list-group-hover-border-color;
+ border-color: @list-group-hover-border-color;
}
+ .checkbox {
+ float: right;
+ margin: 0;
+ padding: 0;
+ cursor: pointer;
+ input {
+ cursor: pointer;
+ margin: 0 16px;
+ height: @input-height-slim;
+ }
+ }
+}
+
+.form-group {
+ margin-bottom: 1px;
+ padding: 5px;
}
.text-danger:hover {
@@ -765,17 +782,6 @@ a {
font-size: 15px;
border-top-color: @modal-content-separator-color;
}
- .checkbox {
- float: right;
- margin: 0;
- padding: 0;
- cursor: pointer;
- input {
- cursor: pointer;
- margin: 0 16px;
- height: @input-height-slim;
- }
- }
.input-rename {
width: 220px;
height: @input-height-slim;