diff --git a/resources/css/utilities.css b/resources/css/utilities.css index 7978b2d19..c7b77022f 100644 --- a/resources/css/utilities.css +++ b/resources/css/utilities.css @@ -174,15 +174,34 @@ @utility menu { } @utility menu-item { - @apply flex gap-3 items-center px-2 py-1 w-full text-sm sm:pr-0 dark:hover:bg-coolgray-100 dark:hover:text-white hover:bg-neutral-300 min-w-fit sm:min-w-64; + @apply flex gap-3 items-center px-2 py-1 w-full text-sm dark:hover:bg-coolgray-100 dark:hover:text-white hover:bg-neutral-300 rounded-sm truncate min-w-0; +} +@utility menu-item-icon { + @apply flex-shrink-0 w-6 h-6 dark:hover:text-white; +} + +@utility menu-item-label { + @apply min-w-0 flex-1 truncate; } @utility menu-item-active { - @apply text-black rounded-none dark:bg-coolgray-200 dark:text-warning bg-neutral-200; + @apply text-black rounded-sm dark:bg-coolgray-200 dark:text-warning bg-neutral-200 overflow-hidden; +} + +@utility sub-menu-wrapper { + @apply flex flex-col items-start gap-2 min-w-40 sm:min-w-48 w-auto max-w-full sm:flex-shrink; +} + +@utility sub-menu-item { + @apply flex gap-2 items-center px-2 py-1 w-full text-sm dark:hover:bg-coolgray-100 dark:hover:text-white hover:bg-neutral-300 rounded-sm truncate min-w-0; +} + +@utility sub-menu-item-icon { + @apply flex-shrink-0 w-4 h-4 dark:hover:text-white; } @utility heading-item-active { - @apply text-black rounded-none dark:bg-coolgray-200 dark:text-warning; + @apply text-black rounded-sm dark:bg-coolgray-200 dark:text-warning; } @utility icon { diff --git a/resources/views/components/navbar.blade.php b/resources/views/components/navbar.blade.php index e351a4480..48b544ebb 100644 --- a/resources/views/components/navbar.blade.php +++ b/resources/views/components/navbar.blade.php @@ -62,11 +62,11 @@ html { font-size: 93.75%; } - + :root { --vh: 1vh; } - + @media (min-width: 1024px) { html { font-size: 87.5%; @@ -107,19 +107,19 @@ class="px-1 py-0.5 text-xs font-semibold text-neutral-500 dark:text-neutral-400
  • - - Dashboard + Dashboard
  • - @@ -127,14 +127,14 @@ class="{{ request()->is('project/*') || request()->is('projects') ? 'menu-item m - Projects + Projects
  • - @@ -145,7 +145,7 @@ class="{{ request()->is('server/*') || request()->is('servers') ? 'menu-item men - Servers + Servers
    • @@ -153,11 +153,11 @@ class="{{ request()->is('server/*') || request()->is('servers') ? 'menu-item men - + - Sources + Sources
  • @@ -165,19 +165,19 @@ class="{{ request()->is('source*') ? 'menu-item-active menu-item' : 'menu-item' class="{{ request()->is('destination*') ? 'menu-item-active menu-item' : 'menu-item' }}" href="{{ route('destination.index') }}"> - + - Destinations + Destinations
  • - + @@ -185,14 +185,14 @@ class="{{ request()->is('storages*') ? 'menu-item-active menu-item' : 'menu-item - S3 Storages + S3 Storages
  • - + - Shared Variables + Shared Variables
  • - + - Notifications + Notifications
  • - + - Keys & Tokens + Keys & Tokens
  • - + - Tags + Tags
    • @can('canAccessTerminal') @@ -247,14 +247,14 @@ class="{{ request()->is('tags*') ? 'menu-item-active menu-item' : 'menu-item' }} - - Terminal + Terminal @endcan @@ -262,7 +262,7 @@ class="{{ request()->is('terminal*') ? 'menu-item-active menu-item' : 'menu-item - @@ -270,14 +270,14 @@ class="{{ request()->is('profile*') ? 'menu-item-active menu-item' : 'menu-item' - Profile + Profile
  • - @@ -288,7 +288,7 @@ class="{{ request()->is('team*') ? 'menu-item-active menu-item' : 'menu-item' }} - Teams + Teams
    • @if (isCloud() && auth()->user()->isAdmin()) @@ -296,12 +296,12 @@ class="{{ request()->is('team*') ? 'menu-item-active menu-item' : 'menu-item' }} - + - Subscription + Subscription @endif @@ -311,7 +311,7 @@ class="{{ request()->is('subscription*') ? 'menu-item-active menu-item' : 'menu- - @@ -319,7 +319,7 @@ class="{{ request()->is('settings*') ? 'menu-item-active menu-item' : 'menu-item d="M10.325 4.317c.426 -1.756 2.924 -1.756 3.35 0a1.724 1.724 0 0 0 2.573 1.066c1.543 -.94 3.31 .826 2.37 2.37a1.724 1.724 0 0 0 1.065 2.572c1.756 .426 1.756 2.924 0 3.35a1.724 1.724 0 0 0 -1.066 2.573c.94 1.543 -.826 3.31 -2.37 2.37a1.724 1.724 0 0 0 -2.572 1.065c-.426 1.756 -2.924 1.756 -3.35 0a1.724 1.724 0 0 0 -2.573 -1.066c-1.543 .94 -3.31 -.826 -2.37 -2.37a1.724 1.724 0 0 0 -1.065 -2.572c-1.756 -.426 -1.756 -2.924 0 -3.35a1.724 1.724 0 0 0 1.066 -2.573c-.94 -1.543 .826 -3.31 2.37 -2.37c1 .608 2.296 .07 2.572 -1.065z" /> - Settings + Settings @endif @@ -328,12 +328,12 @@ class="{{ request()->is('settings*') ? 'menu-item-active menu-item' : 'menu-item @if (isInstanceAdmin() || session('impersonating'))
  • - - Admin + Admin
    • @endif @@ -350,7 +350,7 @@ class="{{ request()->is('settings*') ? 'menu-item-active menu-item' : 'menu-item - + @@ -360,7 +360,7 @@ class="{{ request()->is('onboarding*') ? 'menu-item-active menu-item' : 'menu-it
  • - + @@ -368,7 +368,7 @@ class="{{ request()->is('onboarding*') ? 'menu-item-active menu-item' : 'menu-it d="M12 6L8.707 9.293a1 1 0 0 0 0 1.414l.543.543c.69.69 1.81.69 2.5 0l1-1a3.182 3.182 0 0 1 4.5 0l2.25 2.25m-7 3l2 2M15 13l2 2" /> - Sponsor us + Sponsor us
    • @endif @@ -380,11 +380,11 @@ class="{{ request()->is('onboarding*') ? 'menu-item-active menu-item' : 'menu-it
    - + - Feedback + Feedback
    @@ -394,11 +394,11 @@ class="{{ request()->is('onboarding*') ? 'menu-item-active menu-item' : 'menu-it
    @csrf
    diff --git a/resources/views/components/server/sidebar-proxy.blade.php b/resources/views/components/server/sidebar-proxy.blade.php index 5a76a2f1a..00bb3ee2a 100644 --- a/resources/views/components/server/sidebar-proxy.blade.php +++ b/resources/views/components/server/sidebar-proxy.blade.php @@ -1,16 +1,16 @@ -
    - + - + Configuration @if ($server->proxySet()) - - + Dynamic Configurations - - + Logs @endif
    diff --git a/resources/views/components/server/sidebar-security.blade.php b/resources/views/components/server/sidebar-security.blade.php index 995d258cf..e61d23c89 100644 --- a/resources/views/components/server/sidebar-security.blade.php +++ b/resources/views/components/server/sidebar-security.blade.php @@ -1,10 +1,10 @@ -
    - + - Server Patching + Server Patching - - Terminal Access + Terminal Access
    diff --git a/resources/views/components/server/sidebar.blade.php b/resources/views/components/server/sidebar.blade.php index e485ec545..2d7649fab 100644 --- a/resources/views/components/server/sidebar.blade.php +++ b/resources/views/components/server/sidebar.blade.php @@ -1,53 +1,51 @@ -
    - General +
    + General @if ($server->isFunctional()) - Advanced + Advanced @endif @if ($server->isFunctional() && !$server->isSwarm() && !$server->isBuildServer()) - Sentinel + Sentinel @endif - Private Key + Private Key @if ($server->hetzner_server_id) - Hetzner Token + href="{{ route('server.cloud-provider-token', ['server_uuid' => $server->uuid]) }}">Hetzner Token @endif - CA Certificate + CA Certificate @if (!$server->isLocalhost()) - Cloudflare - Tunnel + Cloudflare Tunnel @endif @if ($server->isFunctional()) - Docker Cleanup + Docker Cleanup - Destinations + Destinations - Log - Drains - Metrics + Log Drains + Metrics @endif @if (!$server->isBuildServer() && !$server->settings->is_cloudflare_tunnel) - Swarm (experimental) + Swarm (experimental) @endif @if (!$server->isLocalhost()) - Danger + Danger @endif
    diff --git a/resources/views/components/service-database/sidebar.blade.php b/resources/views/components/service-database/sidebar.blade.php index 728df3a7b..9d31fc634 100644 --- a/resources/views/components/service-database/sidebar.blade.php +++ b/resources/views/components/service-database/sidebar.blade.php @@ -4,21 +4,24 @@ 'isImportSupported' => false, ]) -
    - + - + + + + Back - General + General @if ($serviceDatabase?->isBackupSolutionAvailable() || $serviceDatabase?->is_migrated) - Backups + Backups @endif @if ($isImportSupported) - Import Backup + Import Backup @endif
    diff --git a/resources/views/components/settings/sidebar.blade.php b/resources/views/components/settings/sidebar.blade.php index 8b564880c..0a68a9155 100644 --- a/resources/views/components/settings/sidebar.blade.php +++ b/resources/views/components/settings/sidebar.blade.php @@ -1,8 +1,8 @@ -
    - General - Advanced - Updates +
    + General + Advanced + Updates
    diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index 0ef021458..93d6fe413 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -22,7 +22,7 @@