Skip to content

Commit 9ae68f0

Browse files
committed
More color tweaks
1 parent 36415a1 commit 9ae68f0

File tree

13 files changed

+88
-75
lines changed

13 files changed

+88
-75
lines changed

app/Http/Controllers/Api/ManufacturersController.php

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,10 +78,16 @@ public function index(Request $request) : JsonResponse | array
7878
$manufacturers->onlyTrashed();
7979
}
8080

81+
if ($request->input('status') == 'deleted') {
82+
$manufacturers->onlyTrashed();
83+
}
84+
8185
if ($request->filled('search')) {
8286
$manufacturers = $manufacturers->TextSearch($request->input('search'));
8387
}
8488

89+
90+
8591
if ($request->filled('name')) {
8692
$manufacturers->where('name', '=', $request->input('name'));
8793
}

public/css/build/app.css

Lines changed: 2 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/css/build/app.css.map

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

public/css/build/overrides.css

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

public/css/build/overrides.css.map

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

public/css/dist/all.css

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

public/mix-manifest.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
2-
"/js/dist/all.js": "/js/dist/all.js?id=1c72002abd039fabdc1f3a9d9da62df4",
3-
"/css/build/overrides.css": "/css/build/overrides.css?id=daa3aebd728b8eacda296bed8f821b41",
4-
"/css/build/app.css": "/css/build/app.css?id=a2746dbbbc89f658e7cd68932e10f15a",
2+
"/js/dist/all.js": "/js/dist/all.js?id=584e7af6b28899d4794d25aef996d231",
3+
"/css/build/overrides.css": "/css/build/overrides.css?id=69b145f1bb0fb5c3de63350ef73207b4",
4+
"/css/build/app.css": "/css/build/app.css?id=ca045cda8d9164ddb2f7a0ec6fd92a40",
55
"/css/build/AdminLTE.css": "/css/build/AdminLTE.css?id=ee0ed88465dd878588ed044eefb67723",
6-
"/css/dist/all.css": "/css/dist/all.css?id=cc973571eb859e27362ef3495f5ba19f",
6+
"/css/dist/all.css": "/css/dist/all.css?id=6b276946025b2c383b315d655683db02",
77
"/css/dist/signature-pad.css": "/css/dist/signature-pad.css?id=6a89d3cd901305e66ced1cf5f13147f7",
88
"/css/dist/signature-pad.min.css": "/css/dist/signature-pad.min.css?id=6a89d3cd901305e66ced1cf5f13147f7",
99
"/js/select2/i18n/af.js": "/js/select2/i18n/af.js?id=4f6fcd73488ce79fae1b7a90aceaecde",

resources/assets/less/app.less

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -423,10 +423,7 @@ img.navbar-brand-img,
423423
border-radius: 0px;
424424
}
425425

426-
.btn.bg-maroon,
427-
.btn.bg-purple {
428-
min-width: 90px;
429-
}
426+
430427

431428
[hidden] {
432429
display: none !important;

resources/assets/less/overrides.less

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -503,10 +503,11 @@ img.navbar-brand-img, .navbar-brand>img {
503503
border-radius: 0px !important;
504504
}
505505

506-
.btn.bg-maroon, .btn.bg-purple{
506+
.btn-checkin, .btn-checkout {
507507
min-width:90px;
508508
}
509509

510+
510511
[hidden] {
511512
display: none !important;
512513
}

resources/views/components/tables/bulk-actions.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ class="form-inline"
2929
{{ $slot }}
3030
</select>
3131

32-
<button class="btn btn-primary" id="{{ $id_button }}"
32+
<button class="btn btn-theme" id="{{ $id_button }}"
3333
disabled>{{ trans('button.go') }}</button>
3434
</form>
3535
</div>

0 commit comments

Comments
 (0)