Skip to content

Commit 955e040

Browse files
committed
fuck around with card borders and more
1 parent 94e27cd commit 955e040

File tree

4 files changed

+125
-17
lines changed

4 files changed

+125
-17
lines changed

docs/components/card.md

Lines changed: 83 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -211,6 +211,89 @@ Add an optional header and/or footer within a card.
211211
</div>
212212
{% endexample %}
213213

214+
## Heading nav
215+
216+
- Custom card nav (full width)
217+
- Tabs
218+
- Pills
219+
- Alignment:
220+
- left
221+
- center
222+
- right
223+
224+
{% example html %}
225+
<div class="card text-xs-center">
226+
<div class="card-header">
227+
<ul class="nav card-nav">
228+
<li class="nav-item">
229+
<a class="nav-link active" href="#">Active</a>
230+
</li>
231+
<li class="nav-item">
232+
<a class="nav-link" href="#">Link</a>
233+
</li>
234+
<li class="nav-item">
235+
<a class="nav-link disabled" href="#">Disabled</a>
236+
</li>
237+
</ul>
238+
</div>
239+
<div class="card-block">
240+
<h4 class="card-title">Special title treatment</h4>
241+
<p class="card-text">With supporting text below as a natural lead-in to additional content.</p>
242+
<a href="#" class="btn btn-primary">Go somewhere</a>
243+
</div>
244+
</div>
245+
{% endexample %}
246+
247+
248+
249+
Or, use Bootstrap's nav pills or tabs to a card header. Be sure to always include a `.pull-*-*` utility class for proper alignment.
250+
251+
{% example html %}
252+
<div class="card text-xs-center">
253+
<div class="card-header">
254+
<ul class="nav nav-tabs card-header-tabs pull-xs-left">
255+
<li class="nav-item">
256+
<a class="nav-link active" href="#">Active</a>
257+
</li>
258+
<li class="nav-item">
259+
<a class="nav-link" href="#">Link</a>
260+
</li>
261+
<li class="nav-item">
262+
<a class="nav-link disabled" href="#">Disabled</a>
263+
</li>
264+
</ul>
265+
</div>
266+
<div class="card-block">
267+
<h4 class="card-title">Special title treatment</h4>
268+
<p class="card-text">With supporting text below as a natural lead-in to additional content.</p>
269+
<a href="#" class="btn btn-primary">Go somewhere</a>
270+
</div>
271+
</div>
272+
{% endexample %}
273+
274+
{% example html %}
275+
<div class="card text-xs-center">
276+
<div class="card-header">
277+
<ul class="nav nav-pills card-header-pills pull-xs-left">
278+
<li class="nav-item">
279+
<a class="nav-link active" href="#">Active</a>
280+
</li>
281+
<li class="nav-item">
282+
<a class="nav-link" href="#">Link</a>
283+
</li>
284+
<li class="nav-item">
285+
<a class="nav-link disabled" href="#">Disabled</a>
286+
</li>
287+
</ul>
288+
</div>
289+
<div class="card-block">
290+
<h4 class="card-title">Special title treatment</h4>
291+
<p class="card-text">With supporting text below as a natural lead-in to additional content.</p>
292+
<a href="#" class="btn btn-primary">Go somewhere</a>
293+
</div>
294+
</div>
295+
{% endexample %}
296+
214297
## Image caps
215298

216299
Similar to headers and footers, cards include top and bottom image caps.

scss/_card.scss

Lines changed: 41 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,10 @@
77
display: block;
88
margin-bottom: $card-spacer-y;
99
background-color: $card-bg;
10-
border: $card-border-width solid $card-border-color;
10+
// border: $card-border-width solid $card-border-color;
1111
@include border-radius($card-border-radius);
12+
// Doesn't use mixin so that cards always have a "border"
13+
box-shadow: inset 0 0 0 $card-border-width $card-border-color;
1214
}
1315

1416
.card-block {
@@ -72,7 +74,9 @@
7274
@include clearfix;
7375
padding: $card-spacer-y $card-spacer-x;
7476
background-color: $card-cap-bg;
75-
border-bottom: $card-border-width solid $card-border-color;
77+
// border-bottom: $card-border-width solid $card-border-color;
78+
// Doesn't use mixin so that cards always have a "border"
79+
box-shadow: inset 0 0 0 $card-border-width $card-border-color;
7680

7781
&:first-child {
7882
@include border-radius($card-border-radius-inner $card-border-radius-inner 0 0);
@@ -83,14 +87,48 @@
8387
@include clearfix;
8488
padding: $card-spacer-y $card-spacer-x;
8589
background-color: $card-cap-bg;
86-
border-top: $card-border-width solid $card-border-color;
90+
// border-top: $card-border-width solid $card-border-color;
91+
// Doesn't use mixin so that cards always have a "border"
92+
box-shadow: inset 0 0 0 $card-border-width $card-border-color;
8793

8894
&:last-child {
8995
@include border-radius(0 0 $card-border-radius-inner $card-border-radius-inner);
9096
}
9197
}
9298

9399

100+
//
101+
// Header navs
102+
//
103+
104+
.card-header-tabs {
105+
margin-right: -($card-spacer-x / 2);
106+
margin-bottom: -$card-spacer-y;
107+
margin-left: -($card-spacer-x / 2);
108+
border-bottom: 0;
109+
110+
.nav-item {
111+
margin-bottom: 0;
112+
}
113+
}
114+
115+
.card-header-pills {
116+
margin-right: -($card-spacer-x / 2);
117+
margin-left: -($card-spacer-x / 2);
118+
}
119+
120+
.card-nav {
121+
122+
.nav-item {
123+
float: left;
124+
125+
+ .nav-item {
126+
margin-left: $nav-item-margin;
127+
}
128+
}
129+
130+
}
131+
94132
//
95133
// Background variations
96134
//

scss/_list-group.scss

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -34,21 +34,8 @@
3434

3535
.list-group-flush {
3636
.list-group-item {
37-
border-width: $list-group-border-width 0;
3837
border-radius: 0;
3938
}
40-
41-
&:first-child {
42-
.list-group-item:first-child {
43-
border-top: 0;
44-
}
45-
}
46-
47-
&:last-child {
48-
.list-group-item:last-child {
49-
border-bottom: 0;
50-
}
51-
}
5239
}
5340

5441

scss/_variables.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -474,7 +474,7 @@ $card-spacer-x: 1.25rem !default;
474474
$card-spacer-y: .75rem !default;
475475
$card-border-width: 1px !default;
476476
$card-border-radius: $border-radius !default;
477-
$card-border-color: #e5e5e5 !default;
477+
$card-border-color: rgba(0,0,0,.125) !default;
478478
$card-border-radius-inner: $card-border-radius !default;
479479
$card-cap-bg: #f5f5f5 !default;
480480
$card-bg: #fff !default;

0 commit comments

Comments
 (0)