lightcordwarez
/
BetterDiscordApp-v1
mirror of https://github.com/jiiks/betterdiscordapp.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/origin/master' into beta

This commit is contained in:
Jiiks 2015-10-29 14:03:47 +02:00
parent 52cec81afb f211b26621
commit 9c87dd0979
5 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
css/main.css
View File

@ -406,7 +406,7 @@
} }
#bd-ps-body table tr td { #bd-ps-body table tr td {
min-width:150px; min-width:100px;
} }
#bd-ps-body .description { #bd-ps-body .description {

2
css/main.min.css vendored
View File

File diff suppressed because one or more lines are too long

8
js/main.js
View File

@ -422,10 +422,9 @@ PublicServers.prototype.addServer = function(name, code, title, language, descri
tr.append(desc); tr.append(desc);
tr.append($("<button/>", { tr.append($("<td/>").append($("<button/>", {
text: "Join", text: "Join",
css: { css: {
"width": "100%",
"height": "30px", "height": "30px",
"display": "block", "display": "block",
"margin-top": "10px", "margin-top": "10px",
@ -435,12 +434,11 @@ PublicServers.prototype.addServer = function(name, code, title, language, descri
"color": "#EDEDED" "color": "#EDEDED"
}, },
click: function() { self.joinServer(code); } click: function() { self.joinServer(code); }
})); })));
tableBody.append(tr); tableBody.append(tr);
}; };
PublicServers.prototype.show = function() { PublicServers.prototype.show = function() {
this.getPanel().toggle(); this.getPanel().toggle();
var li = $("#bd-pub-li"); var li = $("#bd-pub-li");
@ -457,7 +455,7 @@ PublicServers.prototype.joinServer = function(code) {
$(".action.join .btn").click(); $(".action.join .btn").click();
$(".create-guild-container input").val(code); $(".create-guild-container input").val(code);
$(".form.join-server .btn-primary").click(); $(".form.join-server .btn-primary").click();
} };
/* BetterDiscordApp QuickEmoteMenu JavaScript /* BetterDiscordApp QuickEmoteMenu JavaScript
* Version: 1.3 * Version: 1.3

2
js/main.min.js vendored
View File

File diff suppressed because one or more lines are too long

7
js/publicservers.js
View File

@ -127,10 +127,9 @@ PublicServers.prototype.addServer = function(name, code, title, language, descri
tr.append(desc); tr.append(desc);
tr.append($("<button/>", { tr.append($("<td/>").append($("<button/>", {
text: "Join", text: "Join",
css: { css: {
"width": "100%",
"height": "30px", "height": "30px",
"display": "block", "display": "block",
"margin-top": "10px", "margin-top": "10px",
@ -140,7 +139,7 @@ PublicServers.prototype.addServer = function(name, code, title, language, descri
"color": "#EDEDED" "color": "#EDEDED"
}, },
click: function() { self.joinServer(code); } click: function() { self.joinServer(code); }
})); })));
tableBody.append(tr); tableBody.append(tr);
}; };
@ -161,4 +160,4 @@ PublicServers.prototype.joinServer = function(code) {
$(".action.join .btn").click(); $(".action.join .btn").click();
$(".create-guild-container input").val(code); $(".create-guild-container input").val(code);
$(".form.join-server .btn-primary").click(); $(".form.join-server .btn-primary").click();
} };