Skip to content

Commit

Permalink
Merge pull request #739 from enricodias/dev
Browse files Browse the repository at this point in the history
  • Loading branch information
codecalm committed Dec 19, 2020
2 parents 3d9a520 + e6c09ab commit aec7fb5
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 1 deletion.
7 changes: 6 additions & 1 deletion src/pages/_includes/cards/card-tabs.html
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,12 @@
{% endcapture %}

<!-- Cards with tabs component -->
<div class="card-tabs">
<div class="
card-tabs
{% if include.borderless %}
border-0
{% endif %}
">
{% if include.bottom %}
{{ tabs-content-html }}
{{ tabs-html }}
Expand Down
2 changes: 2 additions & 0 deletions src/pages/cards.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
<div class="col-md-6 col-xl-4">
<div class="row row-cards">
<div class="col-12">{% include cards/card.html body="This is some text within a card body." %}</div>
<div class="col-12 border-0">{% include cards/card.html body="This is a borderless card." %}</div>
<div class="col-12">{% include cards/card.html img-bottom=true title="Card with bottom image" %}</div>
<div class="col-12">{% include cards/card.html active=true body="This is a card with active state." %}</div>
<div class="col-12">{% include cards/card.html inactive=true body="This is some text inactive state." %}</div>
Expand All @@ -18,6 +19,7 @@
<div class="col-12">{% include cards/card.html progress=true title="Card with progress bar" %}</div>
<div class="col-12">{% include cards/card.html empty=true %}</div>
<div class="col-12">{% include cards/card-tabs.html count=4 %}</div>
<div class="col-12">{% include cards/card-tabs.html count=4 borderless=true id="borderless" %}</div>
<div class="col-12">{% include cards/card-tabs.html count=4 bottom=true id="bottom" %}</div>
</div>
</div>
Expand Down
13 changes: 13 additions & 0 deletions src/scss/ui/_cards.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
.border-0 {

.card, .nav-link {
border: 0 !important;
}

.card-stacked::after {
border: 1px solid rgba($text-muted, 0.07) !important;
}

}

.card {
box-shadow: $card-shadow;
border: $card-border-width solid $card-border-color;
Expand Down Expand Up @@ -42,6 +54,7 @@
.card-active {
position: relative;
background-color: rgba($primary, .03);
z-index: 1;

&:before {
position: absolute;
Expand Down

0 comments on commit aec7fb5

Please sign in to comment.