Skip to content

Commit fe7c82e

Browse files
muratcakirmuratcakir
committed
ABS4: .card-block > .card.body
1 parent 56eebe5 commit fe7c82e

26 files changed

Lines changed: 38 additions & 33 deletions

File tree

‎src/Plugins/SmartStore.AmazonPay/Views/AmazonPayShoppingCart/OrderReviewData.cshtml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
Html.AddCssFileParts(true, Url.Content("~/Plugins/SmartStore.AmazonPay/Content/SmartStore.AmazonPay.css"));
66
}
77

8-
<div class="card card-block order-review-data-box mb-3">
8+
<div class="card card-body order-review-data-box mb-3">
99
<div class="row">
1010
<div class="col-md-12">
1111
<div class="row">

‎src/Presentation/SmartStore.Web.Framework/UI/Components/Enums.cs‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,15 @@ namespace SmartStore.Web.Framework.UI
44
{
55
public enum BadgeStyle
66
{
7-
Default,
7+
Secondary,
88
Primary,
99
Success,
1010
Info,
1111
Warning,
12-
Danger
13-
}
12+
Danger,
13+
Light,
14+
Dark
15+
}
1416

1517
public enum ButtonStyle
1618
{

‎src/Presentation/SmartStore.Web.Framework/UI/Components/NavigationItemBuilder.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ public TBuilder Summary(string value)
151151
return (this as TBuilder);
152152
}
153153

154-
public TBuilder Badge(string value, BadgeStyle style = BadgeStyle.Default, bool condition = true)
154+
public TBuilder Badge(string value, BadgeStyle style = BadgeStyle.Secondary, bool condition = true)
155155
{
156156
if (condition)
157157
{

‎src/Presentation/SmartStore.Web/Content/shared/_card.scss‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@
1717
box-shadow: 0 0 3px rgba(#000, .1);
1818
}
1919

20-
.card-block > p:last-child {
20+
.card-body > p:last-child {
2121
margin-bottom: 0;
2222
}
2323

2424
.card-footer .btn {
2525
font-weight: 400;
2626
}
2727

28-
.card-block > *:last-child {
28+
.card-body > *:last-child {
2929
margin-bottom: 0 !important;
3030
}
3131

‎src/Presentation/SmartStore.Web/Content/shared/_nav.scss‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,10 @@
6161
display: none;
6262
}
6363

64+
.badge {
65+
vertical-align: text-top;
66+
}
67+
6468
@include media-breakpoint-up(lg) {
6569
> i, > img {
6670
display: inline-block;

‎src/Presentation/SmartStore.Web/Content/shared/_offcanvas.scss‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,6 @@ body.canvas-blocking .canvas-blocker {
210210
position: relative;
211211
right: 0;
212212
top: 0;
213-
vertical-align: text-top;
214213
}
215214
}
216215

‎src/Presentation/SmartStore.Web/Views/Blog/Partials/BlogMonths.cshtml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<h5 class="card-header">
88
@T("Blog.Archive")
99
</h5>
10-
<div class="listbox card-block py-1">
10+
<div class="listbox card-body py-1">
1111
<ul id="blog-month-list" class="list-unstyled">
1212
@foreach (var yearItem in Model)
1313
{

‎src/Presentation/SmartStore.Web/Views/Blog/Partials/BlogTags.cshtml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<h5 class="card-header">
88
@T("Blog.TagCloud")
99
</h5>
10-
<div class="listbox card-block">
10+
<div class="listbox card-body">
1111
<div class="tags fs-h4">
1212
<ul class="list-inline">
1313
@foreach (var item in Model.Tags)

‎src/Presentation/SmartStore.Web/Views/Boards/Partials/_ForumPost.cshtml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
</div>
4242
</div>
4343

44-
<div class="block-body card-block row">
44+
<div class="block-body card-body row">
4545
<div class="post-info col-3 d-none d-sm-block">
4646
<div class="user-info mt-3 text-center">
4747
@if (!String.IsNullOrEmpty(Model.CustomerAvatarUrl))

‎src/Presentation/SmartStore.Web/Views/Checkout/BillingAddress.cshtml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<div class="card-deck card-cols-sm-1 card-cols-md-2 card-cols-lg-3 address-list">
2626
@foreach (var item in Model.ExistingAddresses)
2727
{
28-
<div class="card card-block address-list-item">
28+
<div class="card card-body address-list-item">
2929
<div class="address-item">
3030
<button class="btn btn-warning btn-block select-billing-address-button" onclick="setLocation('@Url.Action("SelectBillingAddress", new { addressId = item.Id })')">
3131
<span>@T("Checkout.BillToThisAddress")</span>

0 commit comments

Comments
 (0)