diff --git a/resources/sass/bo/base/_common.scss b/resources/sass/bo/base/_common.scss index 56971d2..1ceaeab 100644 --- a/resources/sass/bo/base/_common.scss +++ b/resources/sass/bo/base/_common.scss @@ -52,6 +52,42 @@ body { width: fit-content; } +#search-form { + .input-group-text { + border-radius: var(--bs-border-radius) var(--bs-border-radius) 0 0 !important; + border-bottom: 0; + + @include media-breakpoint-up(md) { + border-radius: var(--bs-border-radius) 0 0 var(--bs-border-radius) !important; + border-bottom: var(--bs-border-width) solid var(--bs-border-color) !important; + } + } + + .form-control { + @include media-breakpoint-up(md) { + width: 1% !important; + } + } + + .btn { + &-primary { + border-radius: 0 0 0 var(--bs-border-radius) !important; + + @include media-breakpoint-up(md) { + border-radius: 0 !important; + } + } + + &-danger { + border-radius: 0 0 var(--bs-border-radius) 0 !important; + + @include media-breakpoint-up(md) { + border-radius: 0 var(--bs-border-radius) var(--bs-border-radius) 0 !important; + } + } + } +} + .btn-md { height: 38px; } diff --git a/resources/sass/bo/utilities/_bootstrap-custom.scss b/resources/sass/bo/utilities/_bootstrap-custom.scss index eacbc01..10305dc 100644 --- a/resources/sass/bo/utilities/_bootstrap-custom.scss +++ b/resources/sass/bo/utilities/_bootstrap-custom.scss @@ -8,6 +8,9 @@ @include generate-bs-borders($infix, $prefix); + .w#{$infix}-fit { + width: fit-content !important; + } .w#{$infix}-25 { width: 25% !important; } diff --git a/resources/views/bo/modules/search-bar.blade.php b/resources/views/bo/modules/search-bar.blade.php index f8f7c62..69b8583 100644 --- a/resources/views/bo/modules/search-bar.blade.php +++ b/resources/views/bo/modules/search-bar.blade.php @@ -1,44 +1,35 @@ -@php - $iArgs = []; - if (request()->sort_col) { - $iArgs['sort_col'] = request()->sort_col; - } - - if (request()->search) { - $iArgs['search'] = request()->sort_way; - } -@endphp