LeadMagnet/leadchat
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Revert "Updates sidebar on dashboard"

Browse Source 
This reverts commit 6186d14593.
This commit is contained in:
Sojan
2020-02-11 19:34:42 +05:30
parent 6186d14593
commit 2023d5d42b
20 changed files with 112 additions and 394 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
app/javascript/dashboard/assets/scss/_mixins.scss
View File

@@ -1,5 +1,3 @@
@import '~widget/assets/scss/mixins';
//borders
@mixin border-nil() {
border-color: transparent;
@@ -141,7 +139,7 @@
}
@mixin elegent-shadow() {
box-shadow: 0 10px 25px 0 rgba(49, 49, 93, 0.15);
box-shadow: 0 10px 25px 0 rgba(49,49,93,0.15);
}
@mixin elegant-card() {
@@ -183,55 +181,41 @@
// .element{
// @include arrow(top, #000, 50px);
// }
@mixin arrow($direction, $color, $size) {
display: block;
height: 0;
width: 0;
content: '';
@mixin arrow($direction, $color, $size){
display: block;
height: 0;
width: 0;
content: '';
@if $direction=='top' {
border-left: $size solid transparent;
border-right: $size solid transparent;
border-bottom: $size solid $color;
}
@else if $direction=='right' {
border-top: $size solid transparent;
border-bottom: $size solid transparent;
border-left: $size solid $color;
}
@else if $direction=='bottom' {
border-top: $size solid $color;
border-right: $size solid transparent;
border-left: $size solid transparent;
}
@else if $direction=='left' {
border-top: $size solid transparent;
border-right: $size solid $color;
border-bottom: $size solid transparent;
}
@else if $direction=='top-left' {
border-top: $size solid $color;
border-right: $size solid transparent;
}
@else if $direction=='top-right' {
border-top: $size solid $color;
border-left: $size solid transparent;
}
@else if $direction=='bottom-left' {
border-bottom: $size solid $color;
border-right: $size solid transparent;
}
@else if $direction=='bottom-right' {
border-bottom: $size solid $color;
border-left: $size solid transparent;
}
@if $direction == 'top' {
border-left: $size solid transparent;
border-right: $size solid transparent;
border-bottom: $size solid $color;
} @else if $direction == 'right' {
border-top: $size solid transparent;
border-bottom: $size solid transparent;
border-left: $size solid $color;
} @else if $direction == 'bottom' {
border-top: $size solid $color;
border-right: $size solid transparent;
border-left: $size solid transparent;
} @else if $direction == 'left' {
border-top: $size solid transparent;
border-right: $size solid $color;
border-bottom: $size solid transparent;
} @else if $direction == 'top-left' {
border-top: $size solid $color;
border-right: $size solid transparent;
} @else if $direction == 'top-right' {
border-top: $size solid $color;
border-left: $size solid transparent;
} @else if $direction == 'bottom-left' {
border-bottom: $size solid $color;
border-right: $size solid transparent;
} @else if $direction == 'bottom-right' {
border-bottom: $size solid $color;
border-left: $size solid transparent;
}
}
@mixin text-ellipsis {

13
app/javascript/dashboard/assets/scss/_variables.scss
View File

@@ -53,16 +53,6 @@ $color-body: #3C4858;
$color-heading: #1F2D3D;
$color-extra-light-blue: #F5F7F9;
$primary-color: $color-woot;
$secondary-color: #FF5216;
$success-color: #13ce66;
$warning-color: #ffc82c;
$alert-color: #ff4949;
// Color-palettes
$color-primary-dark: darken($color-woot, 20%);
// Thumbnail
$thumbnail-radius: 4rem;
@@ -91,6 +81,3 @@ $swift-ease-out: all $swift-ease-out-duration $swift-ease-out-timing-function !d
// Ionicons
$ionicons-font-path: '~ionicons/fonts';
// Transitions
$transition-ease-in: all 0.250s ease-in;

76
app/javascript/dashboard/assets/scss/plugins/_multiselect.scss
View File

@@ -2,13 +2,7 @@
margin-bottom: $space-normal;
min-height: 38px;
&.multiselect--active {
>.multiselect__tags {
border-color: $color-woot;
}
}
>.multiselect__tags {
> .multiselect__tags {
@include margin(0);
border: 1px solid $color-border;
min-height: 44px;
@@ -19,34 +13,12 @@
}
.multiselect__tag {
$vertical-space: $space-smaller+$space-micro;
margin-top: $space-one;
background: $color-background;
color: $color-heading;
padding: $vertical-space $space-medium $vertical-space $space-one;
}
.multiselect__tag-icon {
line-height: $space-medium + $space-micro;
&:after {
color: $color-primary-dark;
}
&:hover {
background: $color-background;
&:after {
color: $color-woot;
}
}
}
.multiselect__input {
@include ghost-input;
@include padding($zero);
font-size: $font-size-small;
margin-bottom: $zero;
}
@@ -69,50 +41,4 @@
top: 60%;
}
}
.multiselect__content .multiselect__option {
font-size: $font-size-small;
font-weight: $font-weight-normal;
&.multiselect__option--highlight {
font-weight: $font-weight-medium;
}
}
}
.sidebar-labels-wrap {
&.has-edited,
&:hover {
.multiselect {
cursor: pointer;
margin-top: $space-small;
>.multiselect__tags {
border-color: $color-border;
}
>.multiselect__select {
visibility: visible;
}
}
}
.multiselect {
>.multiselect__select {
visibility: hidden;
}
>.multiselect__tags {
border-color: transparent;
}
&.multiselect--active {
>.multiselect__tags {
border-color: $color-woot;
}
}
}
}

11
app/javascript/dashboard/assets/scss/widgets/_buttons.scss
View File

@@ -24,18 +24,9 @@
}
}
>.icon {
> .icon {
font-size: $font-size-default;
}
&.tiny {
font-size: $font-size-mini;
padding: $space-small $space-slab;
}
&.round {
border-radius: $space-larger;
}
}
.button--fixed-right-top {

4
app/javascript/dashboard/assets/scss/widgets/_conv-header.scss
View File

@@ -5,7 +5,6 @@
@include flex;
@include flex-align($x: justify, $y: middle);
@include border-normal-bottom;
// Resolve Button
.button {
@include margin(0);
@@ -45,7 +44,6 @@
.user--name {
@include margin(0);
font-size: $font-size-medium;
text-transform: capitalize;
}
.user--profile__meta {
@@ -66,7 +64,7 @@
}
.button.resolve--button {
>.icon {
> .icon {
padding-right: $space-small;
font-size: $font-size-default;
}

7
app/javascript/dashboard/assets/scss/widgets/_conversation-view.scss
View File

@@ -47,19 +47,16 @@
@include background-gray;
@include margin(0);
@include border-normal-left;
.current-chat {
@include flex;
@include full-height;
flex-direction: column;
@include flex-align(center, middle);
div {
@include flex;
@include full-height;
flex-direction: column;
@include flex-align(center, middle);
img {
@include margin($space-normal);
width: 10rem;
@@ -90,7 +87,7 @@
height: 100%;
overflow-y: scroll;
>li {
> li {
@include flex;
@include flex-shrink;
@include margin($zero $zero $space-smaller);
@@ -150,7 +147,7 @@
@include flex-align(right, null);
.wrap {
margin-right: $space-normal;
margin-right: $space-small;
text-align: right;
}

1
app/javascript/dashboard/assets/scss/widgets/_tabs.scss
View File

@@ -13,7 +13,6 @@
.tabs-title {
a {
font-size: $font-size-default;
font-weight: $font-weight-medium;
padding-bottom: $space-slab;
padding-top: $space-slab;
}