From a29afb44dbb9dd562bd7bc8690b2dc08c2cac607 Mon Sep 17 00:00:00 2001 From: Daniel <50356015+danny007in@users.noreply.github.com> Date: Fri, 21 May 2021 04:34:22 +0530 Subject: [PATCH] main-header improved --- src/pages/demo.html | 12 ----- src/pages/forms/general.html | 10 ++-- src/pages/widgets.html | 10 ++-- src/partials/_head.html | 6 ++- src/partials/dashboard/_sidenav.html | 75 ++++++++++++++++++++-------- src/partials/dashboard/_topbar.html | 43 ++++++++++++---- src/scss/_main-header.scss | 10 ++++ src/scss/_variables.scss | 4 +- 8 files changed, 115 insertions(+), 55 deletions(-) delete mode 100644 src/pages/demo.html diff --git a/src/pages/demo.html b/src/pages/demo.html deleted file mode 100644 index 4c0386559..000000000 --- a/src/pages/demo.html +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - Demo - - - - - diff --git a/src/pages/forms/general.html b/src/pages/forms/general.html index 28c390ec9..2e6913c05 100644 --- a/src/pages/forms/general.html +++ b/src/pages/forms/general.html @@ -4,20 +4,20 @@ @@include('./_head.html', { - "path": "../../", + "path": "../..", "title": "AdminLTE 4 | General Form Elements" })
@@include('./dashboard/_topbar.html', { - "path": "../../" + "path": "../.." }) @@include('./dashboard/_sidenav.html', { "mainPage": "forms", "page": "general", - "path": "../../" + "path": "../.." })
@@ -73,13 +73,13 @@ @@include('./dashboard/_footer.html', { - "path": "../../" + "path": "../.." })
@@include('./_scripts.html', { - "path": "../../" + "path": "../.." }) diff --git a/src/pages/widgets.html b/src/pages/widgets.html index 57efb2ba1..ce52478a7 100644 --- a/src/pages/widgets.html +++ b/src/pages/widgets.html @@ -4,7 +4,7 @@ @@include('./_head.html', { - "path": "../", + "path": "..", "title": "AdminLTE 4 | General Form Elements" }) @@ -12,13 +12,13 @@
@@include('./dashboard/_topbar.html', { - "path": "../" + "path": ".." }) @@include('./dashboard/_sidenav.html', { "mainPage": "pages", "page": "widgets", - "path": "../" + "path": ".." })
@@ -407,13 +407,13 @@ @@include('./dashboard/_footer.html', { - "path": "../" + "path": ".." })
@@include('./_scripts.html', { - "path": "../" + "path": ".." }) diff --git a/src/partials/_head.html b/src/partials/_head.html index 5b170f43a..152c21bd3 100644 --- a/src/partials/_head.html +++ b/src/partials/_head.html @@ -4,9 +4,13 @@ @@title + + + + + - diff --git a/src/partials/dashboard/_sidenav.html b/src/partials/dashboard/_sidenav.html index 13493773b..c1b99d2c5 100644 --- a/src/partials/dashboard/_sidenav.html +++ b/src/partials/dashboard/_sidenav.html @@ -24,25 +24,19 @@
  • -

    - Dashboard v1 -

    +

    Dashboard v1
  • -

    - Dashboard v2 -

    +

    Dashboard v2
  • -

    - Dashboard v3 -

    +

    Dashboard v3
    • @@ -68,16 +62,18 @@
  • -

    - General Elements -

    +

    General Elements
    • -
  • MULTI LEVEL EXAMPLE
    • - +
  • + + +

    Level 1

    +     +
  • @@ -87,6 +83,12 @@

    @@ -109,13 +121,36 @@
  • -

    - Level 2 -

    +

    Level 2
    • +
  • + + +

    Level 1

    +     +
    • +
  • LABELS
    • +
  • + + +

    Important

    +     +
    • +
  • + + +

    Warning

    +     +
    • +
  • + + +

    Informational

    +     +
    • diff --git a/src/partials/dashboard/_topbar.html b/src/partials/dashboard/_topbar.html index b72f7089a..a833aac20 100644 --- a/src/partials/dashboard/_topbar.html +++ b/src/partials/dashboard/_topbar.html @@ -1,5 +1,5 @@ -