Skip to content

Commit 0ce64f4

Browse files
committed
Merge branch 'add-modal-form-examples' of github.com:Laravel-Backpack/demo into add-modal-form-examples
2 parents 03bfe14 + d6220fc commit 0ce64f4

File tree

3 files changed

+17
-17
lines changed

3 files changed

+17
-17
lines changed

app/Http/Controllers/Admin/MonsterCrudController.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,10 +132,10 @@ public function setupListOperation()
132132
'element' => 'span',
133133
'class' => function ($crud, $column, $entry, $related_key) {
134134
if ($column['text'] == 'Yes') {
135-
return 'badge rounded-pill bg-success';
135+
return 'badge rounded-pill bg-success text-white';
136136
}
137137

138-
return 'badge rounded-pill bg-danger';
138+
return 'badge rounded-pill bg-danger text-white';
139139
},
140140
],
141141
],

app/helpers.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
*/
1111
function backpack_pro_badge(string $string = 'PRO')
1212
{
13-
return '<a href="https://backpackforlaravel.com/pricing" target="_blank" class="badge badge-pill bg-primary mx-2" tabindex="-1">'.$string.'</a>';
13+
return '<a href="https://backpackforlaravel.com/pricing" target="_blank" class="badge badge-pill badge-sm bg-primary bg-primary-lt mx-2" tabindex="-1">'.$string.'</a>';
1414
}
1515
}
1616

@@ -24,7 +24,7 @@ function backpack_pro_badge(string $string = 'PRO')
2424
*/
2525
function backpack_new_badge(string $string = 'NEW')
2626
{
27-
return '<span class="badge badge-pill bg-warning mx-2">'.$string.'</span>';
27+
return '<span class="badge badge-pill badge-sm bg-warning bg-warning-lt mx-2">'.$string.'</span>';
2828
}
2929
}
3030

@@ -38,6 +38,6 @@ function backpack_new_badge(string $string = 'NEW')
3838
*/
3939
function backpack_free_badge(string $string = 'FREE')
4040
{
41-
return '<span class="badge badge-pill bg-success mx-2">'.$string.'</span>';
41+
return '<span class="badge badge-pill badge-sm bg-success bg-success-lt mx-2">'.$string.'</span>';
4242
}
4343
}

resources/views/admin/partials/dataform-examples.blade.php

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ class="icon icon-1">
4747
Quick Add Tag
4848
</h3>
4949
</div>
50-
<div class="card-body bg-light">
50+
<div class="card-body">
5151

5252
<x-backpack::dataform
5353
id="quickAddTag"
@@ -68,7 +68,7 @@ class="icon icon-1">
6868
Quick Edit Tag
6969
</h3>
7070
</div>
71-
<div class="card-body bg-light">
71+
<div class="card-body">
7272

7373
<x-backpack::dataform
7474
id="quickEditTag"
@@ -91,14 +91,14 @@ class="icon icon-1">
9191
Quick Add Invoice in a Modal
9292
</h3>
9393
</div>
94-
<div class="card-body bg-light">
94+
<div class="card-body">
9595

96-
<button
97-
type="button"
98-
class="btn btn-primary"
96+
<button
97+
type="button"
98+
class="btn btn-primary"
9999
data-bs-toggle="modal"
100100
data-bs-target="#create_invoice"
101-
bp-button="create"
101+
bp-button="create"
102102
data-style="zoom-in"
103103
>
104104
<i class="la la-plus"></i> <span>Create Invoice</span>
@@ -115,10 +115,10 @@ class="btn btn-primary"
115115
Quick Edit Invoice in a Modal
116116
</h3>
117117
</div>
118-
<div class="card-body bg-light">
119-
<button
120-
type="button"
121-
class="btn btn-primary"
118+
<div class="card-body">
119+
<button
120+
type="button"
121+
class="btn btn-primary"
122122
data-bs-toggle="modal"
123123
data-bs-target="#edit_invoice"
124124
bp-button="create"
@@ -136,4 +136,4 @@ class="btn btn-primary"
136136
</div>
137137
</div>
138138
</div>
139-
</div>
139+
</div>

0 commit comments

Comments
 (0)