This commit is contained in:
Zack Rauen 2019-11-28 02:01:48 -05:00
parent 3d09fc1f52
commit 21981b15e8
5 changed files with 98 additions and 153 deletions

View File

@ -271,20 +271,42 @@
#bda-qem {
border-radius: 5px 5px 0 0;
background: #FFF;
background: #2f3136;
border-bottom: 1px solid rgba(0, 0, 0, 0.1) !important;
height: 30px;
display: flex;
flex-direction: row;
padding-right: 1px !important;
}
.theme-light #bda-qem {
background: #f2f3f5;
}
#bda-qem button {
border-left: 1px solid #202225;
background: #2f3136;
box-shadow: rgba(0, 0, 0, 0.1) 1px 0 0 0;
flex-grow: 1;
color: #FFF;
}
.theme-light #bda-qem button {
border-left: 1px solid #EFEFEF;
background: transparent;
box-shadow: #CECECE 1px 0 0 0;
flex-grow: 1;
color: #000;
}
#bda-qem button:first-child {
border-left-color: transparent;
}
#bda-qem button:hover {
background: rgba(79,84,92,0.16);
}
.theme-light #bda-qem button:hover {
background: #ECECEC;
}
@ -302,17 +324,29 @@
order: 3;
}
#bda-qem button.active {
background-color: #E2E2E2;
#bda-qem button.active,
#bda-qem button.active:hover {
background-color: #7289da;
}
#bda-qem-twitch-container, #bda-qem-favourite-container {
width: 346px;
height: 327px;
background-color: #FFF;
.theme-light #bda-qem button.active,
.theme-light #bda-qem button.active:hover {
color: #ffffff;
}
#bda-qem-twitch-container,
#bda-qem-favourite-container {
width: 384px;
height: 424px;
background-color: #2f3136;
border-radius: 0 0 5px 5px;
}
.theme-light #bda-qem-twitch-container,
.theme-light #bda-qem-favourite-container {
background-color: #f2f3f5;
}
#bda-qem-twitch-container .scroller-wrap, #bda-qem-favourite-container .scroller-wrap {
height: 100%;
}
@ -749,6 +783,23 @@ body .ace_closeButton:active {
transform: translateY(2px);
}
.theme-dark div #ace_settingsmenu {
color: #f6f6f7;
background: #36393f;
box-shadow: 0 0 0 1px rgba(32,34,37,.6),0 2px 10px 0 rgba(0,0,0,.2);
}
.theme-dark div #ace_settingsmenu select,
.theme-dark div #ace_settingsmenu input[type="text"] {
color: #f6f6f7;
background: #2F3136;
border: 1px solid #484B52;
}
.theme-dark div .ace_closeButton::before {
color: #f6f6f7;
}
/* editor help text */
#bd-customcss-attach-controls .help-text {
margin-top: 8px;
@ -1717,102 +1768,25 @@ body .ace_closeButton:active {
/* BEGIN DARK MODE */
/* =============== */
/* Emoji Picker */
.bda-dark #bda-qem-favourite-container,
.bda-dark #bda-qem-twitch-container {
background-color: #353535;
}
.bda-dark #bda-qem {
border-bottom: 1px solid #464646 !important;
background: #353535;
}
.bda-dark #bda-qem button {
background: #353535;
border-left: 1px solid #242424;
box-shadow: #424242 1px 0 0 0;
color: #FFF;
}
.bda-dark #bda-qem button.active {
background-color: #292929;
}
.bda-dark #bda-qem button:hover {
background-color: #303030;
}
.bda-dark #bda-qem-favourite-container,
.bda-dark #bda-qem-twitch-container {
background-color: #353535;
}
.bda-dark .emojiPicker-3m1S-j {
background-color: #353535;
}
.bda-dark .emojiPicker-3m1S-j .category-2U57w6 {
background-color: #353535;
}
.bda-dark .emojiPicker-3m1S-j .header-1nkwgG .searchBar-2pWH0_ {
background-color: #2B2B2B;
}
.bda-dark .emojiPicker-3m1S-j .searchBar-2pWH0_ input {
color: #FFF;
}
.bda-dark .emojiPicker-3m1S-j .searchBar-2pWH0_ input::-webkit-input-placeholder {
color: #FFF;
}
.bda-dark .emojiPicker-3m1S-j .scroller-3vODG7 .emojiItem-109bjA.selected-39BZ4S {
background-color: rgba(123, 123, 123, 0.37);
}
.bda-dark .emojiPicker-3m1S-j .dimmer-3iH-5D.visible-3k45bQ {
background-color: rgba(62, 62, 62, 0.65);
}
.bda-dark .emojiPicker-3m1S-j .diversitySelector-tmmMv0 .popout-2nUePc {
background: #353535;
border-color: #202020;
}
.bda-dark #bda-qem-favourite-container .scroller::-webkit-scrollbar,
.bda-dark #bda-qem-favourite-container .scroller::-webkit-scrollbar-track,
.bda-dark #bda-qem-favourite-container .scroller::-webkit-scrollbar-track-piece,
.bda-dark #bda-qem-twitch-container .scroller::-webkit-scrollbar,
.bda-dark #bda-qem-twitch-container .scroller::-webkit-scrollbar-track,
.bda-dark #bda-qem-twitch-container .scroller::-webkit-scrollbar-track-piece,
.bda-dark .emojiPicker-3m1S-j .scroller-3vODG7::-webkit-scrollbar,
.bda-dark .emojiPicker-3m1S-j .scroller-3vODG7::-webkit-scrollbar-track,
.bda-dark .emojiPicker-3m1S-j .scroller-3vODG7::-webkit-scrollbar-track-piece {
background-color: #303030 !important;
border-color: #303030 !important;
}
.bda-dark #bda-qem-twitch-container .scroller::-webkit-scrollbar-thumb,
.bda-dark #bda-qem-favourite-container .scroller::-webkit-scrollbar-thumb,
.bda-dark .emojiPicker-3g68GS .scroller-3vODG7::-webkit-scrollbar-thumb {
border-color: #202020 !important;
background-color: #202020 !important;
}
/* add/create server */
.bda-dark .theme-light .slide-2pHaq5 {
.theme-dark .theme-light .slide-2pHaq5 {
background: #36393f;
}
.bda-dark .theme-dark .action-1lSjCi,
.bda-dark .theme-light .action-1lSjCi {
.theme-dark .theme-dark .action-1lSjCi,
.theme-dark .theme-light .action-1lSjCi {
background: #2F3136;
}
.theme-dark .theme-light .footer-3rDWdC {
background: #2f3136;
box-shadow: none;
}
/* centered or */
.bda-dark .theme-dark .or-3THJsp,
.bda-dark .theme-light .or-3THJsp {
.theme-dark .theme-dark .or-3THJsp,
.theme-dark .theme-light .or-3THJsp {
background: #2F3136;
order: 2;
height: 56px;
@ -1824,50 +1798,33 @@ body .ace_closeButton:active {
border: 2px solid #484B52;
}
.bda-dark .create-3jownz {
.theme-dark .create-3jownz {
order: 1;
}
.bda-dark .join-33Tr-7 {
.theme-dark .join-33Tr-7 {
order: 3;
}
.bda-dark .theme-dark .actionIcon-2IISM_,
.bda-dark .theme-light .actionIcon-2IISM_ {
.theme-dark .theme-dark .actionIcon-2IISM_,
.theme-dark .theme-light .actionIcon-2IISM_ {
filter: grayscale(100%) brightness(60%);
}
.bda-dark .theme-light .footer-2yfCgX {
.theme-dark .theme-light .footer-2yfCgX {
background: #2F3136;
}
/* Region Select */
.bda-dark .regionSelectModal-12e-57 {
.theme-dark .regionSelectModal-12e-57 {
background: #36393f;
}
.bda-dark .regionSelectModal-12e-57 .regionSelectModalOption-2DSIZ3 {
.theme-dark .regionSelectModal-12e-57 .regionSelectModalOption-2DSIZ3 {
background: #2F3136;
border: 2px solid #484B52;
}
/* Ace Editor Settings */
.bda-dark ~ div #ace_settingsmenu {
color: #f6f6f7;
background: #36393f;
box-shadow: 0 0 0 1px rgba(32,34,37,.6),0 2px 10px 0 rgba(0,0,0,.2);
}
.bda-dark ~ div #ace_settingsmenu select,
.bda-dark ~ div #ace_settingsmenu input[type="text"] {
color: #f6f6f7;
background: #2F3136;
border: 1px solid #484B52;
}
.bda-dark ~ div .ace_closeButton::before {
color: #f6f6f7;
}
/* =============== */
/* END DARK MODE */

2
css/main.min.css vendored

File diff suppressed because one or more lines are too long

View File

@ -182,7 +182,7 @@ window.bdPluginStorage = class bdPluginStorage {
var settingsPanel, emoteModule, quickEmoteMenu, voiceMode, pluginModule, themeModule, dMode, publicServersModule;
var minSupportedVersion = "0.3.0";
var bbdVersion = "0.2.17";
var bbdVersion = "0.2.19";
var mainCore;
@ -198,7 +198,7 @@ var settings = {
"Minimal Mode": {id: "bda-gs-2", info: "Hide elements and reduce the size of elements.", implemented: true, hidden: false, cat: "core", category: "modules"},
"Voice Mode": {id: "bda-gs-4", info: "Only show voice chat", implemented: true, hidden: false, cat: "core", category: "modules"},
"Hide Channels": {id: "bda-gs-3", info: "Hide channels in minimal mode", implemented: true, hidden: false, cat: "core", category: "modules"},
"Dark Mode": {id: "bda-gs-5", info: "Make certain elements dark by default(wip)", implemented: true, hidden: false, cat: "core", category: "modules"},
"Dark Mode": {id: "bda-gs-5", info: "Make certain elements dark by default(wip)", implemented: false, hidden: false, cat: "core", category: "modules"},
"Voice Disconnect": {id: "bda-dc-0", info: "Disconnect from voice server when closing Discord", implemented: true, hidden: false, cat: "core", category: "modules"},
"24 Hour Timestamps": {id: "bda-gs-6", info: "Replace 12hr timestamps with proper ones", implemented: true, hidden: false, cat: "core", category: "modules"},
"Coloured Text": {id: "bda-gs-7", info: "Make text colour the same as role colour", implemented: true, hidden: false, cat: "core", category: "modules"},
@ -238,7 +238,7 @@ var defaultCookie = {
"bda-gs-2": false,
"bda-gs-3": false,
"bda-gs-4": false,
"bda-gs-5": true,
"bda-gs-5": false,
"bda-gs-6": false,
"bda-gs-7": false,
"bda-gs-8": false,
@ -361,8 +361,8 @@ Core.prototype.checkForGuilds = function() {
let timesChecked = 0;
return new Promise(resolve => {
const checkForGuilds = function() {
timesChecked++;
const wrapper = BDV2.guildClasses.wrapper.split(" ")[0];
if (document.querySelectorAll(`.${wrapper}`).length > 0) timesChecked++;
const guild = BDV2.guildClasses.listItem.split(" ")[0];
const blob = BDV2.guildClasses.blobContainer.split(" ")[0];
if (document.querySelectorAll(`.${wrapper} .${guild} .${blob}`).length > 0) return resolve(bdConfig.deferLoaded = true);
@ -431,7 +431,8 @@ Core.prototype.initObserver = function () {
if (node.parentElement == document.body && node.querySelector("#ace_settingsmenu")) node.id = "ace_settingsmenu_container";
// Emoji Picker
if (node.classList.contains("popout-2iWAc-") && !node.classList.contains("popoutLeft-30WmrD") && node.getElementsByClassName("emojiPicker-3m1S-j").length) quickEmoteMenu.obsCallback(node);
//node.getElementsByClassName("emojiPicker-3m1S-j").length && !node.querySelector(".emojiPicker-3m1S-j").parentElement.classList.contains("animatorLeft-1EQxU0")
if (node.classList.contains("layer-v9HyYc") && node.getElementsByClassName("emojiPicker-3m1S-j").length && !node.querySelector(".emojiPicker-3m1S-j").parentElement.classList.contains("animatorLeft-1EQxU0")) quickEmoteMenu.obsCallback(node);
}
});
@ -4154,10 +4155,10 @@ class V2_SettingsPanel {
else voiceMode.disable();
}
if (id == "bda-gs-5") {
if (enabled) $("#app-mount").addClass("bda-dark");
else $("#app-mount").removeClass("bda-dark");
}
// if (id == "bda-gs-5") {
// if (enabled) $("#app-mount").addClass("bda-dark");
// else $("#app-mount").removeClass("bda-dark");
// }
if (enabled && id == "bda-gs-6") mainCore.inject24Hour();
@ -4218,7 +4219,7 @@ class V2_SettingsPanel {
if (settingsCookie["bda-gs-3"]) $("body").addClass("bd-minimal-chan");
if (settingsCookie["bda-gs-1"]) publicServersModule.addButton();
if (settingsCookie["bda-gs-4"]) voiceMode.enable();
if (settingsCookie["bda-gs-5"]) $("#app-mount").addClass("bda-dark");
// if (settingsCookie["bda-gs-5"]) $("#app-mount").addClass("bda-dark");
if (settingsCookie["bda-gs-6"]) mainCore.inject24Hour();
if (settingsCookie["bda-gs-7"]) mainCore.injectColoredText();
if (settingsCookie["bda-es-4"]) emoteModule.autoCapitalize();

6
js/main.min.js vendored

File diff suppressed because one or more lines are too long

27
package-lock.json generated
View File

@ -1544,8 +1544,7 @@
"ansi-regex": {
"version": "2.1.1",
"bundled": true,
"dev": true,
"optional": true
"dev": true
},
"aproba": {
"version": "1.2.0",
@ -1588,8 +1587,7 @@
"code-point-at": {
"version": "1.1.0",
"bundled": true,
"dev": true,
"optional": true
"dev": true
},
"concat-map": {
"version": "0.0.1",
@ -1600,8 +1598,7 @@
"console-control-strings": {
"version": "1.1.0",
"bundled": true,
"dev": true,
"optional": true
"dev": true
},
"core-util-is": {
"version": "1.0.2",
@ -1718,8 +1715,7 @@
"inherits": {
"version": "2.0.3",
"bundled": true,
"dev": true,
"optional": true
"dev": true
},
"ini": {
"version": "1.3.5",
@ -1731,7 +1727,6 @@
"version": "1.0.0",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"number-is-nan": "^1.0.0"
}
@ -1761,7 +1756,6 @@
"version": "2.3.5",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"safe-buffer": "^5.1.2",
"yallist": "^3.0.0"
@ -1780,7 +1774,6 @@
"version": "0.5.1",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"minimist": "0.0.8"
}
@ -1874,7 +1867,6 @@
"version": "1.4.0",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"wrappy": "1"
}
@ -1960,8 +1952,7 @@
"safe-buffer": {
"version": "5.1.2",
"bundled": true,
"dev": true,
"optional": true
"dev": true
},
"safer-buffer": {
"version": "2.1.2",
@ -1997,7 +1988,6 @@
"version": "1.0.2",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"code-point-at": "^1.0.0",
"is-fullwidth-code-point": "^1.0.0",
@ -2017,7 +2007,6 @@
"version": "3.0.1",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"ansi-regex": "^2.0.0"
}
@ -2061,14 +2050,12 @@
"wrappy": {
"version": "1.0.2",
"bundled": true,
"dev": true,
"optional": true
"dev": true
},
"yallist": {
"version": "3.0.3",
"bundled": true,
"dev": true,
"optional": true
"dev": true
}
}
},