From 034bda7138648603d05cff1276d3afaed2ef3498 Mon Sep 17 00:00:00 2001 From: Daniel <50356015+danny007in@users.noreply.github.com> Date: Thu, 16 Feb 2023 21:45:54 +0530 Subject: [PATCH] layout rework --- src/index.html | 12 +- src/index2.html | 12 +- src/index3.html | 12 +- src/pages/UI/timeline.html | 12 +- src/pages/forms/general.html | 12 +- src/pages/layout/fixed-sidebar.html | 12 +- src/pages/layout/layout-rtl.html | 12 +- src/pages/layout/sidebar-mini.html | 12 +- src/pages/layout/unfixed-sidebar.html | 12 +- src/pages/tables/simple.html | 12 +- src/pages/widgets/cards.html | 12 +- src/pages/widgets/info-box.html | 12 +- src/pages/widgets/small-box.html | 12 +- src/partials/_scripts.html | 4 +- src/partials/dashboard/_footer.html | 2 +- src/partials/dashboard/_sidenav.html | 14 +- src/partials/dashboard/_topbar.html | 2 +- src/scss/_app-footer.scss | 14 ++ .../{_main-header.scss => _app-header.scss} | 8 +- src/scss/_app-main.scss | 19 ++ src/scss/_app-sidebar.scss | 198 ++++++++++++++++ src/scss/{_wrapper.scss => _app-wrapper.scss} | 10 +- src/scss/_brand-container.scss | 72 ------ src/scss/_content-header.scss | 9 - src/scss/_content-wrapper.scss | 5 - src/scss/_content.scss | 3 - src/scss/_layout-fixed.scss | 24 +- src/scss/_layout-mobile.scss | 10 +- src/scss/_main-footer.scss | 14 -- src/scss/_main-sidebar.scss | 220 ------------------ src/scss/_nav-sidebar.scss | 65 ------ src/scss/_sidebar-brand.scss | 56 +++++ src/scss/_sidebar-close.scss | 2 +- src/scss/_sidebar-collapse.scss | 35 +-- src/scss/_sidebar.scss | 11 - src/scss/_variables-dark.scss | 21 +- src/scss/_variables.scss | 137 ++--------- src/scss/mixins/_animations.scss | 4 + src/scss/parts/_core.scss | 16 +- src/ts/push-menu.ts | 12 +- 40 files changed, 478 insertions(+), 665 deletions(-) create mode 100644 src/scss/_app-footer.scss rename src/scss/{_main-header.scss => _app-header.scss} (65%) create mode 100644 src/scss/_app-main.scss create mode 100644 src/scss/_app-sidebar.scss rename src/scss/{_wrapper.scss => _app-wrapper.scss} (55%) delete mode 100644 src/scss/_brand-container.scss delete mode 100644 src/scss/_content-header.scss delete mode 100644 src/scss/_content-wrapper.scss delete mode 100644 src/scss/_content.scss delete mode 100644 src/scss/_main-footer.scss delete mode 100644 src/scss/_main-sidebar.scss delete mode 100644 src/scss/_nav-sidebar.scss create mode 100644 src/scss/_sidebar-brand.scss delete mode 100644 src/scss/_sidebar.scss diff --git a/src/index.html b/src/index.html index 01405fee6..8d819f3a5 100644 --- a/src/index.html +++ b/src/index.html @@ -8,7 +8,7 @@ -
+
@@include('./dashboard/_topbar.html', { "path": "." }) @@ -19,8 +19,8 @@ "path": "." }) -
-
+
+
@@ -35,7 +35,7 @@
-
+
@@ -346,13 +346,13 @@
- + @@include('./dashboard/_footer.html', { "path": "." })
- + @@include('./_scripts.html', { "path": "." diff --git a/src/index2.html b/src/index2.html index bc6a2e8ba..2a354aa3f 100644 --- a/src/index2.html +++ b/src/index2.html @@ -7,7 +7,7 @@ }) -
+
@@include('./dashboard/_topbar.html', { "path": "." }) @@ -18,8 +18,8 @@ "path": "." }) -
-
+
+
@@ -34,7 +34,7 @@
-
+
@@ -821,13 +821,13 @@
- + @@include('./dashboard/_footer.html', { "path": "." })
- + @@include('./_scripts.html', { "path": "." diff --git a/src/index3.html b/src/index3.html index 13db62bd2..dc026740f 100644 --- a/src/index3.html +++ b/src/index3.html @@ -8,7 +8,7 @@ -
+
@@include('./dashboard/_topbar.html', { "path": "." }) @@ -19,8 +19,8 @@ "path": "." }) -
-
+
+
@@ -35,7 +35,7 @@
-
+
@@ -283,13 +283,13 @@
- + @@include('./dashboard/_footer.html', { "path": "." })
- + @@include('./_scripts.html', { "path": "." diff --git a/src/pages/UI/timeline.html b/src/pages/UI/timeline.html index 36b545bd3..ee9841615 100644 --- a/src/pages/UI/timeline.html +++ b/src/pages/UI/timeline.html @@ -7,7 +7,7 @@ }) -
+
@@include('./dashboard/_topbar.html', { "path": "../.." }) @@ -18,8 +18,8 @@ "path": "../.." }) -
-
+
+
@@ -35,7 +35,7 @@
-
+
@@ -145,13 +145,13 @@
- + @@include('./dashboard/_footer.html', { "path": "../.." })
- + @@include('./_scripts.html', { "path": "../.." diff --git a/src/pages/forms/general.html b/src/pages/forms/general.html index e01605890..4b19139aa 100644 --- a/src/pages/forms/general.html +++ b/src/pages/forms/general.html @@ -7,7 +7,7 @@ }) -
+
@@include('./dashboard/_topbar.html', { "path": "../.." }) @@ -18,8 +18,8 @@ "path": "../.." }) -
-
+
+
@@ -35,7 +35,7 @@
-
+
@@ -80,13 +80,13 @@
- + @@include('./dashboard/_footer.html', { "path": "../.." })
- + @@include('./_scripts.html', { "path": "../.." diff --git a/src/pages/layout/fixed-sidebar.html b/src/pages/layout/fixed-sidebar.html index c5455b38e..7d1b68f11 100644 --- a/src/pages/layout/fixed-sidebar.html +++ b/src/pages/layout/fixed-sidebar.html @@ -7,7 +7,7 @@ }) -
+
@@include('./dashboard/_topbar.html', { "path": "../.." }) @@ -18,8 +18,8 @@ "path": "../.." }) -
-
+
+
@@ -35,7 +35,7 @@
-
+
@@ -70,13 +70,13 @@
- + @@include('./dashboard/_footer.html', { "path": "../.." })
- + @@include('./_scripts.html', { "path": "../.." diff --git a/src/pages/layout/layout-rtl.html b/src/pages/layout/layout-rtl.html index ae8354e60..e6b50543f 100644 --- a/src/pages/layout/layout-rtl.html +++ b/src/pages/layout/layout-rtl.html @@ -8,7 +8,7 @@ }) -
+
@@include('./dashboard/_topbar.html', { "path": "../.." }) @@ -19,8 +19,8 @@ "path": "../.." }) -
-
+
+
@@ -36,7 +36,7 @@
-
+
@@ -71,13 +71,13 @@
- + @@include('./dashboard/_footer.html', { "path": "../.." })
- + @@include('./_scripts.html', { "path": "../.." diff --git a/src/pages/layout/sidebar-mini.html b/src/pages/layout/sidebar-mini.html index 213ed8669..aa737407b 100644 --- a/src/pages/layout/sidebar-mini.html +++ b/src/pages/layout/sidebar-mini.html @@ -7,7 +7,7 @@ }) -
+
@@include('./dashboard/_topbar.html', { "path": "../.." }) @@ -18,8 +18,8 @@ "path": "../.." }) -
-
+
+
@@ -35,7 +35,7 @@
-
+
@@ -70,13 +70,13 @@
- + @@include('./dashboard/_footer.html', { "path": "../.." })
- + @@include('./_scripts.html', { "path": "../.." diff --git a/src/pages/layout/unfixed-sidebar.html b/src/pages/layout/unfixed-sidebar.html index 328fd0e4a..ed00b5a2f 100644 --- a/src/pages/layout/unfixed-sidebar.html +++ b/src/pages/layout/unfixed-sidebar.html @@ -7,7 +7,7 @@ }) -
+
@@include('./dashboard/_topbar.html', { "path": "../.." }) @@ -18,8 +18,8 @@ "path": "../.." }) -
-
+
+
@@ -35,7 +35,7 @@
-
+
@@ -70,13 +70,13 @@
- + @@include('./dashboard/_footer.html', { "path": "../.." })
- + @@include('./_scripts.html', { "path": "../.." diff --git a/src/pages/tables/simple.html b/src/pages/tables/simple.html index e3f776320..f08b93dec 100644 --- a/src/pages/tables/simple.html +++ b/src/pages/tables/simple.html @@ -7,7 +7,7 @@ }) -
+
@@include('./dashboard/_topbar.html', { "path": "../.." }) @@ -18,8 +18,8 @@ "path": "../.." }) -
-
+
+
@@ -35,7 +35,7 @@
-
+
@@ -319,13 +319,13 @@
- + @@include('./dashboard/_footer.html', { "path": "../.." })
- + @@include('./_scripts.html', { "path": "../.." diff --git a/src/pages/widgets/cards.html b/src/pages/widgets/cards.html index e5228d07a..f6bd8c21d 100644 --- a/src/pages/widgets/cards.html +++ b/src/pages/widgets/cards.html @@ -7,7 +7,7 @@ }) -
+
@@include('./dashboard/_topbar.html', { "path": "../.." }) @@ -18,8 +18,8 @@ "path": "../.." }) -
-
+
+
@@ -35,7 +35,7 @@
-
+

Cards

@@ -295,13 +295,13 @@
- + @@include('./dashboard/_footer.html', { "path": "../.." })
- + @@include('./_scripts.html', { "path": "../.." diff --git a/src/pages/widgets/info-box.html b/src/pages/widgets/info-box.html index 48079c47b..58a09e834 100644 --- a/src/pages/widgets/info-box.html +++ b/src/pages/widgets/info-box.html @@ -8,7 +8,7 @@ -
+
@@include('./dashboard/_topbar.html', { "path": "../.." }) @@ -19,8 +19,8 @@ "path": "../.." }) -
-
+
+
@@ -36,7 +36,7 @@
-
+
Info Box
@@ -346,13 +346,13 @@
- + @@include('./dashboard/_footer.html', { "path": "../.." })
- + @@include('./_scripts.html', { "path": "../.." diff --git a/src/pages/widgets/small-box.html b/src/pages/widgets/small-box.html index 8b33f7b5f..f368016ec 100644 --- a/src/pages/widgets/small-box.html +++ b/src/pages/widgets/small-box.html @@ -8,7 +8,7 @@ -
+
@@include('./dashboard/_topbar.html', { "path": "../.." }) @@ -19,8 +19,8 @@ "path": "../.." }) -
-
+
+
@@ -36,7 +36,7 @@
-
+
Small Box
@@ -107,13 +107,13 @@
- + @@include('./dashboard/_footer.html', { "path": "../.." })
- + @@include('./_scripts.html', { "path": "../.." diff --git a/src/partials/_scripts.html b/src/partials/_scripts.html index 4f6d1a997..207fc6af8 100644 --- a/src/partials/_scripts.html +++ b/src/partials/_scripts.html @@ -14,7 +14,7 @@