update 2025-03-21 14:18:14

This commit is contained in:
kenzok8 2025-03-21 14:18:14 +08:00
parent 3661f7612a
commit 0410cb2a14
17 changed files with 63 additions and 109 deletions

View File

@ -10,12 +10,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=haproxy
PKG_VERSION:=3.0.8
PKG_VERSION:=3.0.9
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://www.haproxy.org/download/3.0/src
PKG_HASH:=930ae2c33058e1f497fe62cdaacffab6cab6a91e31ba011a9a2f9fe6c5c4aebc
PKG_HASH:=7dc731b681b7aa93dc23aa36b85fa7b91bb1cf53faaca97404544ea454acecad
PKG_MAINTAINER:=Thomas Heil <heil@terminal-consulting.de>, \
Christian Lachner <gladiac@gmail.com>

View File

@ -1,7 +1,7 @@
#!/bin/sh
CLONEURL=https://git.haproxy.org/git/haproxy-3.0.git
BASE_TAG=v3.0.8
BASE_TAG=v3.0.9
TMP_REPODIR=tmprepo
PATCHESDIR=patches

View File

@ -1,7 +1,4 @@
@import url('https://fonts.googleapis.com/css2?family=Montserrat:wght@400;700&family=Roboto:wght@400;700&display=swap');
@import url('https://fonts.googleapis.com/css2?family=Montserrat:wght@400;700&family=Roboto:wght@400;700&family=Cinzel+Decorative:wght@700;900&display=swap');
[data-bs-theme=Beige] {
color-scheme: light;
--bs-body-font-family: 'Roboto', sans-serif;

View File

@ -1,5 +1,4 @@
@import url('https://fonts.googleapis.com/css2?family=Noto+Sans+SC:wght@400;700&family=Noto+Serif+SC:wght@400;700&display=swap');
@import url('https://fonts.googleapis.com/css2?family=Montserrat:wght@400;700&family=Roboto:wght@400;700&family=Cinzel+Decorative:wght@700;900&display=swap');
:root {
--bs-shadow-light: 0 4px 8px rgba(0, 0, 0, 0.2);
--bs-shadow-medium: 0 6px 12px rgba(0, 0, 0, 0.3);

View File

@ -1,5 +1,3 @@
@import url('https://fonts.googleapis.com/css2?family=Montserrat:wght@400;700&family=Roboto:wght@400;700&display=swap');
@import url('https://fonts.googleapis.com/css2?family=Montserrat:wght@400;700&family=Roboto:wght@400;700&family=Cinzel+Decorative:wght@700;900&display=swap');
[data-bs-theme=NavajoWhite] {
color-scheme: light;
--bs-body-font-family: "Avant Garde", Avantgarde, "Century Gothic", CenturyGothic, AppleGothic, sans-serif;

View File

@ -1,6 +1,3 @@
@import url('https://fonts.googleapis.com/css2?family=Playfair+Display:wght@400;700&family=Roboto:wght@300;400;700&display=swap');
@import url('https://fonts.googleapis.com/css2?family=Montserrat:wght@400;700&family=Roboto:wght@400;700&family=Cinzel+Decorative:wght@700;900&display=swap');
[data-bs-theme=Skyblue] {
color-scheme: light;
--bs-body-font-family: "Avant Garde", Avantgarde, "Century Gothic", CenturyGothic, AppleGothic, sans-serif;

View File

@ -1,7 +1,3 @@
@import url('https://fonts.googleapis.com/css2?family=Playfair+Display:wght@400;700&family=Roboto:wght@300;400;700&display=swap');
@import url('https://fonts.googleapis.com/css2?family=Montserrat:wght@400;700&family=Roboto:wght@400;700&display=swap');
@import url('https://fonts.googleapis.com/css2?family=Montserrat:wght@400;700&family=Roboto:wght@400;700&family=Cinzel+Decorative:wght@700;900&display=swap');
[data-bs-theme=cornsilk] {
color-scheme: light;
--bs-body-font-family: "Avant Garde", Avantgarde, "Century Gothic", CenturyGothic, AppleGothic, sans-serif;

View File

@ -1,5 +1,3 @@
@import url('https://fonts.googleapis.com/css2?family=Montserrat:wght@400;700&family=Roboto:wght@400;700&display=swap');
@import url('https://fonts.googleapis.com/css2?family=Montserrat:wght@400;700&family=Roboto:wght@400;700&family=Cinzel+Decorative:wght@700;900&display=swap');
[data-bs-theme=dark] {
color-scheme: dark;
--bs-body-font-family: 'Roboto', sans-serif;
@ -237,7 +235,7 @@ h1, h2, h3, h4, h5, h6 {
.btn-danger {
background-color: var(--bs-danger);
border-color: var(--bs-danger);
color: #121212;
color: white;
}
.container-bg {
@ -498,7 +496,7 @@ h1:hover, h2:hover, h3:hover, h4:hover, h5:hover, h6:hover {
.btn-info,
.btn-success,
.btn-danger {
color: #fff !important;
color: white !important;
}
.btn-info:hover,
@ -507,7 +505,7 @@ h1:hover, h2:hover, h3:hover, h4:hover, h5:hover, h6:hover {
.btn-info:focus,
.btn-success:focus,
.btn-danger:focus {
color: #fff !important;
color: #white !important;
}
@media (max-width: 767px) {

View File

@ -1,6 +1,3 @@
@import url('https://fonts.googleapis.com/css2?family=Montserrat:wght@400;700&family=Roboto:wght@400;700&display=swap');
@import url('https://fonts.googleapis.com/css2?family=Montserrat:wght@400;700&family=Roboto:wght@400;700&family=Cinzel+Decorative:wght@700;900&display=swap');
[data-bs-theme=green] {
color-scheme: light;
--bs-body-font-family: 'Roboto', sans-serif;

View File

@ -1,6 +1,3 @@
@import url('https://fonts.googleapis.com/css2?family=Montserrat:wght@400;700&family=Roboto:wght@400;700&display=swap');
@import url('https://fonts.googleapis.com/css2?family=Montserrat:wght@400;700&family=Roboto:wght@400;700&family=Cinzel+Decorative:wght@700;900&display=swap');
[data-bs-theme=light] {
color-scheme: light;
--bs-body-font-family: 'Roboto', sans-serif;

View File

@ -1,6 +1,3 @@
@import url('https://fonts.googleapis.com/css2?family=Montserrat:wght@400;700&family=Roboto:wght@400;700&display=swap');
@import url('https://fonts.googleapis.com/css2?family=Montserrat:wght@400;700&family=Roboto:wght@400;700&family=Cinzel+Decorative:wght@700;900&display=swap');
[data-bs-theme=orange] {
color-scheme: light;
--bs-body-font-family: 'Roboto', sans-serif;

View File

@ -1,7 +1,3 @@
@import url('https://fonts.googleapis.com/css2?family=Montserrat:wght@400;700&family=Roboto:wght@400;700&display=swap');
@import url('https://fonts.googleapis.com/css2?family=Montserrat:wght@400;700&family=Roboto:wght@400;700&family=Cinzel+Decorative:wght@700;900&display=swap');
[data-bs-theme=pink] {
color-scheme: light;
--bs-body-font-family: 'Roboto', sans-serif;

View File

@ -1,6 +1,3 @@
@import url('https://fonts.googleapis.com/css2?family=Montserrat:wght@400;700&family=Roboto:wght@400;700&display=swap');
@import url('https://fonts.googleapis.com/css2?family=Cinzel+Decorative:wght@700;900&display=swap');
[data-bs-theme=synthwave] {
color-scheme: dark;
--bs-body-font-family: 'Roboto', sans-serif;
@ -138,7 +135,7 @@ h1:hover, h2:hover, h3:hover, h4:hover, h5:hover, h6:hover {
.btn-danger {
background-color: var(--bs-danger);
border-color: var(--bs-danger);
color: #121212;
color: white;
}
.table thead th {

View File

@ -47,20 +47,6 @@
--bs-body-font-family: 'Avant Garde', Avantgarde, 'Century Gothic', CenturyGothic, AppleGothic, sans-serif;
}
@font-face {
font-family: 'Cinzel Decorative';
font-style: normal;
font-weight: 700;
src: url('../webfonts/cinzel-decorative-v17-latin-700.woff2') format('woff2');
}
@font-face {
font-family: 'Cinzel Decorative';
font-style: normal;
font-weight: 900;
src: url('../webfonts/cinzel-decorative-v17-latin-900.woff2') format('woff2');
}
body {
background-color: var(--bs-body-bg);
color: var(--bs-body-color);
@ -398,26 +384,6 @@ button {
overflow: auto;
}
/* START .container-sm */
.container-sm {
width: 1650px !important;
max-width: 100%;
margin: 0 auto;
}
/* END .container-sm */
/* START .modal-xl */
.modal-xl {
max-width: 1600px !important;
}
@media (max-width: 768px) {
.modal-xl {
max-width: 100%;
}
}
/* END .modal-xl */
button, .btn-warning, .btn-info, .card, .modal-content {
transition: transform 0.2s ease, box-shadow 0.2s ease;
}

View File

@ -6799,4 +6799,57 @@ window.addEventListener('load', function() {
}
});
});
</script>
</script>
<style>
@font-face {
font-family: 'Cinzel Decorative';
font-style: normal;
font-weight: 700;
src: url('./assets/webfonts/cinzel-decorative-v17-latin-700.woff2') format('woff2');
}
@font-face {
font-family: 'Cinzel Decorative';
font-style: normal;
font-weight: 900;
src: url('./assets/webfonts/cinzel-decorative-v17-latin-900.woff2') format('woff2');
}
.btn-primary,
.btn-success,
.btn-info,
.btn-warning,
.btn btn-danger,
.btn-pink {
color: white !important;
}
.container-bg {
border-radius: 12px !important;
margin-top: 1rem !important;
}
.scrollable-container:hover {
overflow: auto;
}
/* START .container-sm */
.container-sm {
width: 1650px !important;
max-width: 100%;
margin: 0 auto;
}
/* END .container-sm */
/* START .modal-xl */
.modal-xl {
max-width: 1600px !important;
}
@media (max-width: 768px) {
.modal-xl {
max-width: 100%;
}
}
/* END .modal-xl */
</style>

View File

@ -104,20 +104,6 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') {
--bs-body-font-family: 'Avant Garde', Avantgarde, 'Century Gothic', CenturyGothic, AppleGothic, sans-serif;
}
@font-face {
font-family: 'Cinzel Decorative';
font-style: normal;
font-weight: 700;
src: url('../webfonts/cinzel-decorative-v17-latin-700.woff2') format('woff2');
}
@font-face {
font-family: 'Cinzel Decorative';
font-style: normal;
font-weight: 900;
src: url('../webfonts/cinzel-decorative-v17-latin-900.woff2') format('woff2');
}
body {
background-color: var(--bs-body-bg);
color: var(--bs-body-color);
@ -468,26 +454,6 @@ button {
overflow: auto;
}
/* START .container-sm */
.container-sm {
width: 1650px !important;
max-width: 100%;
margin: 0 auto;
}
/* END .container-sm */
/* START .modal-xl */
.modal-xl {
max-width: 1600px !important;
}
@media (max-width: 768px) {
.modal-xl {
max-width: 100%;
}
}
/* END .modal-xl */
button, .btn-warning, .btn-info, .card, .modal-content {
transition: transform 0.2s ease, box-shadow 0.2s ease;
}

View File

@ -8,7 +8,7 @@ $applyBodyBackground = isset($data['bodyBackground']) && $data['bodyBackground']
$applyOpenWrtTheme = isset($data['openwrtTheme']) && $data['openwrtTheme'] == 1;
if ($width !== null && $modalWidth !== null) {
$cssFilePath = 'assets/theme/transparent.css';
$cssFilePath = 'ping.php';
if (file_exists($cssFilePath)) {
$cssContent = file_get_contents($cssFilePath);