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

Fixed a bunch of transitions and changed the arrow animation.

This commit is contained in:
Lilian Tedone 2019-01-08 08:41:24 +01:00
parent 5a3aa553cd
commit b57ab92269
5 changed files with 320 additions and 274 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,87 +1,122 @@
.bd-settingsButton { .bd-settingsButton {
position: absolute; position: absolute;
z-index: 1; z-index: 1;
top: 22px; top: 22px;
width: 70px; width: 70px;
height: 48px;
left: 0;
box-shadow: 0 1px 0 rgba(0, 0, 0, .2), 0 2px 0 rgba(0, 0, 0, .06);
opacity: 1;
.platform-darwin & { // sass-lint:disable-line class-name-format
top: 27px;
}
.platform-linux & { // sass-lint:disable-line class-name-format
top: 0;
}
.bd-settingsButtonBtn {
backface-visibility: hidden;
-webkit-backface-visibility: hidden;
width: 70px;
height: 48px; height: 48px;
left: 0; cursor: pointer;
box-shadow: 0 1px 0 rgba(0, 0, 0, .2), 0 2px 0 rgba(0, 0, 0, .06); filter: grayscale(100%);
opacity: 1; opacity: .5;
position: relative;
transition: all .3s cubic-bezier(.4,0,0,1);
.platform-darwin & { // sass-lint:disable-line class-name-format &::before,
top: 27px; &::after {
} content:"";
display: block;
position: absolute;
top:0;
left:0;
background-repeat: no-repeat;
background-position: center;
}
.platform-linux & { // sass-lint:disable-line class-name-format &::before {
top: 0; width: 70px;
} height: 48px;
background-image: $logoSmallBw;
background-size: 50% 50%;
opacity: 1;
transition:all .3s cubic-bezier(.4,0,0,1), opacity .01s;
}
&::after {
width: 130px;
height: 43px;
background-image: $logoBigBw;
background-size: 100% 100%;
transform:translate(-7px,2px)scale(0.5);
opacity: 0;
transition:all .3s cubic-bezier(.4,0,0,1);
}
.bd-settingsButtonBtn { &:not(.bd-loading) {
background-image: $logoSmallBw; &:hover {
background-size: 50% 50%; filter: none;
background-repeat: no-repeat; opacity: 1;
background-position: center; }
width: 100%; }
height: 100%;
cursor: pointer;
filter: grayscale(100%);
opacity: .5;
transition: all .4s ease-in-out;
&:not(.bd-loading) { &.bd-loading {
&:hover { animation: bd-settingsButtonPulse 1.5s infinite;
filter: none; }
opacity: 1;
}
}
&.bd-loading { &.bd-updates {
animation: bd-settingsButtonPulse 1.5s infinite; filter: hue-rotate(250deg) !important; // sass-lint:disable-line no-important
} opacity: 1 !important; // sass-lint:disable-line no-important
}
}
&.bd-updates { &.bd-hideButton {
filter: hue-rotate(250deg) !important; // sass-lint:disable-line no-important animation: bd-fadeOut .4s ease-out;
opacity: 1 !important; // sass-lint:disable-line no-important
}
}
&.bd-hideButton { &.bd-active {
animation: bd-fadeOut .4s ease-out; animation: bd-fadeIn .4s ease-in;
}
&.bd-active { &:not(.bd-active) {
animation: bd-fadeIn .4s ease-in; &:not(.bd-animating) {
} display: none;
}
}
}
&:not(.bd-active) { &.bd-active {
&:not(.bd-animating) { opacity: 1;
display: none; }
}
}
}
&.bd-active { &.bd-active,
opacity: 1; &.bd-hideButton {
} background: transparent;
box-shadow: none;
&.bd-active, .bd-settingsButtonBtn {
&.bd-hideButton { filter: none;
background: transparent; opacity: 1;
box-shadow: none; width: 130px;
height: 43px;
transform:translate(25px,18px);
cursor: default;
&::before{
opacity:0;
transform:translate(-16px,-3px)scale(1.9);
transition:all .3s cubic-bezier(.4,0,0,1), opacity .1s .3s;
}
&::after{
opacity: 1;
transform:scale(1);
}
}
}
.bd-settingsButtonBtn { &.bd-active,
background-image: $logoBigBw; &.bd-animating {
background-size: 100% 100%; z-index: 3001;
filter: none; }
opacity: 1;
width: 130px;
height: 43px;
margin: 18px 0 17px 25px;
cursor: default;
}
}
&.bd-active,
&.bd-animating {
z-index: 3001;
}
} }

298
client/src/styles/partials/bdsettings/sidebarview.scss
View File

@ -1,178 +1,180 @@
.bd-settings { .bd-settings {
position: absolute; position: absolute;
top: 22px; backface-visibility: hidden;
left: 0; -webkit-backface-visibility: hidden;
bottom: 0; top: 22px;
z-index: 1001; left: 0;
width: 310px; bottom: 0;
transform: translateX(-100%) translateY(-100%); z-index: 1001;
opacity: 0; width: 310px;
transition: all .4s ease-in-out; transform: translateX(-310px);
pointer-events: none; opacity: 0;
transition: transform .3s cubic-bezier(.4,0,0,1), opacity .25s ease;
pointer-events: none;
&.bd-active { &.bd-active {
width: 900px; width: 900px;
transform: none; transform: none;
opacity: 1; opacity: 1;
} }
.bd-settingsX { .bd-settingsX {
position: absolute; position: absolute;
top: 18px; top: 18px;
left: 255px; left: 255px;
border: 2px solid #6e6e6e; border: 2px solid #6e6e6e;
border-radius: 50%; border-radius: 50%;
width: 25px; width: 25px;
height: 25px; height: 25px;
justify-content: center; justify-content: center;
display: flex; display: flex;
align-items: center; align-items: center;
cursor: pointer; cursor: pointer;
.platform-darwin & { // sass-lint:disable-line class-name-format .platform-darwin & { // sass-lint:disable-line class-name-format
top: 43px; top: 43px;
} }
.bd-xText { .bd-xText {
color: #72767d; color: #72767d;
position: absolute; position: absolute;
top: 32px; top: 32px;
font-weight: 600; font-weight: 600;
font-size: 13px; font-size: 13px;
} }
.bd-materialDesignIcon { .bd-materialDesignIcon {
justify-content: center; justify-content: center;
display: flex; display: flex;
fill: #72767d; fill: #72767d;
} }
&:hover { &:hover {
background-color: hsla(218, 5%, 47%, .3); background-color: hsla(218, 5%, 47%, .3);
.bd-materialDesignIcon { .bd-materialDesignIcon {
fill: #fff; fill: #fff;
} }
} }
} }
.bd-info { .bd-info {
display: flex; display: flex;
align-items: flex-end; align-items: flex-end;
overflow: hidden; overflow: hidden;
padding: 0 25px; padding: 0 25px;
margin: 10px 0; margin: 10px 0;
.bd-vtext { .bd-vtext {
color: #414245; color: #414245;
font-weight: 700; font-weight: 700;
font-size: 12px; font-size: 12px;
flex-grow: 1; flex-grow: 1;
height: 20px; height: 20px;
cursor: default; cursor: default;
user-select: none; user-select: none;
} }
.bd-materialButton { .bd-materialButton {
cursor: pointer; cursor: pointer;
&:hover { &:hover {
.bd-materialDesignIcon { .bd-materialDesignIcon {
fill: #fff; fill: #fff;
} }
} }
} }
.bd-materialDesignIcon { .bd-materialDesignIcon {
fill: #414245; fill: #414245;
&:hover { &:hover {
fill: #fff; fill: #fff;
} }
} }
} }
.bd-sidebarView { .bd-sidebarView {
&::after { &::after {
content: ''; content: '';
height: 100%; height: 100%;
width: 310px; width: 310px;
background-color: #202225; background-color: #202225;
top: 100%; top: 100%;
display: block; display: block;
position: absolute; position: absolute;
} }
.bd-sidebarRegion { .bd-sidebarRegion {
.bd-scroller { .bd-scroller {
padding-top: 0; padding-top: 0;
} }
} }
.bd-contentRegion { .bd-contentRegion {
width: 590px; width: 590px;
} }
&.bd-active { &.bd-active {
.bd-contentRegion { .bd-contentRegion {
transition: transform .4s ease-in-out, opacity .2s ease; transition: all .3s cubic-bezier(.4,0,0,1);
transform: none; transform: none;
opacity: 1; opacity: 1;
} }
} }
&.bd-stop { &.bd-stop {
.bd-sidebarRegion { .bd-sidebarRegion {
z-index: 1003; z-index: 1003;
} }
.bd-contentRegion { .bd-contentRegion {
z-index: 1002; z-index: 1002;
} }
} }
} }
.platform-darwin & { // sass-lint:disable-line class-name-format .platform-darwin & { // sass-lint:disable-line class-name-format
top: 0; top: 0;
.bd-sidebarView { .bd-sidebarView {
.bd-sidebarRegion { .bd-sidebarRegion {
padding-top: 22px; padding-top: 22px;
} }
} }
} }
.platform-linux & { // sass-lint:disable-line class-name-format .platform-linux & { // sass-lint:disable-line class-name-format
top: 0; top: 0;
} }
&:not(.bd-active) > .bd-sidebarView.bd-active, // sass-lint:disable-line force-element-nesting &:not(.bd-active) > .bd-sidebarView.bd-active, // sass-lint:disable-line force-element-nesting
&.bd-settingsOut .bd-sidebarView.bd-active { // sass-lint:disable-line force-element-nesting &.bd-settingsOut .bd-sidebarView.bd-active { // sass-lint:disable-line force-element-nesting
.bd-contentRegion { .bd-contentRegion {
transform: translate(-600px, 0%); transform: translate(-600px, 0%);
opacity: 0; opacity: 0;
width: 590px; width: 590px;
} }
} }
&:not(.bd-active) { &:not(.bd-active) {
.bd-sidebarView { .bd-sidebarView {
&.bd-active { &.bd-active {
.bd-contentRegion { .bd-contentRegion {
transform: translate(-600px, 100%); transform: translate(-600px, 100%);
} }
} }
} }
} }
} }
.bd-sidebar { .bd-sidebar {
.bd-settingsButton { .bd-settingsButton {
position: absolute; position: absolute;
top: 0; top: 0;
.platform-darwin & { // sass-lint:disable-line class-name-format .platform-darwin & { // sass-lint:disable-line class-name-format
top: 22px; top: 22px;
} }
} }
} }

25
client/src/styles/partials/generic/drawers.scss
View File

@ -26,14 +26,23 @@
position: relative; position: relative;
margin-right: 15px; margin-right: 15px;
.bd-chevron1, .bd-chevron1 {
.bd-chevron2 {
position: absolute; position: absolute;
svg{
transform: scale(1) translateY(0);
}
}
.bd-chevron2{
position: absolute;
svg{
visibility: hidden;
transform: scale(1.4,.5) translateY(6px) rotate(180deg);
}
} }
svg { svg {
transition: transform .5s ease; transition: transform .2s cubic-bezier(.2,0,0,1);
transform: none;
} }
} }
@ -70,16 +79,16 @@
.bd-drawerOpenButton { .bd-drawerOpenButton {
.bd-chevron1 { .bd-chevron1 {
svg { svg {
transform: rotate(90deg); transform: scale(1.4,.5) translateY(-6px);
visibility: hidden;
} }
} }
} }
.bd-chevron2 { .bd-chevron2 {
margin-left: -4px;
svg { svg {
transform: rotate(270deg); visibility: visible;
transform: scale(1) translateY(0) rotate(180deg);
} }
} }
} }

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

@ -47,7 +47,7 @@
bottom: 3px; bottom: 3px;
background: #f6f6f7; background: #f6f6f7;
border-radius: 10px; border-radius: 10px;
transition: all .15s ease; transition: all .15s cubic-bezier(.2,0,0,1);
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); 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);
} }

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

@ -1,50 +1,50 @@
.bd-sidebar { .bd-sidebar {
width: 100%; width: 100%;
padding-right: 20px; padding-right: 20px;
padding: 0; padding: 0;
.bd-header { .bd-header {
padding: 6px 0; padding: 6px 0;
margin-left: 10px; margin-left: 10px;
margin-top: 15px; margin-top: 15px;
color: rgba(255, 255, 255, .15); color: rgba(255, 255, 255, .15);
font-size: 14px; font-size: 14px;
line-height: 16px; line-height: 16px;
text-transform: uppercase; text-transform: uppercase;
font-weight: 600; font-weight: 600;
flex-shrink: 0; flex-shrink: 0;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;
font-family: Whitney, Helvetica Neue, Helvetica, Arial, sans-serif; font-family: Whitney, Helvetica Neue, Helvetica, Arial, sans-serif;
} }
.bd-item { .bd-item {
border-radius: 3px; border-radius: 3px;
margin-bottom: 2px; margin-bottom: 2px;
padding-bottom: 6px; padding-bottom: 6px;
padding-top: 6px; padding-top: 6px;
padding: 6px 10px; padding: 6px 10px;
color: $coldimwhite; color: $coldimwhite;
cursor: pointer; cursor: pointer;
font-size: 17px; font-size: 17px;
line-height: 20px; line-height: 20px;
position: relative; position: relative;
flex-shrink: 0; flex-shrink: 0;
font-weight: 500; font-weight: 500;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;
font-family: Whitney, Helvetica Neue, Helvetica, Arial, sans-serif; font-family: Whitney, Helvetica Neue, Helvetica, Arial, sans-serif;
&:hover, &:hover {
&.bd-active { background-color: rgba(185,185,185,.1);
background: $colbdgreen; color: #f6f6f6;
color: #fff; }
} &.bd-active {
background: $colbdgreen;
&.bd-active { color: #fff;
cursor: default; cursor: default;
} }
} }
} }