diff --git a/haproxy/Makefile b/haproxy/Makefile index 574fe2bb2..261596c02 100644 --- a/haproxy/Makefile +++ b/haproxy/Makefile @@ -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 , \ Christian Lachner diff --git a/haproxy/get-latest-patches.sh b/haproxy/get-latest-patches.sh index bf48aee75..66946aab7 100755 --- a/haproxy/get-latest-patches.sh +++ b/haproxy/get-latest-patches.sh @@ -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 diff --git a/luci-app-nekobox/htdocs/nekobox/assets/theme/Beige.css b/luci-app-nekobox/htdocs/nekobox/assets/theme/Beige.css index 5c9b701ab..5e31f031a 100644 --- a/luci-app-nekobox/htdocs/nekobox/assets/theme/Beige.css +++ b/luci-app-nekobox/htdocs/nekobox/assets/theme/Beige.css @@ -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; diff --git a/luci-app-nekobox/htdocs/nekobox/assets/theme/ChineseRed.css b/luci-app-nekobox/htdocs/nekobox/assets/theme/ChineseRed.css index b53a4f003..25aa8758c 100644 --- a/luci-app-nekobox/htdocs/nekobox/assets/theme/ChineseRed.css +++ b/luci-app-nekobox/htdocs/nekobox/assets/theme/ChineseRed.css @@ -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); diff --git a/luci-app-nekobox/htdocs/nekobox/assets/theme/NavajoWhite.css b/luci-app-nekobox/htdocs/nekobox/assets/theme/NavajoWhite.css index 9c4f79302..918d62fdb 100644 --- a/luci-app-nekobox/htdocs/nekobox/assets/theme/NavajoWhite.css +++ b/luci-app-nekobox/htdocs/nekobox/assets/theme/NavajoWhite.css @@ -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; diff --git a/luci-app-nekobox/htdocs/nekobox/assets/theme/Skyblue.css b/luci-app-nekobox/htdocs/nekobox/assets/theme/Skyblue.css index 395ddf0e2..9b4d9178e 100644 --- a/luci-app-nekobox/htdocs/nekobox/assets/theme/Skyblue.css +++ b/luci-app-nekobox/htdocs/nekobox/assets/theme/Skyblue.css @@ -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; diff --git a/luci-app-nekobox/htdocs/nekobox/assets/theme/cornsilk.css b/luci-app-nekobox/htdocs/nekobox/assets/theme/cornsilk.css index 3907f0dc9..f22c4f19a 100644 --- a/luci-app-nekobox/htdocs/nekobox/assets/theme/cornsilk.css +++ b/luci-app-nekobox/htdocs/nekobox/assets/theme/cornsilk.css @@ -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; diff --git a/luci-app-nekobox/htdocs/nekobox/assets/theme/dark.css b/luci-app-nekobox/htdocs/nekobox/assets/theme/dark.css index 93fd91859..506212d2a 100644 --- a/luci-app-nekobox/htdocs/nekobox/assets/theme/dark.css +++ b/luci-app-nekobox/htdocs/nekobox/assets/theme/dark.css @@ -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) { diff --git a/luci-app-nekobox/htdocs/nekobox/assets/theme/green.css b/luci-app-nekobox/htdocs/nekobox/assets/theme/green.css index 24cf60711..08874dbcb 100644 --- a/luci-app-nekobox/htdocs/nekobox/assets/theme/green.css +++ b/luci-app-nekobox/htdocs/nekobox/assets/theme/green.css @@ -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; diff --git a/luci-app-nekobox/htdocs/nekobox/assets/theme/light.css b/luci-app-nekobox/htdocs/nekobox/assets/theme/light.css index 9967b61cb..c26991aaa 100644 --- a/luci-app-nekobox/htdocs/nekobox/assets/theme/light.css +++ b/luci-app-nekobox/htdocs/nekobox/assets/theme/light.css @@ -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; diff --git a/luci-app-nekobox/htdocs/nekobox/assets/theme/orange.css b/luci-app-nekobox/htdocs/nekobox/assets/theme/orange.css index 4813c91ad..38fb1076a 100644 --- a/luci-app-nekobox/htdocs/nekobox/assets/theme/orange.css +++ b/luci-app-nekobox/htdocs/nekobox/assets/theme/orange.css @@ -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; diff --git a/luci-app-nekobox/htdocs/nekobox/assets/theme/pink.css b/luci-app-nekobox/htdocs/nekobox/assets/theme/pink.css index 2cf83b817..2c8e64caa 100644 --- a/luci-app-nekobox/htdocs/nekobox/assets/theme/pink.css +++ b/luci-app-nekobox/htdocs/nekobox/assets/theme/pink.css @@ -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; diff --git a/luci-app-nekobox/htdocs/nekobox/assets/theme/synthwave.css b/luci-app-nekobox/htdocs/nekobox/assets/theme/synthwave.css index fd9749baf..563dcde9f 100644 --- a/luci-app-nekobox/htdocs/nekobox/assets/theme/synthwave.css +++ b/luci-app-nekobox/htdocs/nekobox/assets/theme/synthwave.css @@ -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 { diff --git a/luci-app-nekobox/htdocs/nekobox/assets/theme/transparent.css b/luci-app-nekobox/htdocs/nekobox/assets/theme/transparent.css index ddacaeaaf..f629291ac 100644 --- a/luci-app-nekobox/htdocs/nekobox/assets/theme/transparent.css +++ b/luci-app-nekobox/htdocs/nekobox/assets/theme/transparent.css @@ -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; } diff --git a/luci-app-nekobox/htdocs/nekobox/ping.php b/luci-app-nekobox/htdocs/nekobox/ping.php index 7e75b2706..46f41caac 100644 --- a/luci-app-nekobox/htdocs/nekobox/ping.php +++ b/luci-app-nekobox/htdocs/nekobox/ping.php @@ -6799,4 +6799,57 @@ window.addEventListener('load', function() { } }); }); - \ No newline at end of file + + \ No newline at end of file diff --git a/luci-app-nekobox/htdocs/nekobox/theme.php b/luci-app-nekobox/htdocs/nekobox/theme.php index e36e53473..c468dc6a7 100644 --- a/luci-app-nekobox/htdocs/nekobox/theme.php +++ b/luci-app-nekobox/htdocs/nekobox/theme.php @@ -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; } diff --git a/luci-app-nekobox/htdocs/nekobox/update-css.php b/luci-app-nekobox/htdocs/nekobox/update-css.php index 19dcb1ba1..86a5a8ba2 100644 --- a/luci-app-nekobox/htdocs/nekobox/update-css.php +++ b/luci-app-nekobox/htdocs/nekobox/update-css.php @@ -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);