From 58d06c7cc42dbb701a799507e8b6b875c70c42de Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Thu, 20 Jun 2024 09:18:55 +0200 Subject: [PATCH] plugins: style sweep --- .../src/opnsense/www/themes/cicada/build/css/main.css | 2 +- .../src/opnsense/mvc/app/models/OPNsense/Caddy/Caddy.php | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/misc/theme-cicada/src/opnsense/www/themes/cicada/build/css/main.css b/misc/theme-cicada/src/opnsense/www/themes/cicada/build/css/main.css index 031ea2e7d..a932ab707 100644 --- a/misc/theme-cicada/src/opnsense/www/themes/cicada/build/css/main.css +++ b/misc/theme-cicada/src/opnsense/www/themes/cicada/build/css/main.css @@ -5750,7 +5750,7 @@ body { height: auto; padding: 7px 14px 5px 14px; -webkit-box-shadow: 0 3px 4px rgb(23, 23, 23); - box-shadow: 0 3px 4px rgb(23, 23, 23); + box-shadow: 0 3px 4px rgb(23, 23, 23); border-radius: 0.5em 0.5em 0.5em 0.5em; } .page-content-head, .content-box-head { padding-bottom: 2px; diff --git a/www/caddy/src/opnsense/mvc/app/models/OPNsense/Caddy/Caddy.php b/www/caddy/src/opnsense/mvc/app/models/OPNsense/Caddy/Caddy.php index 467233827..85254166f 100644 --- a/www/caddy/src/opnsense/mvc/app/models/OPNsense/Caddy/Caddy.php +++ b/www/caddy/src/opnsense/mvc/app/models/OPNsense/Caddy/Caddy.php @@ -108,7 +108,8 @@ class Caddy extends BaseModel } // 3. Get the current OPNsense WebGUI ports and check for conflicts with Caddy - private function getWebGuiPorts() { + private function getWebGuiPorts() + { $webgui = Config::getInstance()->object()->system->webgui ?? null; $webGuiPorts = []; @@ -126,7 +127,8 @@ class Caddy extends BaseModel return $webGuiPorts; } - private function checkWebGuiSettings($messages) { + private function checkWebGuiSettings($messages) + { $overlap = array_intersect($this->getWebGuiPorts(), ['80', '443']); $tlsAutoHttpsSetting = (string)$this->general->TlsAutoHttps; @@ -140,7 +142,8 @@ class Caddy extends BaseModel } // 4. Check for ACME Email being required when Auto HTTPS on - private function checkAcmeEmailAutoHttps($messages) { + private function checkAcmeEmailAutoHttps($messages) + { $tlsAutoHttpsSetting = (string)$this->general->TlsAutoHttps; $tlsEmail = (string)$this->general->TlsEmail;