Skip to content

An open-source, self-hostable PaaS alternative to Vercel, Heroku & Netlify that lets you easily deploy static sites, databases, full-stack applications and 360+ one-click services on your own servers.

fix(environment-variable): align settings and actions responsively

Andras Bacsai198e9f8fff37
diff --git a/resources/views/livewire/project/shared/environment-variable/show.blade.php b/resources/views/livewire/project/shared/environment-variable/show.blade.php
index fd9acdaf82..76cfcead65 100644
--- a/resources/views/livewire/project/shared/environment-variable/show.blade.php
+++ b/resources/views/livewire/project/shared/environment-variable/show.blade.php
@@ -217,8 +217,9 @@
</div>
@endcan
@can('update', $this->env)
- <div class="flex flex-col w-full gap-3">
- <div class="flex flex-wrap w-full items-center gap-4">
+ <div class="flex w-full flex-col gap-3 lg:flex-row lg:items-start lg:justify-between">
+ <div class="flex min-w-0 flex-1 flex-col gap-3">
+ <div class="flex flex-wrap w-full items-center gap-4">
@if (!$is_redis_credential)
@if ($type === 'service')
@if (!$isMagicVariable)
@@ -266,10 +267,11 @@
@endif
@endif
@endif
+ </div>
+ <x-environment-variable-warning :problematic-variables="$problematicVariables" />
</div>
- <x-environment-variable-warning :problematic-variables="$problematicVariables" />
@if (!$isMagicVariable)
- <div class="flex w-full justify-end gap-2">
+ <div class="flex w-full justify-end gap-2 lg:w-auto lg:shrink-0">
@if ($isDisabled)
<x-forms.button disabled type="submit">Update</x-forms.button>
<x-forms.button wire:click='lock'>Lock</x-forms.button>
@@ -291,7 +293,7 @@
@endif
</div>
@elseif ($type === 'service')
- <div class="flex w-full justify-end gap-2">
+ <div class="flex w-full justify-end gap-2 lg:w-auto lg:shrink-0">
<x-forms.button wire:click='lock'>Lock</x-forms.button>
</div>
@endif
diff --git a/tests/Feature/EnvironmentVariableMultilineToggleViewTest.php b/tests/Feature/EnvironmentVariableMultilineToggleViewTest.php
index 8af9c69d57..9d0b1c5b5a 100644
--- a/tests/Feature/EnvironmentVariableMultilineToggleViewTest.php
+++ b/tests/Feature/EnvironmentVariableMultilineToggleViewTest.php
@@ -27,6 +27,14 @@ it('keeps the environment variable delete button compact', function () {
expect($view)->not->toContain('buttonFullWidth="true"');
});
+it('aligns environment variable settings and actions in a responsive row', function () {
+ $view = file_get_contents(resource_path('views/livewire/project/shared/environment-variable/show.blade.php'));
+
+ expect($view)
+ ->toContain('class="flex w-full flex-col gap-3 lg:flex-row lg:items-start lg:justify-between"')
+ ->toContain('class="flex w-full justify-end gap-2 lg:w-auto lg:shrink-0"');
+});
+
it('uses sans font for the developer bulk environment variable editor', function () {
$view = file_get_contents(resource_path('views/livewire/project/shared/environment-variable/all.blade.php'));