diff --git a/build/js/CardRefresh.js b/build/js/CardRefresh.js index 7d3048a89..cacc7b161 100644 --- a/build/js/CardRefresh.js +++ b/build/js/CardRefresh.js @@ -107,7 +107,7 @@ const CardRefresh = (($) => { this.load() }) - if (this._settings.loadOnInit) { + if (this._settings.loadOnInit) { this.load() } } diff --git a/build/js/Layout.js b/build/js/Layout.js index 310215242..47ccc962c 100644 --- a/build/js/Layout.js +++ b/build/js/Layout.js @@ -77,7 +77,7 @@ const Layout = (($) => { fixLayoutHeight(extra = null) { let control_sidebar = 0 - if ($('body').hasClass(ClassName.CONTROL_SIDEBAR_SLIDE_OPEN) || $('body').hasClass(ClassName.CONTROL_SIDEBAR_OPEN) || extra == 'control_sidebar') { + if ($('body').hasClass(ClassName.CONTROL_SIDEBAR_SLIDE_OPEN) || $('body').hasClass(ClassName.CONTROL_SIDEBAR_OPEN) || extra == 'control_sidebar') { control_sidebar = $(Selector.CONTROL_SIDEBAR_CONTENT).height() } @@ -92,7 +92,7 @@ const Layout = (($) => { const max = this._max(heights) let offset = this._config.panelAutoHeight - if (offset === true) { + if (offset === true) { offset = 0; } @@ -198,7 +198,7 @@ const Layout = (($) => { $(this).data(DATA_KEY, data) } - if (config === 'init' || config === '') { + if (config === 'init' || config === '') { data['_init']() } else if (config === 'fixLayoutHeight' || config === 'fixLoginRegisterHeight') { data[config]() diff --git a/build/scss/_cards.scss b/build/scss/_cards.scss index b26df7770..96cd01628 100644 --- a/build/scss/_cards.scss +++ b/build/scss/_cards.scss @@ -127,7 +127,7 @@ } } - &.expanding-card { + &.expanding-card { .card-header { .nav-tabs { .nav-item { @@ -180,7 +180,7 @@ } } - &.expanding-card { + &.expanding-card { .card-header { .nav-tabs { .nav-item { diff --git a/build/scss/_layout.scss b/build/scss/_layout.scss index 61ab1fc68..fb2d3c084 100644 --- a/build/scss/_layout.scss +++ b/build/scss/_layout.scss @@ -33,10 +33,10 @@ body, } } - .layout-fixed & .sidebar { + .layout-fixed & .sidebar { height: calc(100vh - (#{$main-header-height-inner} + #{$main-header-bottom-border-width})); } - .layout-fixed.text-sm & .sidebar { + .layout-fixed.text-sm & .sidebar { height: calc(100vh - (#{$main-header-height-sm-inner} + #{$main-header-bottom-border-width})); } @@ -91,7 +91,7 @@ body, .main-sidebar { margin-top: calc(#{$main-header-height} / -1); - .sidebar { + .sidebar { margin-top: $main-header-height; } } @@ -101,7 +101,7 @@ body, .main-sidebar { margin-top: calc(#{$main-header-height-sm} / -1); - .sidebar { + .sidebar { margin-top: $main-header-height-sm; } } @@ -302,7 +302,7 @@ body, .main-sidebar { margin-top: calc(#{$main-header-height} / -1); - .sidebar { + .sidebar { margin-top: $main-header-height; } } @@ -312,7 +312,7 @@ body, .main-sidebar { margin-top: calc(#{$main-header-height-sm} / -1); - .sidebar { + .sidebar { margin-top: $main-header-height-sm; } } diff --git a/build/scss/_main-sidebar.scss b/build/scss/_main-sidebar.scss index f0aacfae7..3e53a2633 100644 --- a/build/scss/_main-sidebar.scss +++ b/build/scss/_main-sidebar.scss @@ -310,7 +310,7 @@ .nav-flat { .nav-item { .nav-treeview { - .nav-treeview { + .nav-treeview { border-color: $sidebar-light-submenu-active-bg; } @@ -437,7 +437,7 @@ .nav-flat { .nav-item { .nav-treeview { - .nav-treeview { + .nav-treeview { border-color: $sidebar-dark-submenu-active-bg; } @@ -490,17 +490,17 @@ border-radius: 0; margin-bottom: 0; - > .nav-icon { + > .nav-icon { margin-left: .55rem; } } } &:not(.nav-child-indent) { - .nav-treeview { + .nav-treeview { .nav-item { > .nav-link { - > .nav-icon { + > .nav-icon { margin-left: .4rem; } } @@ -512,29 +512,29 @@ .nav-treeview { padding-left: 0; - .nav-icon { + .nav-icon { margin-left: .85rem; } .nav-treeview { border-left: .2rem solid; - .nav-icon { + .nav-icon { margin-left: 1.15rem; } .nav-treeview { - .nav-icon { + .nav-icon { margin-left: 1.45rem; } .nav-treeview { - .nav-icon { + .nav-icon { margin-left: 1.75rem; } .nav-treeview { - .nav-icon { + .nav-icon { margin-left: 2.05rem; } } @@ -544,9 +544,9 @@ } } - .sidebar-collapse &.nav-child-indent { + .sidebar-collapse &.nav-child-indent { .nav-treeview { - .nav-icon { + .nav-icon { margin-left: .55rem; } @@ -555,22 +555,22 @@ } .nav-treeview { - .nav-icon { + .nav-icon { margin-left: .35rem; } .nav-treeview { - .nav-icon { + .nav-icon { margin-left: .15rem; } .nav-treeview { - .nav-icon { + .nav-icon { margin-left: -.15rem; } .nav-treeview { - .nav-icon { + .nav-icon { margin-left: -.35rem; } } @@ -585,33 +585,33 @@ .sidebar-mini .main-sidebar.sidebar-focused &, .sidebar-mini-md .main-sidebar.sidebar-focused & { &.nav-compact.nav-sidebar .nav-treeview { - .nav-icon { + .nav-icon { margin-left: .4rem; } } &.nav-sidebar.nav-child-indent .nav-treeview { - .nav-icon { + .nav-icon { margin-left: .85rem; } .nav-treeview { - .nav-icon { + .nav-icon { margin-left: 1.15rem; } .nav-treeview { - .nav-icon { + .nav-icon { margin-left: 1.45rem; } .nav-treeview { - .nav-icon { + .nav-icon { margin-left: 1.75rem; } .nav-treeview { - .nav-icon { + .nav-icon { margin-left: 2.05rem; } } diff --git a/build/scss/_miscellaneous.scss b/build/scss/_miscellaneous.scss index 2e2656662..af5b80117 100644 --- a/build/scss/_miscellaneous.scss +++ b/build/scss/_miscellaneous.scss @@ -447,7 +447,7 @@ blockquote { // Badge BTN Style -.badge-btn { +.badge-btn { border-radius: $button-border-radius-xs; font-size: $button-font-size-xs; font-weight: 400; diff --git a/build/scss/plugins/_pace.scss b/build/scss/plugins/_pace.scss index 6cd2cdc51..843dc58cf 100644 --- a/build/scss/plugins/_pace.scss +++ b/build/scss/plugins/_pace.scss @@ -123,7 +123,7 @@ } .pace-activity::after, - .pace-activity::before { + .pace-activity::before { border: 5px solid color-yiq($color); }