Skip to content
This repository was archived by the owner on Mar 18, 2025. It is now read-only.

Commit 007951f

Browse files
rawilkrawilk
committed
Fix issues with leading addons
1 parent b5a945f commit 007951f

File tree

45 files changed

+63
-51
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+63
-51
lines changed

‎resources/js/laravel-form-components-styles/dist/styles.css‎

Lines changed: 8 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎resources/js/laravel-form-components-styles/src/styles.css‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,11 @@ select[disabled] {
140140
}
141141
/* purgecss end ignore */
142142

143+
/* addon */
144+
.leading-addon svg {
145+
@apply h-5 w-5;
146+
}
147+
143148
/* select */
144149
.form-select[multiple] {
145150
background-image: none;

‎resources/views/partials/leading-addons.blade.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
@if ($leadingAddon)
22
<span class="leading-addon inline-flex items-center px-3 rounded-l-md border border-r-0 border-blue-gray-300 bg-blue-gray-50 text-blue-gray-500 sm:text-sm">
3-
<span class="h-5 w-5 text-blue-gray-400">
3+
<span class="text-blue-gray-400">
44
{!! $leadingAddon !!}
55
</span>
66
</span>

‎src/Components/Inputs/Input.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public function inputClass(): string
6262
return collect([
6363
'form-input',
6464
'form-text',
65-
'flex-1 block w-full px-3 py-2 border-blue-gray-300 rounded-md placeholder-blue-gray-400 sm:text-sm',
65+
'flex-1 block w-full px-3 py-2 border-blue-gray-300 placeholder-blue-gray-400 sm:text-sm',
6666
$this->isPasswordToggleable() ? null : 'focus:border-blue-300 focus:ring-opacity-50 focus:ring-4 focus:ring-blue-400',
6767
$this->getAddonClass(),
6868
$this->hasErrorsAndShow($this->name) ? 'input-error' : null,

‎src/Concerns/HasAddons.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ protected function leadingAddonClass(): null|string
2828
}
2929

3030
if ($this->inlineAddon) {
31-
return $this->inlineAddonPadding;
31+
return $this->inlineAddonPadding . ' rounded-md';
3232
}
3333

34-
return $this->leadingIcon ? 'has-leading-icon pl-10' : null;
34+
return $this->leadingIcon ? 'has-leading-icon pl-10 rounded-md' : null;
3535
}
3636

3737
protected function trailingAddonClass(): null|string

‎tests/Components/Inputs/__snapshots__/EmailTest__can_be_rendered__1.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<div class="form-text-container flex rounded-sm shadow-sm relative">
22

33
<input
4-
class="form-input form-text flex-1 block w-full px-3 py-2 border-blue-gray-300 rounded-md placeholder-blue-gray-400 sm:text-sm focus:border-blue-300 focus:ring-opacity-50 focus:ring-4 focus:ring-blue-400"
4+
class="form-input form-text flex-1 block w-full px-3 py-2 border-blue-gray-300 placeholder-blue-gray-400 sm:text-sm focus:border-blue-300 focus:ring-opacity-50 focus:ring-4 focus:ring-blue-400"
55

66

77
name="email" id="email" type="email"

‎tests/Components/Inputs/__snapshots__/EmailTest__email_type_will_not_be_overridden__1.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<div class="form-text-container flex rounded-sm shadow-sm relative">
22

33
<input
4-
class="form-input form-text flex-1 block w-full px-3 py-2 border-blue-gray-300 rounded-md placeholder-blue-gray-400 sm:text-sm focus:border-blue-300 focus:ring-opacity-50 focus:ring-4 focus:ring-blue-400 custom-class"
4+
class="form-input form-text flex-1 block w-full px-3 py-2 border-blue-gray-300 placeholder-blue-gray-400 sm:text-sm focus:border-blue-300 focus:ring-opacity-50 focus:ring-4 focus:ring-blue-400 custom-class"
55

66

77
name="foo" id="bar" type="email"

‎tests/Components/Inputs/__snapshots__/InputTest__accepts_a_container_class__1.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<div class="form-text-container flex rounded-sm shadow-sm relative foo">
22

33
<input
4-
class="form-input form-text flex-1 block w-full px-3 py-2 border-blue-gray-300 rounded-md placeholder-blue-gray-400 sm:text-sm focus:border-blue-300 focus:ring-opacity-50 focus:ring-4 focus:ring-blue-400"
4+
class="form-input form-text flex-1 block w-full px-3 py-2 border-blue-gray-300 placeholder-blue-gray-400 sm:text-sm focus:border-blue-300 focus:ring-opacity-50 focus:ring-4 focus:ring-blue-400"
55

66

77
name="name" id="name" type="text"

‎tests/Components/Inputs/__snapshots__/InputTest__can_be_rendered__1.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<div class="form-text-container flex rounded-sm shadow-sm relative">
22

33
<input
4-
class="form-input form-text flex-1 block w-full px-3 py-2 border-blue-gray-300 rounded-md placeholder-blue-gray-400 sm:text-sm focus:border-blue-300 focus:ring-opacity-50 focus:ring-4 focus:ring-blue-400"
4+
class="form-input form-text flex-1 block w-full px-3 py-2 border-blue-gray-300 placeholder-blue-gray-400 sm:text-sm focus:border-blue-300 focus:ring-opacity-50 focus:ring-4 focus:ring-blue-400"
55

66

77
name="search" id="search" type="text"

‎tests/Components/Inputs/__snapshots__/InputTest__can_have_a_max_width_set_on_the_container__1.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<div class="form-text-container flex rounded-sm shadow-sm relative max-w-sm">
22

33
<input
4-
class="form-input form-text flex-1 block w-full px-3 py-2 border-blue-gray-300 rounded-md placeholder-blue-gray-400 sm:text-sm focus:border-blue-300 focus:ring-opacity-50 focus:ring-4 focus:ring-blue-400"
4+
class="form-input form-text flex-1 block w-full px-3 py-2 border-blue-gray-300 placeholder-blue-gray-400 sm:text-sm focus:border-blue-300 focus:ring-opacity-50 focus:ring-4 focus:ring-blue-400"
55

66

77
name="name" id="name" type="text"

0 commit comments

Comments
 (0)