Skip to content

Commit

Permalink
Merge pull request #15 from hafijul233/develop
Browse files Browse the repository at this point in the history
inline default icon space issue fixed testing
  • Loading branch information
hafijul233 authored Mar 5, 2022
2 parents 2a699a6 + 24a29d1 commit 5a9e9c5
Show file tree
Hide file tree
Showing 13 changed files with 301 additions and 257 deletions.
43 changes: 23 additions & 20 deletions resources/views/bootstrap4/inline/date.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,29 +10,32 @@
$options['required'] = 'required'
@endphp

<div class="input-group">
@if(isset($position) && $position == 'before')
<div class="input-group-prepend">
<div class="input-group-text">
@if(!empty($icon))
<span class="{{ $icon }}"></span>
@endif
@if(!empty($icon))
<div class="input-group">
@if(isset($position) && $position == 'before')
<div class="input-group-prepend">
<div class="input-group-text">
@if(!empty($icon))
<span class="{{ $icon }}"></span>
@endif
</div>
</div>
</div>
@endif
@endif

{!! Form::date($name, $default, array_merge($options, $attributes)) !!}
{!! Form::date($name, $default, array_merge($options, $attributes)) !!}

@if(isset($position) && $position == 'after')
<div class="input-group-append">
<div class="input-group-text">
@if(!empty($icon))
<span class="{{ $icon }}"></span>
@endif
@if(isset($position) && $position == 'after')
<div class="input-group-append">
<div class="input-group-text">
@if(!empty($icon))
<span class="{{ $icon }}"></span>
@endif
</div>
</div>
</div>
@endif
</div>

@endif
</div>
@else
{!! Form::date($name, $default, array_merge($options, $attributes)) !!}
@endif
{!! Form::nError($name, $msg) !!}
</div>
44 changes: 24 additions & 20 deletions resources/views/bootstrap4/inline/email.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,29 +9,33 @@
if(isset($required) && $required == true)
$options['required'] = 'required';
@endphp
<div class="input-group">
@if(isset($position) && $position == 'before')
<div class="input-group-prepend">
<div class="input-group-text">
@if(!empty($icon))
<span class="{{ $icon }}"></span>
@endif

@if(!empty($icon))
<div class="input-group">
@if(isset($position) && $position == 'before')
<div class="input-group-prepend">
<div class="input-group-text">
@if(!empty($icon))
<span class="{{ $icon }}"></span>
@endif
</div>
</div>
</div>
@endif
@endif

{!! Form::email($name, $default, array_merge($options, $attributes)) !!}
{!! Form::email($name, $default, array_merge($options, $attributes)) !!}

@if(isset($position) && $position == 'after')
<div class="input-group-append">
<div class="input-group-text">
@if(!empty($icon))
<span class="{{ $icon }}"></span>
@endif
@if(isset($position) && $position == 'after')
<div class="input-group-append">
<div class="input-group-text">
@if(!empty($icon))
<span class="{{ $icon }}"></span>
@endif
</div>
</div>
</div>
@endif
</div>

@endif
</div>
@else
{!! Form::email($name, $default, array_merge($options, $attributes)) !!}
@endif
{!! Form::nError($name, $msg) !!}
</div>
43 changes: 24 additions & 19 deletions resources/views/bootstrap4/inline/number.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,28 +10,33 @@
$options['required'] = 'required'
@endphp

<div class="input-group">
@if(isset($position) && $position == 'before')
<div class="input-group-prepend">
<div class="input-group-text">
@if(!empty($icon))
<span class="{{ $icon }}"></span>
@endif
@if(!empty($icon))
<div class="input-group">
@if(isset($position) && $position == 'before')
<div class="input-group-prepend">
<div class="input-group-text">
@if(!empty($icon))
<span class="{{ $icon }}"></span>
@endif
</div>
</div>
</div>
@endif
@endif

{!! Form::number($name, $default, array_merge($options, $attributes)) !!}
{!! Form::number($name, $default, array_merge($options, $attributes)) !!}

@if(isset($position) && $position == 'after')
<div class="input-group-append">
<div class="input-group-text">
@if(!empty($icon))
<span class="{{ $icon }}"></span>
@endif
@if(isset($position) && $position == 'after')
<div class="input-group-append">
<div class="input-group-text">
@if(!empty($icon))
<span class="{{ $icon }}"></span>
@endif
</div>
</div>
</div>
@endif
</div>
@endif
</div>
@else
{!! Form::number($name, $default, array_merge($options, $attributes)) !!}
@endif

{!! Form::nError($name, $msg) !!}
</div>
43 changes: 23 additions & 20 deletions resources/views/bootstrap4/inline/password.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,29 +10,32 @@
$options['required'] = 'required'
@endphp

<div class="input-group">
@if(isset($position) && $position == 'before')
<div class="input-group-prepend">
<div class="input-group-text">
@if(!empty($icon))
<span class="{{ $icon }}"></span>
@endif
@if(!empty($icon))
<div class="input-group">
@if(isset($position) && $position == 'before')
<div class="input-group-prepend">
<div class="input-group-text">
@if(!empty($icon))
<span class="{{ $icon }}"></span>
@endif
</div>
</div>
</div>
@endif
@endif

{!! Form::password($name, array_merge($options, $attributes)) !!}
{!! Form::password($name, array_merge($options, $attributes)) !!}

@if(isset($position) && $position == 'after')
<div class="input-group-append">
<div class="input-group-text">
@if(!empty($icon))
<span class="{{ $icon }}"></span>
@endif
@if(isset($position) && $position == 'after')
<div class="input-group-append">
<div class="input-group-text">
@if(!empty($icon))
<span class="{{ $icon }}"></span>
@endif
</div>
</div>
</div>
@endif
</div>

@endif
</div>
@else
{!! Form::password($name, array_merge($options, $attributes)) !!}
@endif
{!! Form::nError($name, $msg) !!}
</div>
43 changes: 23 additions & 20 deletions resources/views/bootstrap4/inline/search.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,29 +10,32 @@
$options['required'] = 'required'
@endphp

<div class="input-group">
@if(isset($position) && $position == 'before')
<div class="input-group-prepend">
<div class="input-group-text">
@if(!empty($icon))
<span class="{{ $icon }}"></span>
@endif
@if(!empty($icon))
<div class="input-group">
@if(isset($position) && $position == 'before')
<div class="input-group-prepend">
<div class="input-group-text">
@if(!empty($icon))
<span class="{{ $icon }}"></span>
@endif
</div>
</div>
</div>
@endif
@endif

{!! Form::search($name, $default, array_merge($options, $attributes)) !!}
{!! Form::search($name, $default, array_merge($options, $attributes)) !!}

@if(isset($position) && $position == 'after')
<div class="input-group-append">
<div class="input-group-text">
@if(!empty($icon))
<span class="{{ $icon }}"></span>
@endif
@if(isset($position) && $position == 'after')
<div class="input-group-append">
<div class="input-group-text">
@if(!empty($icon))
<span class="{{ $icon }}"></span>
@endif
</div>
</div>
</div>
@endif
</div>

@endif
</div>
@else
{!! Form::search($name, $default, array_merge($options, $attributes)) !!}
@endif
{!! Form::nError($name, $msg) !!}
</div>
43 changes: 23 additions & 20 deletions resources/views/bootstrap4/inline/select.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,29 +10,32 @@
$options['required'] = 'required'
@endphp

<div class="input-group">
@if(isset($position) && $position == 'before')
<div class="input-group-prepend">
<div class="input-group-text">
@if(!empty($icon))
<span class="{{ $icon }}"></span>
@endif
@if(!empty($icon))
<div class="input-group">
@if(isset($position) && $position == 'before')
<div class="input-group-prepend">
<div class="input-group-text">
@if(!empty($icon))
<span class="{{ $icon }}"></span>
@endif
</div>
</div>
</div>
@endif
@endif

{!! Form::select($name, $data, $selected, array_merge($options, $attributes)) !!}
{!! Form::select($name, $data, $selected, array_merge($options, $attributes)) !!}

@if(isset($position) && $position == 'after')
<div class="input-group-append">
<div class="input-group-text">
@if(!empty($icon))
<span class="{{ $icon }}"></span>
@endif
@if(isset($position) && $position == 'after')
<div class="input-group-append">
<div class="input-group-text">
@if(!empty($icon))
<span class="{{ $icon }}"></span>
@endif
</div>
</div>
</div>
@endif
</div>

@endif
</div>
@else
{!! Form::select($name, $data, $selected, array_merge($options, $attributes)) !!}
@endif
{!! Form::nError($name, $msg) !!}
</div>
43 changes: 23 additions & 20 deletions resources/views/bootstrap4/inline/selectmonth.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,29 +10,32 @@
$options['required'] = 'required'
@endphp

<div class="input-group">
@if(isset($position) && $position == 'before')
<div class="input-group-prepend">
<div class="input-group-text">
@if(!empty($icon))
<span class="{{ $icon }}"></span>
@endif
@if(!empty($icon))
<div class="input-group">
@if(isset($position) && $position == 'before')
<div class="input-group-prepend">
<div class="input-group-text">
@if(!empty($icon))
<span class="{{ $icon }}"></span>
@endif
</div>
</div>
</div>
@endif
@endif

{!! Form::select($name, config('form.months'), $selected, array_merge($options, $attributes)) !!}
{!! Form::select($name, config('form.months'), $selected, array_merge($options, $attributes)) !!}

@if(isset($position) && $position == 'after')
<div class="input-group-append">
<div class="input-group-text">
@if(!empty($icon))
<span class="{{ $icon }}"></span>
@endif
@if(isset($position) && $position == 'after')
<div class="input-group-append">
<div class="input-group-text">
@if(!empty($icon))
<span class="{{ $icon }}"></span>
@endif
</div>
</div>
</div>
@endif
</div>

@endif
</div>
@else
{!! Form::select($name, config('form.months'), $selected, array_merge($options, $attributes)) !!}
@endif
{!! Form::nError($name, $msg) !!}
</div>
Loading

0 comments on commit 5a9e9c5

Please sign in to comment.