diff --git a/src/scss/_colors.scss b/src/scss/_colors.scss deleted file mode 100644 index fcb10e87c..000000000 --- a/src/scss/_colors.scss +++ /dev/null @@ -1,81 +0,0 @@ -// -// Misc: Colors -// - -// Background colors (theme colors) -@each $name, $color in $theme-colors { - @include background-variant($name, $color); -} - -// Background colors (colors) -@each $name, $color in $colors { - @include background-variant($name, $color); -} - -.bg-gray { - color: color-contrast($gray-500); - background-color: $gray-500; -} - -.bg-gray-light { - color: color-contrast(tint-color($gray-200, 3%)) !important; - background-color: tint-color($gray-200, 3%); -} - -.bg-black { - color: color-contrast($black) !important; - background-color: $black; -} - -.bg-white { - color: color-contrast($white) !important; - background-color: $white; -} - -// Backgrund Color Disabled -[class^="bg-"].disabled { - opacity: .65; -} - -// Text muted hover -a.text-muted:hover { - color: $primary !important; -} - -// Link Styles -.link-muted { - color: shade-color($gray-500, 30%); - - &:hover, - &:focus { - color: shade-color($gray-500, 40%); - } -} - -.link-black { - color: $gray-600; - - &:hover, - &:focus { - color: tint-color($gray-500, 20%); - } -} - -// // Accent colors (theme colors) -// @each $name, $color in $theme-colors { -// @include accent-variant($name, $color); -// } - -// // Accent colors (colors) -// @each $name, $color in $colors { -// @include accent-variant($name, $color); -// } - -// Accent button override fix -[class*="accent-"] { - @each $name, $color in $theme-colors { - a.btn-#{$name} { - color: color-contrast($color); - } - } -} diff --git a/src/scss/_custom-utilities.scss b/src/scss/_custom-utilities.scss deleted file mode 100644 index aa02036fb..000000000 --- a/src/scss/_custom-utilities.scss +++ /dev/null @@ -1,25 +0,0 @@ -// Custom Utilities - -$utilities: () !default; -// stylelint-disable-next-line scss/dollar-variable-default -$utilities: map-merge( - ( - // util-opacity - "opacity": ( - property: opacity, - values: ( - 0: 0, - 20: .2, - 30: .3, - 40: .4, - 50: .5, - 60: .6, - 70: .7, - 80: .8, - 90: .9, - 100: 1, - ) - ) - ), - $utilities -); diff --git a/src/scss/_direct-chat.scss b/src/scss/_direct-chat.scss index 647008143..b9b934011 100644 --- a/src/scss/_direct-chat.scss +++ b/src/scss/_direct-chat.scss @@ -11,7 +11,7 @@ &.chat-pane-open { .direct-chat-contacts { - @include translate(0, 0); + transform: translate(0, 0); } } @@ -30,10 +30,10 @@ } .direct-chat-messages { - @include translate(0, 0); height: 250px; padding: 10px; overflow: auto; + transform: translate(0, 0); } .direct-chat-msg, @@ -129,12 +129,11 @@ //Direct chat contacts pane .direct-chat-contacts-open { .direct-chat-contacts { - @include translate(0, 0); + transform: translate(0, 0); } } .direct-chat-contacts { - @include translate(101%, 0); position: absolute; top: 0; bottom: 0; @@ -143,6 +142,7 @@ overflow: auto; color: var(--#{$prefix}body-bg); background-color: var(--#{$prefix}body-color); + transform: translate(101%, 0); } .direct-chat-contacts-light { diff --git a/src/scss/_dropdown.scss b/src/scss/_dropdown.scss index a8abeaf44..896f8acef 100644 --- a/src/scss/_dropdown.scss +++ b/src/scss/_dropdown.scss @@ -117,7 +117,7 @@ // Add fade animation to dropdown menus by appending // the class .animated-dropdown-menu to the .dropdown-menu ul (or ol) .open:not(.dropup) > .animated-dropdown-menu { - @include animation(flipInX .7s both); + animation: flipInX .7s both; backface-visibility: visible !important; } diff --git a/src/scss/_mixins.scss b/src/scss/_mixins.scss index 679c969e4..6b767b40c 100644 --- a/src/scss/_mixins.scss +++ b/src/scss/_mixins.scss @@ -9,6 +9,4 @@ @import "mixins/nav-treeview-dark"; @import "mixins/nav-treeview-light"; @import "mixins/cards"; -@import "mixins/backgrounds"; @import "mixins/direct-chat"; -@import "mixins/miscellaneous"; diff --git a/src/scss/_text.scss b/src/scss/_text.scss deleted file mode 100644 index 0cf2d1770..000000000 --- a/src/scss/_text.scss +++ /dev/null @@ -1,10 +0,0 @@ -// -// Component: Text -// - -// text color variations -@each $name, $color in $colors { - .text-#{$name} { - color: #{$color} !important; - } -} diff --git a/src/scss/_variables-dark.scss b/src/scss/_variables-dark.scss index 274c0d59e..81bfe9a77 100644 --- a/src/scss/_variables-dark.scss +++ b/src/scss/_variables-dark.scss @@ -1,5 +1,5 @@ // Body background (Affects main content background only) -$lte-main-bg-dark: $body-bg-dark !default; +$lte-main-bg-dark: $body-tertiary-bg-dark !default; $lte-main-color-dark: $body-color-dark !default; // Dark sidebar diff --git a/src/scss/_variables.scss b/src/scss/_variables.scss index 1f76a46e5..90ff107e8 100644 --- a/src/scss/_variables.scss +++ b/src/scss/_variables.scss @@ -150,7 +150,7 @@ $lte-progress-bar-border-radius: 1px !default; // DIRECT CHAT // -------------------------------------------------------- $lte-direct-chat-default-msg-bg: var(--#{$prefix}secondary-bg) !default; -$lte-direct-chat-default-font-color: var(--#{$prefix}body-color) !default; +$lte-direct-chat-default-font-color: var(--#{$prefix}emphasis-color) !default; $lte-direct-chat-default-msg-border-color: var(--#{$prefix}border-color) !default; // Z-INDEX diff --git a/src/scss/_wrapper.scss b/src/scss/_wrapper.scss index 85b5c613b..347cd68d5 100644 --- a/src/scss/_wrapper.scss +++ b/src/scss/_wrapper.scss @@ -9,7 +9,7 @@ "main-sidebar main-header" "main-sidebar content-wrapper" "main-sidebar main-footer"; - grid-template-rows: min-content 100% min-content; + grid-template-rows: min-content 1fr min-content; grid-template-columns: auto minmax(100%, max-content); grid-gap: 0; align-content: stretch; diff --git a/src/scss/adminlte.scss b/src/scss/adminlte.scss index 29ce38d3d..949c6dd42 100644 --- a/src/scss/adminlte.scss +++ b/src/scss/adminlte.scss @@ -12,7 +12,6 @@ // AdminLTE Configuration // --------------------------------------------------- @import "bootstrap-variables"; // little modified are here -@import "custom-utilities"; // Bootstrap Configuration // --------------------------------------------------- diff --git a/src/scss/mixins/_backgrounds.scss b/src/scss/mixins/_backgrounds.scss deleted file mode 100644 index 61061db36..000000000 --- a/src/scss/mixins/_backgrounds.scss +++ /dev/null @@ -1,31 +0,0 @@ -// -// Mixins: Backgrounds -// - -// Background Variant -@mixin background-variant($name, $color) { - .bg-#{$name} { - background-color: #{$color} !important; - - &, - > a { - color: color-contrast($color) !important; - } - - &.btn { - &:hover { - color: shade-color(color-contrast($color), 7.5%); - border-color: shade-color($color, 10%); - } - - &:not(:disabled):not(.disabled):active, - &:not(:disabled):not(.disabled).active, - &:active, - &.active { - color: color-contrast(shade-color($color, 10%)); - background-color: shade-color($color, 10%) !important; - border-color: shade-color($color, 12.5%); - } - } - } -} diff --git a/src/scss/mixins/_miscellaneous.scss b/src/scss/mixins/_miscellaneous.scss deleted file mode 100644 index 7c30ae502..000000000 --- a/src/scss/mixins/_miscellaneous.scss +++ /dev/null @@ -1,31 +0,0 @@ -// -// Mixins: Miscellaneous -// - -// ETC -@mixin translate($x, $y) { - transform: translate($x, $y); -} - -// Different radius each side -// @mixin border-radius-sides($top-left, $top-right, $bottom-left, $bottom-right) { -// border-radius: $top-left $top-right $bottom-left $bottom-right; -// } - -// @mixin calc($property, $expression) { -// #{$property}: calc(#{$expression}); -// } - -@mixin rotate($value) { - transform: rotate($value); -} - -@mixin animation($animation) { - animation: $animation; -} - -// Gradient background -// @mixin gradient($color: #f5f5f5, $start: #eee, $stop: $white) { -// background-color: $color; -// background-image: gradient(linear, left bottom, left top, color-stop(0, $start), color-stop(1, $stop)); -// } diff --git a/src/scss/parts/_miscellaneous.scss b/src/scss/parts/_miscellaneous.scss index 6f0863c3b..cfdd705a0 100644 --- a/src/scss/parts/_miscellaneous.scss +++ b/src/scss/parts/_miscellaneous.scss @@ -3,5 +3,3 @@ // @import "../miscellaneous"; -@import "../text"; -@import "../colors";