Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update external JS and CSS resource links to latest versions #481

Merged
merged 3 commits into from
Dec 31, 2024
Merged

Update external JS and CSS resource links to latest versions #481

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3273b80
Update external JS and CSS resource links to latest versions
dgvirtual Dec 30, 2024
d70dca3
Style fixes
dgvirtual Dec 30, 2024
e6d9508
fix htmx integrity hash
dgvirtual Dec 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion themes/Admin/Components/filter-link.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<div class="d-flex justify-content-end">
<a href="#" x-on:click="filtered = ! filtered"><?= lang('Bonfire.filter' )?></a>
<a href="#" x-on:click="filtered = ! filtered"><?= lang('Bonfire.filter')?></a>
</div>
86 changes: 45 additions & 41 deletions themes/Admin/master.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,59 +1,63 @@
<!doctype html>
<html lang="<?= service('request')->getLocale() ?>">

<head>
<?= $viewMeta->render('meta') ?>

<?= $viewMeta->render('title') ?>

<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.1.0/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-KyZXEAg3QhqLMpG8r+8fhAXLRk2vvoC2f3B09zVXn8CA5QIVfZOJ3BCsw2P0p/We" crossorigin="anonymous">
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-QWTKZyjpPEjISv5WaRU9OFeRpok6YctnYmDr5pNlyT2bRjXh0JMhjY6hW+ALEwIH" crossorigin="anonymous">
<?= asset_link('admin/css/admin.css', 'css') ?>
<?= asset_link('other/components/font-awesome/css/all.css', 'css') ?>
<?= $this->renderSection('styles') ?>
<?= $viewMeta->render('style') ?>
</head>
<body>

<aside id="alerts-wrapper">
{alerts}
</aside>
<body>

<?php if (site_offline()) : ?>
<div class="alert alert-secondary alert-offline">
<?= lang('Bonfire.offlineNotice') ?>
<a href="<?= site_url(ADMIN_AREA . '/settings/general') ?>"><?= lang('Bonfire.here') ?></a>.
</div>
<?php endif ?>

<div class="main <?= site_offline() ? 'offline' : '' ?>" x-data="{open: (window.innerWidth >= 576)}">
<div class="h-100 d-flex align-items-stretch">
<nav id="sidebars" class="sidebar" x-bind:class="{ 'collapsed': ! open }">
<div class="sidebar-wrap h-100 position-relative">
<x-sidebar />

<div class="nav-item position-absolute bottom-0 w-100">
<a href="#" class="nav-link sidebar-toggle" @click="open = !open">
<i class="fas fa-angle-double-left"></i>
<span><?= lang('Bonfire.collapseSidebar') ?></span>
</a>
<aside id="alerts-wrapper">
{alerts}
</aside>

<?php if (site_offline()) : ?>
<div class="alert alert-secondary alert-offline">
<?= lang('Bonfire.offlineNotice') ?>
<a href="<?= site_url(ADMIN_AREA . '/settings/general') ?>"><?= lang('Bonfire.here') ?></a>.
</div>
<?php endif ?>

<div class="main <?= site_offline() ? 'offline' : '' ?>" x-data="{open: (window.innerWidth >= 576)}">
<div class="h-100 d-flex align-items-stretch">
<nav id="sidebars" class="sidebar" x-bind:class="{ 'collapsed': ! open }">
<div class="sidebar-wrap h-100 position-relative">
<x-sidebar />

<div class="nav-item position-absolute bottom-0 w-100">
<a href="#" class="nav-link sidebar-toggle" @click="open = !open">
<i class="fas fa-angle-double-left"></i>
<span><?= lang('Bonfire.collapseSidebar') ?></span>
</a>
</div>
</div>
</div>
</nav>
</nav>

<main class="ms-sm-auto flex-grow-1" style="overflow: auto">
<?= $this->include('_header') ?>
<main class="ms-sm-auto flex-grow-1" style="overflow: auto">
<?= $this->include('_header') ?>

<div class="px-2 px-md-4 vh-100" style="margin-top: -48px; padding-top: 48px;">
<?= $this->renderSection('main') ?>
</div>
</main>
<div class="px-2 px-md-4 vh-100" style="margin-top: -48px; padding-top: 48px;">
<?= $this->renderSection('main') ?>
</div>
</main>
</div>
</div>
</div>

<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.bundle.min.js" integrity="sha384-MrcW6ZMFYlzcLA8Nl+NtUVF0sA7MsXsP1UyJoMp4YLEuNSfAP+JcXn/tWtIaxVXM" crossorigin="anonymous"></script>
<script src="https://unpkg.com/[email protected]/dist/cdn.min.js"></script>
<script src="https://unpkg.com/[email protected]"></script>
<?= asset_link('admin/js/admin.js', 'js') ?>
<?= $this->renderSection('scripts') ?>
<?= $viewMeta->render('script') ?>
<?= $viewMeta->render('rawScripts') ?>
</body></html>
<script src="https://cdn.jsdelivr.net/npm/@popperjs/[email protected]/dist/umd/popper.min.js" integrity="sha384-IQsoLXl5PILFhosVNubq5LC7Qb9DXgDA9i+tQ8Zj3iwWAwPtgFTxbJ8NT4GN1R8p" crossorigin="anonymous"></script>
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.min.js" integrity="sha384-0pUGZvbkm6XF6gxjEnlmuGrJXVbNuzT9qBBavbLwCsOGabYfZo0T0to5eqruptLy" crossorigin="anonymous"></script>
<script src="https://unpkg.com/[email protected]/dist/cdn.min.js" integrity="sha384-X9kJyAubVxnP0hcA+AMMs21U445qsnqhnUF8EBlEpP3a42Kh/JwWjlv2ZcvGfphb" crossorigin="anonymous"></script>
<script src="https://unpkg.com/[email protected]" integrity="sha384-HGfztofotfshcF7+8n44JQL2oJmowVChPTg48S+jvZoztPfvwD79OC/LTtG6dMp+" crossorigin="anonymous"></script>
<?= asset_link('admin/js/admin.js', 'js') ?>
<?= $this->renderSection('scripts') ?>
<?= $viewMeta->render('script') ?>
<?= $viewMeta->render('rawScripts') ?>
</body>

</html>
43 changes: 23 additions & 20 deletions themes/Auth/master.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,37 +1,40 @@
<!doctype html>
<html lang="<?= service('request')->getLocale() ?>">

<head>
<?= $viewMeta->render('meta') ?>
<?= $viewMeta->render('meta') ?>

<?= $viewMeta->render('title') ?>

<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.1.0/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-KyZXEAg3QhqLMpG8r+8fhAXLRk2vvoC2f3B09zVXn8CA5QIVfZOJ3BCsw2P0p/We" crossorigin="anonymous">
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-QWTKZyjpPEjISv5WaRU9OFeRpok6YctnYmDr5pNlyT2bRjXh0JMhjY6hW+ALEwIH" crossorigin="anonymous">
<?= asset_link('auth/css/auth.css', 'css') ?>
<?= asset_link('other/components/font-awesome/css/all.css', 'css') ?>
<?= $this->renderSection('styles') ?>
<?= $viewMeta->render('style') ?>
</head>

<body>

<aside id="alerts-wrapper">
{alerts}
</aside>
<aside id="alerts-wrapper">
{alerts}
</aside>

<header class="navbar navbar-light bg-none flex-md-nowrap p-0 shadow-sm">
<a class="px-3 d-block fs-3 text-dark text-decoration-none col-md-3 col-lg-2 me-0" href="<?= site_url(ADMIN_AREA) ?>">
<?= setting('Site.siteName') ?? 'Bonfire' ?>
</a>
</header>
<header class="navbar navbar-light bg-none flex-md-nowrap p-0 shadow-sm">
<a class="px-3 d-block fs-3 text-dark text-decoration-none col-md-3 col-lg-2 me-0" href="<?= site_url(ADMIN_AREA) ?>">
<?= setting('Site.siteName') ?? 'Bonfire' ?>
</a>
</header>

<div class="container-fluid main">
<main class="ms-sm-auto px-md-4">
<?= $this->renderSection('main') ?>
</main>
</div>
<div class="container-fluid main">
<main class="ms-sm-auto px-md-4">
<?= $this->renderSection('main') ?>
</main>
</div>

<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.min.js" integrity="sha384-0pUGZvbkm6XF6gxjEnlmuGrJXVbNuzT9qBBavbLwCsOGabYfZo0T0to5eqruptLy" crossorigin="anonymous"></script>
<script src="https://unpkg.com/[email protected]/dist/cdn.min.js" integrity="sha384-X9kJyAubVxnP0hcA+AMMs21U445qsnqhnUF8EBlEpP3a42Kh/JwWjlv2ZcvGfphb" crossorigin="anonymous"></script>
<?= $this->renderSection('scripts') ?>
<?= $viewMeta->render('script') ?>
</body>

<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.bundle.min.js" integrity="sha384-MrcW6ZMFYlzcLA8Nl+NtUVF0sA7MsXsP1UyJoMp4YLEuNSfAP+JcXn/tWtIaxVXM" crossorigin="anonymous"></script>
<script src="https://unpkg.com/[email protected]/dist/cdn.min.js"></script>
<?= $this->renderSection('scripts') ?>
<?= $viewMeta->render('script') ?>
</body></html>
</html>
Loading