Merge remote-tracking branch 'upstream/master' into release-prepare
This commit is contained in:
@@ -19,28 +19,18 @@ const cssPath = isRtl ? ".rtl" : "";
|
||||
/>
|
||||
<!--end::Primary Meta Tags-->
|
||||
<!--begin::Fonts-->
|
||||
<link rel="preconnect" href="https://fonts.googleapis.com" />
|
||||
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
|
||||
<link
|
||||
href="https://fonts.googleapis.com/css2?family=Source+Sans+Pro:ital,wght@0,300;0,400;0,700;1,400&display=swap"
|
||||
rel="stylesheet"
|
||||
href="https://cdn.jsdelivr.net/npm/@fontsource/source-sans-3@5.0.12/index.css"
|
||||
integrity="sha256-tXJfXfp6Ewt1ilPzLDtQnJV4hclT9XuaZUKyUvmyr+Q="
|
||||
crossorigin="anonymous"
|
||||
/>
|
||||
<!--end::Fonts-->
|
||||
<!--begin::Third Party Plugin(OverlayScrollbars)-->
|
||||
<link
|
||||
rel="stylesheet"
|
||||
href="https://cdn.jsdelivr.net/npm/overlayscrollbars@2.1.0/styles/overlayscrollbars.min.css"
|
||||
integrity="sha256-LWLZPJ7X1jJLI5OG5695qDemW1qQ7lNdbTfQ64ylbUY="
|
||||
crossorigin="anonymous"
|
||||
/>
|
||||
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/overlayscrollbars@2.3.0/styles/overlayscrollbars.min.css" integrity="sha256-dSokZseQNT08wYEWiz5iLI8QPlKxG+TswNRD8k35cpg=" crossorigin="anonymous">
|
||||
<!--end::Third Party Plugin(OverlayScrollbars)-->
|
||||
<!--begin::Third Party Plugin(Bootstrap Icons)-->
|
||||
<link
|
||||
rel="stylesheet"
|
||||
href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.10.5/font/bootstrap-icons.min.css"
|
||||
integrity="sha256-BicZsQAhkGHIoR//IB2amPN5SrRb3fHB8tFsnqRAwnk="
|
||||
crossorigin="anonymous"
|
||||
>
|
||||
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.11.0/font/bootstrap-icons.min.css" integrity="sha256-Qsx5lrStHZyR9REqhUF8iQt73X06c8LGIUPzpOhwRrI=" crossorigin="anonymous">
|
||||
<!--end::Third Party Plugin(Bootstrap Icons)-->
|
||||
<!--begin::Required Plugin(AdminLTE)-->
|
||||
<link rel="stylesheet" href={path + "/css/adminlte" + cssPath + ".css"} />
|
||||
|
||||
@@ -4,26 +4,15 @@ const adminlteJsUrl = path + "/js/adminlte.js";
|
||||
---
|
||||
|
||||
<!--begin::Third Party Plugin(OverlayScrollbars)-->
|
||||
<script
|
||||
src="https://cdn.jsdelivr.net/npm/overlayscrollbars@2.1.0/browser/overlayscrollbars.browser.es6.min.js"
|
||||
integrity="sha256-NRZchBuHZWSXldqrtAOeCZpucH/1n1ToJ3C8mSK95NU="
|
||||
crossorigin="anonymous"
|
||||
></script>
|
||||
<script src="https://cdn.jsdelivr.net/npm/overlayscrollbars@2.3.0/browser/overlayscrollbars.browser.es6.min.js" integrity="sha256-H2VM7BKda+v2Z4+DRy69uknwxjyDRhszjXFhsL4gD3w=" crossorigin="anonymous"></script>
|
||||
<!--end::Third Party Plugin(OverlayScrollbars)--><!--begin::Required Plugin(popperjs for Bootstrap 5)-->
|
||||
<script
|
||||
src="https://cdn.jsdelivr.net/npm/@popperjs/core@2.11.7/dist/umd/popper.min.js"
|
||||
integrity="sha384-zYPOMqeu1DAVkHiLqWBUTcbYfZ8osu1Nd6Z89ify25QV9guujx43ITvfi12/QExE"
|
||||
crossorigin="anonymous"
|
||||
></script>
|
||||
<script src="https://cdn.jsdelivr.net/npm/@popperjs/core@2.11.8/dist/umd/popper.min.js" integrity="sha256-whL0tQWoY1Ku1iskqPFvmZ+CHsvmRWx/PIoEvIeWh4I=" crossorigin="anonymous"></script>
|
||||
<!--end::Required Plugin(popperjs for Bootstrap 5)--><!--begin::Required Plugin(Bootstrap 5)-->
|
||||
<script
|
||||
src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha3/dist/js/bootstrap.min.js"
|
||||
integrity="sha384-Y4oOpwW3duJdCWv5ly8SCFYWqFDsfob/3GkgExXKV4idmbt98QcxXYs9UoXAB7BZ"
|
||||
crossorigin="anonymous"
|
||||
></script>
|
||||
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/js/bootstrap.min.js" integrity="sha256-YMa+wAM6QkVyz999odX7lPRxkoYAan8suedu4k2Zur8=" crossorigin="anonymous"></script>
|
||||
<!--end::Required Plugin(Bootstrap 5)--><!--begin::Required Plugin(AdminLTE)-->
|
||||
<script src={adminlteJsUrl} is:inline></script>
|
||||
<!--end::Required Plugin(AdminLTE)--><!--begin::OverlayScrollbars Configure-->
|
||||
<!--end::Required Plugin(AdminLTE)-->
|
||||
<!--begin::OverlayScrollbars Configure-->
|
||||
<script is:inline>
|
||||
const SELECTOR_SIDEBAR_WRAPPER = ".sidebar-wrapper";
|
||||
const Default = {
|
||||
@@ -31,7 +20,6 @@ const adminlteJsUrl = path + "/js/adminlte.js";
|
||||
scrollbarAutoHide: "leave",
|
||||
scrollbarClickScroll: true,
|
||||
};
|
||||
|
||||
document.addEventListener("DOMContentLoaded", function () {
|
||||
const sidebarWrapper = document.querySelector(SELECTOR_SIDEBAR_WRAPPER);
|
||||
if (
|
||||
|
||||
@@ -9,8 +9,8 @@ const year = new Date().getFullYear();
|
||||
<!--end::To the end-->
|
||||
<!--begin::Copyright-->
|
||||
<strong>
|
||||
Copyright © 2014-{year}
|
||||
<a href="https://adminlte.io">AdminLTE.io</a>.
|
||||
Copyright © 2014-{year}
|
||||
<a href="https://adminlte.io" class="text-decoration-none">AdminLTE.io</a>.
|
||||
</strong>
|
||||
All rights reserved.
|
||||
<!--end::Copyright-->
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
---
|
||||
import { convertPathToHtml } from "../../../utils/index.js";
|
||||
const { path, mainPage, page } = Astro.props;
|
||||
import {convertPathToHtml} from "../../../utils/index.js";
|
||||
const {path, mainPage, page} = Astro.props;
|
||||
const htmlPath = convertPathToHtml(path);
|
||||
---
|
||||
|
||||
@@ -125,7 +125,7 @@ const htmlPath = convertPathToHtml(path);
|
||||
<p>
|
||||
Layout Options
|
||||
<span class="nav-badge badge text-bg-secondary me-3"
|
||||
>6</span
|
||||
>6</span
|
||||
>
|
||||
<i class="nav-arrow bi bi-chevron-right"></i>
|
||||
</p>
|
||||
@@ -216,6 +216,15 @@ const htmlPath = convertPathToHtml(path);
|
||||
</p>
|
||||
</a>
|
||||
<ul class="nav nav-treeview">
|
||||
<li class="nav-item">
|
||||
<a
|
||||
href={htmlPath + "/UI/general.html"}
|
||||
class:list={["nav-link", page === "general" && "active"]}
|
||||
>
|
||||
<i class="nav-icon bi bi-circle"></i>
|
||||
<p>General</p>
|
||||
</a>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<a
|
||||
href={htmlPath + "/UI/timeline.html"}
|
||||
|
||||
@@ -154,6 +154,15 @@ const distPath = path;
|
||||
</li>
|
||||
<!--end::Notifications Dropdown Menu-->
|
||||
|
||||
<!--begin::Fullscreen Toggle-->
|
||||
<li class="nav-item">
|
||||
<a class="nav-link" href="#" data-lte-toggle="fullscreen">
|
||||
<i data-lte-icon="maximize" class="bi bi-arrows-fullscreen"></i>
|
||||
<i data-lte-icon="minimize" class="bi bi-fullscreen-exit" style="display: none;"></i>
|
||||
</a>
|
||||
</li>
|
||||
<!--end::Fullscreen Toggle-->
|
||||
|
||||
<!--begin::User Menu Dropdown-->
|
||||
<li class="nav-item dropdown user-menu">
|
||||
<a href="#" class="nav-link dropdown-toggle" data-bs-toggle="dropdown">
|
||||
@@ -172,7 +181,6 @@ const distPath = path;
|
||||
class="rounded-circle shadow"
|
||||
alt="User Image"
|
||||
/>
|
||||
|
||||
<p>
|
||||
Alexander Pierce - Web Developer
|
||||
<small>Member since Nov. 2023</small>
|
||||
|
||||
Reference in New Issue
Block a user