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

Clean a little bit

This commit is contained in:
Jiiks 2018-08-15 10:45:10 +03:00
parent b1847b8c41
commit 89461244bd
25 changed files with 114 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
client/src/styles/partials/bdsettings/button.scss
View File

@ -81,16 +81,3 @@
z-index: 3001; z-index: 3001;
} }
} }
@keyframes bd-settingsButtonPulse {
0% {
filter: grayscale(100%);
}
50% {
filter: grayscale(0%);
opacity: 1;
}
100% {
filter: grayscale(100%);
}
}

23
client/src/styles/partials/bdsettings/e2ee.scss
View File

@ -153,37 +153,30 @@
} }
} }
.bd-encryptedImage::before { .bd-encryptedImage::before,
.bd-decryptedImage::before {
content: ""; content: "";
position: absolute; position: absolute;
background: $colbdgreen; background-color: $colbdgreen;
background-image: $lockIcon;
background-repeat: no-repeat;
}
.bd-encryptedImage::before {
width: 100%; width: 100%;
height: 100%; height: 100%;
border-radius: 3px; border-radius: 3px;
display: flex; display: flex;
// justify-content: center;
// align-items: flex-start;
// font-size: 1.2em;
// font-weight: 700;
// color: #2c2c2c;
// line-height: 30px;
background-image: $lockIcon;
background-size: calc(100% / 2); background-size: calc(100% / 2);
background-repeat: no-repeat;
background-position: center; background-position: center;
} }
.bd-decryptedImage::before { .bd-decryptedImage::before {
content: "";
background-image: $lockIcon;
width: 11px; width: 11px;
height: 11px; height: 11px;
position: absolute;
z-index: 1; z-index: 1;
display: block; display: block;
background-size: cover; background-size: cover;
background-color: $colbdgreen;
background-repeat: no-repeat;
border-radius: 100%; border-radius: 100%;
border: 2px solid $colbdgreen; border: 2px solid $colbdgreen;
top: 5px; top: 5px;

3
client/src/styles/partials/bdsettings/remotecard.scss
View File

@ -1,16 +1,13 @@
.bd-remoteCard { .bd-remoteCard {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
// background: rgba(0,0,0,.1);
margin-top: 10px; margin-top: 10px;
padding: 10px 0; padding: 10px 0;
border-radius: 0; border-radius: 0;
border-bottom: 1px solid rgba(114, 118, 126, 0.3); border-bottom: 1px solid rgba(114, 118, 126, 0.3);
&:hover { &:hover {
// background: rgba(0,0,0,.2);
transform: scale(1.005); transform: scale(1.005);
// box-shadow: 0px 0px 5px rgba(0,0,0,.5);
} }
.bd-remoteCardTitle { .bd-remoteCardTitle {

2
client/src/styles/partials/bdsettings/settings-schemes.scss
View File

@ -56,7 +56,7 @@
cursor: default; cursor: default;
.bd-settingsSchemeIcon { .bd-settingsSchemeIcon {
border-color: $colbdblue; border-color: $colbdgreen;
} }
} }
} }

2
client/src/styles/partials/bdsettings/updater.scss
View File

@ -1,6 +1,6 @@
.bd-updaterview { .bd-updaterview {
p { p {
margin: 0 0 10px; margin: 0 0 10px;
color: #ffffff; color: #FFF;
} }
} }

15
client/src/styles/partials/badges.scss → client/src/styles/partials/generic/badges.scss
View File

@ -49,18 +49,3 @@
} }
} }
} }
// .member-username .bd-profileBadges {
// display: inline-block;
// height: 17px;
// width: 14px;
//
// .bd-badge,
// .bd-badge {
// width: 14px;
// height: 16px;
// background-position: center;
// background-size: 12px 12px;
// background-repeat: no-repeat;
// }
// }

4
client/src/styles/partials/generic/buttons.scss
View File

@ -10,11 +10,11 @@
text-align: center; text-align: center;
user-select: none; user-select: none;
font-weight: 500; font-weight: 500;
background: $colbdblue; background: $colbdgreen;
&:not(.bd-disabled):hover { &:not(.bd-disabled):hover {
background: darken($colbdblue, 5%); background: darken($colbdgreen, 5%);
} }
&.bd-disabled { &.bd-disabled {

10
client/src/styles/partials/generic/forms/colourpickers.scss
View File

@ -40,13 +40,3 @@
} }
} }
} }
@keyframes bd-colourpickerSlidein {
0% {
right: 20px;
}
100% {
right: 0;
}
}

6
client/src/styles/partials/generic/forms/guilds.scss
View File

@ -25,7 +25,7 @@
&:hover { &:hover {
border-radius: 30%; border-radius: 30%;
background-color: $colbdblue; background-color: $colbdgreen;
&.bd-guildHasIcon { &.bd-guildHasIcon {
background-color: rgb(47, 49, 54); background-color: rgb(47, 49, 54);
@ -33,8 +33,8 @@
} }
&.bd-active { &.bd-active {
background-color: $colbdblue; background-color: $colbdgreen;
box-shadow: 0 0 7px 2px $colbdblue; box-shadow: 0 0 7px 2px $colbdgreen;
&.bd-guildHasIcon { &.bd-guildHasIcon {
background-color: rgb(47, 49, 54); background-color: rgb(47, 49, 54);

7
client/src/styles/partials/generic/forms/keybinds.scss
View File

@ -1,7 +1,6 @@
.bd-keybind { .bd-keybind {
padding: 10px; padding: 10px;
display: flex; display: flex;
// width: 180px;
margin-top: 10px; margin-top: 10px;
background-color: rgba(0,0,0,.1); background-color: rgba(0,0,0,.1);
border: 1px solid rgba(0,0,0,.3); border: 1px solid rgba(0,0,0,.3);
@ -44,9 +43,3 @@
} }
} }
} }
@keyframes bd-keybindPulse {
0% { box-shadow: 0 0 6px rgba(240,71,71,.3) }
50% { box-shadow: 0 0 10px rgba(240,71,71,.6) }
100% { box-shadow: 0 0 6px rgba(240,71,71,.3) }
}

10
client/src/styles/partials/generic/forms/radios.scss
View File

@ -40,12 +40,6 @@
border: 1px solid #72767d; border: 1px solid #72767d;
.bd-radioControl { .bd-radioControl {
// background: rgb(50, 50, 50);
// border: 1px solid rgb(114, 118, 125);
// border-radius: 50%;
// width: 12px;
// height: 12px;
// transition: background-color .1s;
margin: 1px; margin: 1px;
opacity: 0; opacity: 0;
} }
@ -67,8 +61,8 @@
} }
&.bd-radioSelected { &.bd-radioSelected {
background-color: $colbdblue; background-color: $colbdgreen;
border-color: $colbdblue; border-color: $colbdgreen;
.bd-radioControlWrap { .bd-radioControlWrap {
border-color: #fff; border-color: #fff;

5
client/src/styles/partials/generic/forms/sliders.scss
View File

@ -33,7 +33,6 @@
position: relative; position: relative;
top: -6px; top: -6px;
width: 24px; width: 24px;
color: #72767d; color: #72767d;
font-size: 10px; font-size: 10px;
font-weight: 700; font-weight: 700;
@ -67,7 +66,7 @@
&::before { &::before {
content: ""; content: "";
background-color: $colbdblue; background-color: $colbdgreen;
height: 8px; height: 8px;
width: 5px; width: 5px;
display: block; display: block;
@ -75,7 +74,7 @@
} }
.bd-sliderBarFilled { .bd-sliderBarFilled {
background-color: $colbdblue; background-color: $colbdgreen;
height: 8px; height: 8px;
width: 100%; width: 100%;
margin-top: -8px; margin-top: -8px;

2
client/src/styles/partials/generic/forms/switches.scss
View File

@ -52,7 +52,7 @@
} }
&.bd-checked { &.bd-checked {
background: $colbdblue; background: $colbdgreen;
&::before { &::before {
transform: translateX(20px); transform: translateX(20px);

2
client/src/styles/partials/generic/forms/text.scss
View File

@ -27,7 +27,7 @@
&:focus { &:focus {
color: #fff; color: #fff;
border-color: $colbdblue; border-color: $colbdgreen;
} }
} }

3
client/src/styles/partials/generic/index.scss
View File

@ -9,3 +9,6 @@
@import './preformatted.scss'; @import './preformatted.scss';
@import './refreshbtn.scss'; @import './refreshbtn.scss';
@import './autocomplete.scss'; @import './autocomplete.scss';
@import './layouts.scss';
@import './toasts.scss';
@import './badges.scss';

0
client/src/styles/partials/layouts.scss → client/src/styles/partials/generic/layouts.scss
View File

4
client/src/styles/partials/generic/tabs.scss
View File

@ -27,7 +27,7 @@
&:hover, &:hover,
&.bd-active { &.bd-active {
background: transparent; background: transparent;
border-bottom-color: $colbdblue; border-bottom-color: $colbdgreen;
color: #fff; color: #fff;
.bd-materialDesignIcon { .bd-materialDesignIcon {
@ -87,12 +87,10 @@
} }
.bd-settingswrapHeader & { .bd-settingswrapHeader & {
// margin-top: -17px;
margin-bottom: -20px; margin-bottom: -20px;
.bd-button { .bd-button {
font-size: 16px; font-size: 16px;
// padding: 18px 0 17px;
} }
.bd-materialButton { .bd-materialButton {

8
client/src/styles/partials/toasts.scss → client/src/styles/partials/generic/toasts.scss
View File

@ -26,19 +26,19 @@
margin-top: 10px; margin-top: 10px;
&.bd-toastError { &.bd-toastError {
background: #f04747; background: $colerr;
} }
&.bd-toastInfo { &.bd-toastInfo {
background: #4a90e2; background: $colbdblue;
} }
&.bd-toastWarning { &.bd-toastWarning {
background: #FFA600; background: $colwarn;
} }
&.bd-toastSuccess { &.bd-toastSuccess {
background: #43b581; background: $colbdgreen;
} }
&.bd-toastHasIcon { &.bd-toastHasIcon {

4
client/src/styles/partials/index.scss
View File

@ -1,16 +1,12 @@
@import './variables/index.scss'; @import './variables/index.scss';
@import './mixins/index.scss'; @import './mixins/index.scss';
@import './animations.scss';
@import './layouts.scss';
@import './sidebarview/index.scss'; @import './sidebarview/index.scss';
@import './bdsettings/index.scss'; @import './bdsettings/index.scss';
@import './generic/index.scss'; @import './generic/index.scss';
@import './modals/index.scss'; @import './modals/index.scss';
@import './badges.scss';
@import './discordoverrides.scss'; @import './discordoverrides.scss';
@import './helpers.scss'; @import './helpers.scss';
@import './misc.scss'; @import './misc.scss';
@import './emotes.scss'; @import './emotes.scss';
@import './toasts.scss';

4
client/src/styles/partials/modals/modals.scss
View File

@ -69,11 +69,11 @@
.bd-modalTitlelink { .bd-modalTitlelink {
cursor: pointer; cursor: pointer;
color: $colbdblue; color: $colbdgreen;
&:hover { &:hover {
text-decoration: underline; text-decoration: underline;
color: lighten($colbdblue, 5%); color: lighten($colbdgreen, 5%);
} }
} }

2
client/src/styles/partials/sidebarview/settingswrap.scss
View File

@ -38,7 +38,7 @@
flex: 0 0 auto; flex: 0 0 auto;
.bd-settingswrapHeaderText { .bd-settingswrapHeaderText {
color: $colbdblue; color: $colbdgreen;
text-transform: uppercase; text-transform: uppercase;
font-weight: 600; font-weight: 600;
font-size: 16px; font-size: 16px;

2
client/src/styles/partials/sidebarview/sidebar.scss
View File

@ -40,7 +40,7 @@
&:hover, &:hover,
&.active { &.active {
background: $colbdblue; background: $colbdgreen;
color: #fff; color: #fff;
} }

88
client/src/styles/partials/animations.scss → client/src/styles/partials/variables/animations.scss
View File

@ -94,22 +94,53 @@
} }
@keyframes bd-modalIn { @keyframes bd-modalIn {
0% { transform: scale(0.8); opacity: 0; } 0% {
90% { transform: scale(1.01); opacity: 1; } transform: scale(0.8);
100% { transform: scale(1); opacity: 1; } opacity: 0;
}
90% {
transform: scale(1.01);
opacity: 1;
}
100% {
transform: scale(1);
opacity: 1;
}
} }
@keyframes bd-modalOut { @keyframes bd-modalOut {
0% { transform: scale(1); opacity: 1; } 0% {
10% { transform: scale(1.01); opacity: 1; } transform: scale(1);
90% { opacity: 0; } opacity: 1;
100% { transform: scale(0.8); opacity: 0; } }
10% {
transform: scale(1.01);
opacity: 1;
}
90% {
opacity: 0;
}
100% {
transform: scale(0.8);
opacity: 0;
}
} }
@keyframes bd-backdropIn { @keyframes bd-backdropIn {
0% { opacity: 0; } 0% {
opacity: 0;
}
} }
@keyframes bd-backdropOut { @keyframes bd-backdropOut {
100% { opacity: 0; } 100% {
opacity: 0;
}
} }
@keyframes bd-warnShake { @keyframes bd-warnShake {
@ -143,3 +174,42 @@
opacity: 1; opacity: 1;
} }
} }
@keyframes bd-settingsButtonPulse {
0% {
filter: grayscale(100%);
}
50% {
filter: grayscale(0%);
opacity: 1;
}
100% {
filter: grayscale(100%);
}
}
@keyframes bd-colourpickerSlidein {
0% {
right: 20px;
}
100% {
right: 0;
}
}
@keyframes bd-keybindPulse {
0% {
box-shadow: 0 0 6px rgba(240,71,71,.3)
}
50% {
box-shadow: 0 0 10px rgba(240,71,71,.6)
}
100% {
box-shadow: 0 0 6px rgba(240,71,71,.3)
}
}

3
client/src/styles/partials/variables/colours.scss
View File

@ -1,6 +1,5 @@
$colbdgreen: #3ecc9c; $colbdgreen: #3ecc9c;
// $colbdblue: #3e82e5; $colbdblue: #3e82e5;
$colbdblue: $colbdgreen;
$colerr: #d84040; $colerr: #d84040;
$colwarn: #faa61a; $colwarn: #faa61a;
$colok: $colbdgreen; $colok: $colbdgreen;

1
client/src/styles/partials/variables/index.scss
View File

@ -1,2 +1,3 @@
@import './colours.scss'; @import './colours.scss';
@import './images.scss'; @import './images.scss';
@import './animations.scss';