Update to latest (#15)
* Settings panel injection fix * css fixes * 1.792 * 1.792 * Fix scrolling and tools * Fix scrolling and tools
This commit is contained in:
BlazingSky
GitHub
parent
3fb10a820a
commit
9d7e1bae32
229
css/main.css
229
css/main.css
|
|
@ -1901,6 +1901,235 @@
|
|||
display: block;
|
||||
}
|
||||
|
||||
#bd-settings-sidebar .ui-tab-bar-item {
|
||||
color: #b9bbbe;
|
||||
padding-top: 6px;
|
||||
padding-bottom: 6px;
|
||||
margin-bottom: 2px;
|
||||
padding: 6px 10px;
|
||||
position: relative;
|
||||
font-size: 16px;
|
||||
line-height: 20px;
|
||||
border-radius: 3px;
|
||||
white-space: nowrap;
|
||||
text-overflow: ellipsis;
|
||||
overflow: hidden;
|
||||
flex-shrink: 0;
|
||||
font-weight: 500;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
#bd-settings-sidebar .ui-tab-bar-item:hover {
|
||||
color: #f6f6f7;
|
||||
background-color: hsla(216,4%,74%,.1);
|
||||
}
|
||||
|
||||
#bd-settings-sidebar .ui-tab-bar-item.selected {
|
||||
color: #fff;
|
||||
background-color: #7289da;
|
||||
}
|
||||
|
||||
#bd-settings-sidebar .ui-tab-bar-header {
|
||||
color: #72767d;
|
||||
padding: 6px 10px;
|
||||
font-size: 12px;
|
||||
line-height: 16px;
|
||||
text-transform: uppercase;
|
||||
white-space: nowrap;
|
||||
text-overflow: ellipsis;
|
||||
overflow: hidden;
|
||||
flex-shrink: 0;
|
||||
font-weight: 500;
|
||||
}
|
||||
|
||||
#bd-settings-sidebar .ui-tab-bar-separator {
|
||||
background-color: hsla(218,5%,47%,.3);
|
||||
margin-left: 10px;
|
||||
margin-right: 10px;
|
||||
height: 1px;
|
||||
margin-bottom: 8px;
|
||||
margin-top: 8px;
|
||||
}
|
||||
|
||||
#bd-settingspane-container h2.ui-form-title {
|
||||
color: #f6f6f7;
|
||||
text-transform: uppercase;
|
||||
font-weight: 600;
|
||||
}
|
||||
|
||||
#bd-settingspane-container .ui-switch-item {
|
||||
flex-direction: column;
|
||||
}
|
||||
|
||||
#bd-settingspane-container .ui-switch-item h3 {
|
||||
font-weight: 500;
|
||||
color: #f6f6f7;
|
||||
flex: 1;
|
||||
line-height: 24px;
|
||||
}
|
||||
|
||||
#bd-settingspane-container .ui-switch-item .style-description {
|
||||
color: #72767d;
|
||||
font-size: 14px;
|
||||
font-weight: 500;
|
||||
margin-bottom: 10px;
|
||||
line-height: 30px;
|
||||
border-bottom: 1px solid hsla(218,5%,47%,.3);
|
||||
}
|
||||
|
||||
#bd-settingspane-container .ui-switch-item .ui-switch-wrapper {
|
||||
-webkit-user-select: none;
|
||||
-moz-user-select: none;
|
||||
-ms-user-select: none;
|
||||
user-select: none;
|
||||
position: relative;
|
||||
width: 44px;
|
||||
height: 24px;
|
||||
display: block;
|
||||
flex: 0 0 auto;
|
||||
}
|
||||
|
||||
#bd-settingspane-container .ui-switch-item .ui-switch-wrapper input {
|
||||
position: absolute;
|
||||
opacity: 0;
|
||||
cursor: pointer;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
z-index: 1;
|
||||
}
|
||||
|
||||
#bd-settingspane-container .ui-switch-item .ui-switch-wrapper .ui-switch {
|
||||
background: #7289da;
|
||||
position: absolute;
|
||||
top: 0;
|
||||
right: 0;
|
||||
bottom: 0;
|
||||
left: 0;
|
||||
background: #72767d;
|
||||
border-radius: 14px;
|
||||
transition: background .15s ease-in-out,box-shadow .15s ease-in-out,border .15s ease-in-out;
|
||||
}
|
||||
|
||||
#bd-settingspane-container .ui-switch-item .ui-switch-wrapper .ui-switch:before {
|
||||
content: "";
|
||||
display: block;
|
||||
width: 18px;
|
||||
height: 18px;
|
||||
position: absolute;
|
||||
top: 3px;
|
||||
left: 3px;
|
||||
bottom: 3px;
|
||||
background: #f6f6f7;
|
||||
border-radius: 10px;
|
||||
transition: all .15s ease;
|
||||
box-shadow: 0 3px 1px 0 rgba(0,0,0,.05),0 2px 2px 0 rgba(0,0,0,.1),0 3px 3px 0 rgba(0,0,0,.05);
|
||||
}
|
||||
|
||||
#bd-settingspane-container .ui-switch-item .ui-switch-wrapper .ui-switch.checked {
|
||||
background: #7289da;
|
||||
}
|
||||
|
||||
#bd-settingspane-container .ui-switch-item .ui-switch-wrapper .ui-switch.checked:before {
|
||||
transform: translateX(20px);
|
||||
}
|
||||
|
||||
#pubslayer .ui-tab-bar-item {
|
||||
color: #b9bbbe;
|
||||
padding-top: 6px;
|
||||
padding-bottom: 6px;
|
||||
margin-bottom: 2px;
|
||||
padding: 6px 10px;
|
||||
position: relative;
|
||||
font-size: 16px;
|
||||
line-height: 20px;
|
||||
border-radius: 3px;
|
||||
white-space: nowrap;
|
||||
text-overflow: ellipsis;
|
||||
overflow: hidden;
|
||||
flex-shrink: 0;
|
||||
font-weight: 500;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
#pubslayer .ui-tab-bar-item:hover {
|
||||
color: #f6f6f7;
|
||||
background-color: hsla(216,4%,74%,.1);
|
||||
}
|
||||
|
||||
#pubslayer .ui-tab-bar-item.selected {
|
||||
color: #fff;
|
||||
background-color: #7289da;
|
||||
}
|
||||
|
||||
#pubslayer .ui-tab-bar-header {
|
||||
color: #72767d;
|
||||
padding: 6px 10px;
|
||||
font-size: 12px;
|
||||
line-height: 16px;
|
||||
text-transform: uppercase;
|
||||
white-space: nowrap;
|
||||
text-overflow: ellipsis;
|
||||
overflow: hidden;
|
||||
flex-shrink: 0;
|
||||
font-weight: 500;
|
||||
}
|
||||
|
||||
#pubslayer #bd-settings-sidebar .ui-tab-bar-separator {
|
||||
background-color: hsla(218,5%,47%,.3);
|
||||
margin-left: 10px;
|
||||
margin-right: 10px;
|
||||
height: 1px;
|
||||
margin-bottom: 8px;
|
||||
margin-top: 8px;
|
||||
}
|
||||
|
||||
#pubslayer h2.ui-form-title {
|
||||
color: #f6f6f7;
|
||||
text-transform: uppercase;
|
||||
font-weight: 600;
|
||||
}
|
||||
|
||||
#pubslayer h5.ui-form-title {
|
||||
color: #f6f6f7;
|
||||
}
|
||||
|
||||
#pubslayer button {
|
||||
background: #7289da;
|
||||
color: #FFF;
|
||||
font-size: 14px;
|
||||
font-weight: 500;
|
||||
line-height: 16px;
|
||||
padding: 2px 16px;
|
||||
border: none;
|
||||
border-radius: 3px;
|
||||
transition: background-color .17s ease;
|
||||
}
|
||||
|
||||
#pubslayer button:hover {
|
||||
background-color: #677bc4;
|
||||
}
|
||||
|
||||
#pubslayer input {
|
||||
color: #f6f6f7;
|
||||
background-color: rgba(0,0,0,.1);
|
||||
border-color: rgba(0,0,0,.3);
|
||||
padding: 10px;
|
||||
height: 30px;
|
||||
border-width: 1px;
|
||||
border-style: solid;
|
||||
border-radius: 3px;
|
||||
outline: none;
|
||||
transition: background-color .15s ease,border .15s ease;
|
||||
}
|
||||
|
||||
#bd-settingspane-container .scroller-wrap {
|
||||
height: 100%;
|
||||
}
|
||||
|
||||
#bd-settingspane-container .scroller-wrap .scroller {
|
||||
display: flex;
|
||||
}
|
||||
|
||||
/*BD BLUE*/
|
||||
.bd-blue .bd-pfbtn { background: #3a71c1; }
|
||||
.bd-blue .bot-tag {background: #3a71c1;}
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
36
js/main.js
36
js/main.js
|
|
@ -85,7 +85,7 @@ betterDiscordIPC.on('asynchronous-reply', (event, arg) => {
|
|||
});
|
||||
|
||||
var settingsPanel, emoteModule, utils, quickEmoteMenu, opublicServers, voiceMode, pluginModule, themeModule, customCssEditor, dMode;
|
||||
var jsVersion = 1.791;
|
||||
var jsVersion = 1.792;
|
||||
var supportedVersion = "0.2.81";
|
||||
|
||||
var mainObserver;
|
||||
|
|
@ -191,11 +191,16 @@ var bdchangelog = {
|
|||
},
|
||||
"fixes": {
|
||||
"0a": {
|
||||
"title": "1.792 : Fixed settingspanel injection",
|
||||
"text": "Still has some minor bugs",
|
||||
"img": ""
|
||||
},
|
||||
"0b": {
|
||||
"title": "1.791 : Restored Buttons",
|
||||
"text": "Restored Open Theme Folder and Open Plugin Folder buttons",
|
||||
"img": ""
|
||||
},
|
||||
"0b": {
|
||||
"0c": {
|
||||
"title": "1.79 : Settings Saving",
|
||||
"text": "Fixed settings not saving with new settings panel",
|
||||
"img": ""
|
||||
|
|
@ -3224,7 +3229,7 @@ class V2C_Switch extends BDV2.reactComponent {
|
|||
"label",
|
||||
{ className: "ui-switch-wrapper ui-flex-child", style: { flex: '0 0 auto' } },
|
||||
BDV2.react.createElement("input", { className: "ui-switch-checkbox", type: "checkbox", checked: checked, onChange: e => this.onChange(e) }),
|
||||
BDV2.react.createElement("div", { className: "ui-switch" })
|
||||
BDV2.react.createElement("div", { className: `ui-switch ${checked ? 'checked' : ''}` })
|
||||
)
|
||||
),
|
||||
BDV2.react.createElement(
|
||||
|
|
@ -3287,7 +3292,6 @@ class V2C_TabBarItem extends BDV2.reactComponent {
|
|||
}
|
||||
|
||||
onClick() {
|
||||
|
||||
if (this.props.onClick) {
|
||||
this.props.onClick(this.props.id);
|
||||
}
|
||||
|
|
@ -3323,7 +3327,15 @@ class V2C_SideBar extends BDV2.reactComponent {
|
|||
constructor(props) {
|
||||
super(props);
|
||||
let self = this;
|
||||
$('.ui-tab-bar-item').on('click', e => {
|
||||
const si = $("[class*=side] > [class*=selected]");
|
||||
if(si.length) {
|
||||
self.scn = si.attr("class");
|
||||
}
|
||||
const ns = $("[class*=side] > [class*=notSelected]");
|
||||
if(ns.length) {
|
||||
self.nscn = ns.attr("class");
|
||||
}
|
||||
$("[class*=side] > [class*=item]").on("click", e => {
|
||||
self.setState({
|
||||
'selected': null
|
||||
});
|
||||
|
|
@ -3365,6 +3377,14 @@ class V2C_SideBar extends BDV2.reactComponent {
|
|||
|
||||
onClick(id) {
|
||||
let self = this;
|
||||
const si = $("[class*=side] > [class*=selected]");
|
||||
if(si.length) {
|
||||
si.off("click.bdsb").on("click.bsb", e => {
|
||||
$(e.target).attr("class", self.scn);
|
||||
});
|
||||
si.attr("class", self.nscn);
|
||||
}
|
||||
|
||||
$('.ui-tab-bar-item').removeClass('selected');
|
||||
self.setState({
|
||||
'selected': id
|
||||
|
|
@ -4800,7 +4820,7 @@ class V2_SettingsPanel_Sidebar {
|
|||
}
|
||||
|
||||
injectRoot() {
|
||||
let changeLog = $(".ui-tab-bar-item:not(.danger)").last();
|
||||
let changeLog = $("[class*=side] > [class*=item]:not([class*=Danger])").last();
|
||||
if (!changeLog.length) return false;
|
||||
$("<span/>", { 'id': 'bd-settings-sidebar' }).insertBefore(changeLog.prev());
|
||||
return true;
|
||||
|
|
@ -4809,7 +4829,7 @@ class V2_SettingsPanel_Sidebar {
|
|||
render() {
|
||||
let root = this.root;
|
||||
if (!root) {
|
||||
console.log("FAILED TO LOCATE ROOT: .ui-tab-bar-item:not(.danger)");
|
||||
console.log("FAILED TO LOCATE ROOT: [class*=side] > [class*=item]:not([class*=Danger])");
|
||||
return;
|
||||
}
|
||||
BDV2.reactDom.render(this.component, root);
|
||||
|
|
@ -4965,7 +4985,7 @@ class V2_SettingsPanel {
|
|||
|
||||
renderSidebar() {
|
||||
let self = this;
|
||||
$(".ui-tab-bar-item").off('click.v2settingspanel').on('click.v2settingspanel', e => {
|
||||
$("[class*=side] > [class*=item]").off('click.v2settingspanel').on('click.v2settingspanel', e => {
|
||||
BDV2.reactDom.unmountComponentAtNode(self.root);
|
||||
$(self.root).hide();
|
||||
$(".content-region").first().show();
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
Loading…
Reference in New Issue