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

update for settings fixes #80

This commit is contained in:
Zack 2018-10-20 03:23:31 -04:00
parent 3b3541dd22
commit a79b1e3245
4 changed files with 69 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
css/main.css
View File

@ -41,7 +41,7 @@
display: flex;
}
.ui-standard-sidebar-view .bd-psm {
.standardSidebarView-3F1I7i .bd-psm {
background-color: #292b2f;
box-shadow: 0 0 12px 6px rgba(31, 31, 31, 0.32);
border: 1px solid #3f4146;
@ -50,7 +50,7 @@
border-radius: 6px;
}
.ui-standard-sidebar-view #bd-customcss-attach-controls button,
.standardSidebarView-3F1I7i #bd-customcss-attach-controls button,
.bd-detached-css-editor #bd-customcss-attach-controls button {
margin: 0;
width: 100px;
@ -62,7 +62,7 @@
border-radius: 3px;
}
.ui-standard-sidebar-view #bd-customcss-attach-controls button:hover,
.standardSidebarView-3F1I7i #bd-customcss-attach-controls button:hover,
.bd-detached-css-editor #bd-customcss-attach-controls button:hover {
background: #3b3e44;
}
@ -74,14 +74,14 @@
font-family: "Consolas";
}
.content-region .CodeMirror,
.content-region .cm-s-material .CodeMirror-gutters,
.contentRegion-3nDuYy .CodeMirror,
.contentRegion-3nDuYy .cm-s-material .CodeMirror-gutters,
#bd-customcss-detach-container .CodeMirror,
#bd-customcss-detach-container .cm-s-material .CodeMirror-gutters{
background: #292b2f !important;
}
.content-region #bd-customcss-attach-controls,
.contentRegion-3nDuYy #bd-customcss-attach-controls,
#bd-customcss-detach-container #bd-customcss-attach-controls {
background: #272822;
color: #FFF;
@ -90,37 +90,37 @@
}
.content-region #bd-customcss-pane,
.content-region #bd-customcss-innerpane,
.contentRegion-3nDuYy #bd-customcss-pane,
.contentRegion-3nDuYy #bd-customcss-innerpane,
#bd-customcss-detach-container #bd-customcss-pane,
#bd-customcss-detach-container #bd-customcss-innerpane {
min-height: calc(80vh - 165px);
}
.content-region .CodeMirror,
.content-region .CodeMirror-scroll{
.contentRegion-3nDuYy .CodeMirror,
.contentRegion-3nDuYy .CodeMirror-scroll{
max-height: calc(95vh - 165px);
min-height: calc(95vh - 165px);
height: auto;
}
.content-region .CodeMirror-simplescroll-vertical,
.content-region .CodeMirror-simplescroll-horizontal,
.contentRegion-3nDuYy .CodeMirror-simplescroll-vertical,
.contentRegion-3nDuYy .CodeMirror-simplescroll-horizontal,
#bd-customcss-detach-container .CodeMirror-simplescroll-vertical,
#bd-customcss-detach-container .CodeMirror-simplescroll-horizontal {
background: transparent !important;
}
.content-region .CodeMirror-simplescroll-vertical,
.contentRegion-3nDuYy .CodeMirror-simplescroll-vertical,
#bd-customcss-detach-container .CodeMirror-simplescroll-vertical {
margin-right: 3px !important;
}
.content-region .CodeMirror-simplescroll-horizontal,
.contentRegion-3nDuYy .CodeMirror-simplescroll-horizontal,
#bd-customcss-detach-container .CodeMirror-simplescroll-horizontal {
margin-bottom: 3px !important;
}
.content-region .CodeMirror-simplescroll-vertical div,
.content-region .CodeMirror-simplescroll-horizontal div,
.contentRegion-3nDuYy .CodeMirror-simplescroll-vertical div,
.contentRegion-3nDuYy .CodeMirror-simplescroll-horizontal div,
#bd-customcss-detach-container .CodeMirror-simplescroll-vertical div,
#bd-customcss-detach-container .CodeMirror-simplescroll-horizontal div {
background: #18191c !important;
@ -128,17 +128,17 @@
border-radius: 5px !important;
}
.content-region .CodeMirror-scrollbar-filler,
.contentRegion-3nDuYy .CodeMirror-scrollbar-filler,
#bd-customcss-detach-container .CodeMirror-scrollbar-filler {
display: none !important;
}
.ui-standard-sidebar-view #editor-detached h3 {
.standardSidebarView-3F1I7i #editor-detached h3 {
color: #87909c;
font-weight: 600;
font-size: 22px;
}
.ui-standard-sidebar-view #editor-detached button {
.standardSidebarView-3F1I7i #editor-detached button {
margin: auto;
margin-left: calc(50% - 100px);
margin-top: 20px;
@ -149,11 +149,11 @@
font-size: 20px;
}
.bd-blue .ui-standard-sidebar-view #editor-detached button {
.bd-blue .standardSidebarView-3F1I7i #editor-detached button {
background: #3a71c1;
}
.ui-standard-sidebar-view .bd-versioninfo-wrapper {
.standardSidebarView-3F1I7i .bd-versioninfo-wrapper {
bottom: 0;
left: 0;
position: fixed;
@ -162,13 +162,13 @@
padding: 5px;
}
.ui-standard-sidebar-view .bd-versioninfo-wrapper span {
.standardSidebarView-3F1I7i .bd-versioninfo-wrapper span {
color: #b9bbbe;
font-weight: 600;
font-size: 11px;
}
.ui-standard-sidebar-view .bd-versioninfo-wrapper a {
.standardSidebarView-3F1I7i .bd-versioninfo-wrapper a {
font-size: 11px;
}

2
css/main.min.css vendored
View File

File diff suppressed because one or more lines are too long

74
js/main.js
View File

@ -2520,7 +2520,7 @@ class V2C_SettingsPanel extends BDV2.reactComponent {
let {settings} = this.props;
return BDV2.react.createElement(
"div",
{className: "content-column default"},
{className: "contentColumn-2hrIYH contentColumnDefault-1VQkGM"},
BDV2.react.createElement(V2Components.SettingsTitle, {text: this.props.title}),
this.props.button && BDV2.react.createElement("button", {key: "title-button", className: "bd-pfbtn", onClick: this.props.button.onClick}, this.props.button.title),
settings.map(setting => {
@ -2593,10 +2593,10 @@ class V2C_Scroller extends BDV2.reactComponent {
//scrollerWrap-2lJEkd scrollerThemed-2oenus themeGhostHairline-DBD-2d scrollerFade-1Ijw5y
let wrapperClass = `scrollerWrap-2lJEkd scrollerThemed-2oenus themeGhostHairline-DBD-2d${this.props.fade ? " scrollerFade-1Ijw5y" : ""}`;
let scrollerClass = "scroller-2FKFPG scroller"; /* fuck */
if (this.props.sidebar) scrollerClass = "scroller-2FKFPG sidebar-region-scroller scroller scroller-2FKFPG";
if (this.props.sidebar) scrollerClass = "scroller-2FKFPG firefoxFixScrollFlex-cnI2ix sidebarRegionScroller-3MXcoP scroller";
if (this.props.contentColumn) {
scrollerClass = "scroller-2FKFPG content-region-scroller scroller scroller-2FKFPG"; /* fuck */
wrapperClass = "scrollerWrap-2lJEkd content-region-scroller-wrap scrollerThemed-2oenus themeGhost-10fio9 scrollerTrack-3hhmU0 scrollerWrap-2lJEkd content-region-scroller-wrap scrollerThemed-2oenus themeGhost-28MSn0 scrollerTrack-1ZIpsv";
scrollerClass = "scroller-2FKFPG firefoxFixScrollFlex-cnI2ix contentRegionScroller-26nc1e scroller"; /* fuck */
wrapperClass = "scrollerWrap-2lJEkd firefoxFixScrollFlex-cnI2ix contentRegionScrollerWrap-3YZXdm scrollerThemed-2oenus themeGhost-28MSn0 scrollerTrack-1ZIpsv";
}
let {children} = this.props;
return BDV2.react.createElement(
@ -2777,16 +2777,18 @@ class V2C_Tools extends BDV2.reactComponent {
}
render() {
return BDV2.react.createElement("div", {className: "tools-container"},
BDV2.react.createElement("div", {className: "tools"},
BDV2.react.createElement("div",
{className: "btn-close closeButton-1tv5uR", onClick: this.onClick},
BDV2.react.createElement(V2Components.XSvg, null)
),
BDV2.react.createElement(
"div",
{className: "esc-text keybind-KpFkfr"},
"ESC"
return BDV2.react.createElement("div", {className: "tools-container toolsContainer-1edPuj"},
BDV2.react.createElement("div", {className: "tools tools-3-3s-N"},
BDV2.react.createElement("div", {className: "container-1sFeqf"},
BDV2.react.createElement("div",
{className: "btn-close closeButton-1tv5uR", onClick: this.onClick},
BDV2.react.createElement(V2Components.XSvg, null)
),
BDV2.react.createElement(
"div",
{className: "esc-text keybind-KpFkfr"},
"ESC"
)
)
)
);
@ -3107,7 +3109,7 @@ class V2C_CssEditor extends BDV2.reactComponent {
let {detached} = self.state;
return BDV2.react.createElement(
"div",
{className: "content-column default", style: {padding: "60px 40px 0px"}},
{className: "contentColumn-2hrIYH contentColumnDefault-1VQkGM", style: {padding: "60px 40px 0px"}},
detached && BDV2.react.createElement(
"div",
{id: "editor-detached"},
@ -3270,7 +3272,7 @@ class V2C_ContentColumn extends BDV2.reactComponent {
render() {
return BDV2.react.createElement(
"div",
{className: "content-column default"},
{className: "contentColumn-2hrIYH contentColumnDefault-1VQkGM"},
BDV2.react.createElement(
"h2",
{className: "ui-form-title h2 margin-reset margin-bottom-20"},
@ -3695,12 +3697,12 @@ class V2_SettingsPanel {
}
injectRoot() {
if (!$(".layer-3QrUeG .ui-standard-sidebar-view, .layer-3QrUeG .ui-standard-sidebar-view").length) return false;
if (!$(".layer-3QrUeG .standardSidebarView-3F1I7i, .layer-3QrUeG .standardSidebarView-3F1I7i").length) return false;
const root = $("<div/>", {
"class": "content-region",
"class": "contentRegion-3nDuYy",
"id": "bd-settingspane-container"
});
$(".layer-3QrUeG .ui-standard-sidebar-view, .layer-3QrUeG .ui-standard-sidebar-view").append(root);
$(".layer-3QrUeG .standardSidebarView-3F1I7i, .layer-3QrUeG .standardSidebarView-3F1I7i").append(root);
Utils.onRemoved(root[0], () => {
BDV2.reactDom.unmountComponentAtNode(root[0]);
@ -3730,7 +3732,7 @@ class V2_SettingsPanel {
sideBarOnClick(id) {
let self = this;
$(".content-region").first().hide();
$(".contentRegion-3nDuYy").first().hide();
$(self.root).show();
switch (id) {
case "core":
@ -3865,7 +3867,7 @@ class V2_SettingsPanel {
$("[class*='side-'] > [class*='item-']").off("click.v2settingspanel").on("click.v2settingspanel", () => {
BDV2.reactDom.unmountComponentAtNode(self.root);
$(self.root).hide();
$(".content-region").first().show();
$(".contentRegion-3nDuYy").first().show();
});
self.sidebar.render();
}
@ -3929,7 +3931,7 @@ class V2_SettingsPanel {
renderCoreSettings() {
let root = this.root;
if (!root) {
console.log("FAILED TO LOCATE ROOT: .layer .ui-standard-sidebar-view");
console.log("FAILED TO LOCATE ROOT: .layer-3QrUeG .standardSidebarView-3F1I7i");
return;
}
BDV2.reactDom.render(this.coreComponent, root);
@ -3938,7 +3940,7 @@ class V2_SettingsPanel {
renderForkSettings() {
let root = this.root;
if (!root) {
console.log("FAILED TO LOCATE ROOT: .layer .ui-standard-sidebar-view");
console.log("FAILED TO LOCATE ROOT: .layer-3QrUeG .standardSidebarView-3F1I7i");
return;
}
BDV2.reactDom.render(this.forkComponent, root);
@ -3947,7 +3949,7 @@ class V2_SettingsPanel {
renderEmoteSettings() {
let root = this.root;
if (!root) {
console.log("FAILED TO LOCATE ROOT: .layer .ui-standard-sidebar-view");
console.log("FAILED TO LOCATE ROOT: .layer-3QrUeG .standardSidebarView-3F1I7i");
return;
}
BDV2.reactDom.render(this.emoteComponent, root);
@ -3956,7 +3958,7 @@ class V2_SettingsPanel {
renderCustomCssEditor() {
let root = this.root;
if (!root) {
console.log("FAILED TO LOCATE ROOT: .layer .ui-standard-sidebar-view");
console.log("FAILED TO LOCATE ROOT: .layer-3QrUeG .standardSidebarView-3F1I7i");
return;
}
BDV2.reactDom.render(this.customCssComponent, root);
@ -3965,7 +3967,7 @@ class V2_SettingsPanel {
renderPluginPane() {
let root = this.root;
if (!root) {
console.log("FAILED TO LOCATE ROOT: .layer .ui-standard-sidebar-view");
console.log("FAILED TO LOCATE ROOT: .layer-3QrUeG .standardSidebarView-3F1I7i");
return;
}
BDV2.reactDom.render(this.pluginsComponent, root);
@ -3974,7 +3976,7 @@ class V2_SettingsPanel {
renderThemePane() {
let root = this.root;
if (!root) {
console.log("FAILED TO LOCATE ROOT: .layer .ui-standard-sidebar-view");
console.log("FAILED TO LOCATE ROOT: .layer-3QrUeG .standardSidebarView-3F1I7i");
return;
}
BDV2.reactDom.render(this.themesComponent, root);
@ -4090,17 +4092,17 @@ class V2C_SidebarView extends BDV2.reactComponent {
let {sidebar, content, tools} = this.props.children;
return BDV2.react.createElement(
"div",
{className: "ui-standard-sidebar-view"},
{className: "standardSidebarView-3F1I7i"},
BDV2.react.createElement(
"div",
{className: "sidebar-region"},
{className: "sidebarRegion-VFTUkN"},
BDV2.react.createElement(V2Components.Scroller, {key: "sidebarScroller", ref: "sidebarScroller", sidebar: true, fade: sidebar.fade || true, dark: sidebar.dark || true, children: sidebar.component})
),
BDV2.react.createElement("div", {className: "content-region"},
BDV2.react.createElement("div", {className: "content-transition-wrap"},
BDV2.react.createElement("div", {className: "scrollerWrap-2lJEkd content-region-scroller-wrap scrollerThemed-2oenus themeGhost-28MSn0 scrollerTrack-1ZIpsv"},
BDV2.react.createElement("div", {className: "scroller-2FKFPG content-region-scroller scroller", ref: "contentScroller"},
BDV2.react.createElement("div", {className: "content-column default"}, content.component),
BDV2.react.createElement("div", {className: "contentRegion-3nDuYy"},
BDV2.react.createElement("div", {className: "contentTransitionWrap-3hqOEW"},
BDV2.react.createElement("div", {className: "scrollerWrap-2lJEkd firefoxFixScrollFlex-cnI2ix contentRegionScrollerWrap-3YZXdm scrollerThemed-2oenus themeGhost-28MSn0 scrollerTrack-1ZIpsv"},
BDV2.react.createElement("div", {className: "scroller-2FKFPG firefoxFixScrollFlex-cnI2ix contentRegionScroller-26nc1e scroller", ref: "contentScroller"},
BDV2.react.createElement("div", {className: "contentColumn-2hrIYH contentColumnDefault-1VQkGM"}, content.component),
tools.component
)
)
@ -4615,7 +4617,7 @@ class V2C_PublicServers extends BDV2.reactComponent {
if (self.state.connection.state === 1) return self.notConnected;
return [BDV2.react.createElement(
"div",
{ref: "content", key: "pc", className: "content-column default"},
{ref: "content", key: "pc", className: "contentColumn-2hrIYH contentColumnDefault-1VQkGM"},
BDV2.react.createElement(V2Components.SettingsTitle, {text: self.state.title}),
self.bdServer,
self.state.servers.map((server) => {
@ -4641,7 +4643,7 @@ class V2C_PublicServers extends BDV2.reactComponent {
//return BDV2.react.createElement(V2Components.SettingsTitle, { text: self.state.title });
return [BDV2.react.createElement(
"div",
{key: "ncc", ref: "content", className: "content-column default"},
{key: "ncc", ref: "content", className: "contentColumn-2hrIYH contentColumnDefault-1VQkGM"},
BDV2.react.createElement(
"h2",
{className: "ui-form-title h2 margin-reset margin-bottom-20"},

14
js/main.min.js vendored
View File

File diff suppressed because one or more lines are too long