rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-10 22:24:19 +01:00
Code Issues Actions Packages Releases Activity
15,316 Commits 108 Branches 89 Tags 552 MiB
e331db31fd
Commit Graph

52 Commits

Author SHA1 Message Date
Starsam80
b226766b62 Remove lots of duplication + minor cleanup (#21238) 
* Remove comment that duplicated some code
* Use transition mixin whenever possible
* Create a new function to reduce duplication
* Use the new `breakpoint-infix` method
 2016-11-28 13:23:59 -08:00
Mark Otto
2df2efc1fb Merge pull request #18851 from ju1ius/patch-1 
Don't clearfix if flexbox is enabled. Fixes #18849
 2016-10-27 21:58:14 -07:00
mkroeders
53a20c11d2 Have same margin for <hN> as a <div> on .card-headers (#19048) 
* Have same margin for <hN> as a <div> on .card-headers
Related #18726

When you use a `<hN>` as `.card-header` there is `margin-bottom: .5rem` added. The changes set the margin-bottom to 0
* Removed space
 2016-09-11 23:32:51 -07:00
Mark Otto
07752bab7b v4: Card image fixes (#20667) 
* Add .img-fluid to card images in columns to ensure proper resizing
* change that variable from regular value to variable
* use calc to figure out a tighter border for card images
 2016-09-07 20:40:12 -07:00
Mark Otto
5713077ba5 Fix #20654 by reverting #20447 (#20665) 
Cards must be inline-block in columns, otherwise they can get split across columns
 2016-09-07 20:38:11 -07:00
Bass Jobsen
99425321dc Make .card class inside .card-columns display: block too (#20447) 
See: https://github.com/twbs/bootstrap/pull/18255#issuecomment-237034763
 2016-09-04 17:47:18 -07:00
Mark Otto
56a5b19cdb Fixes #17911: Explicitly remove margin-bottom from cards in .card-deck 
Here we're doing some margin swapping, so it looks a little funky. All this does is match the margin implementation and rendering across our table and flex versions of card decks.
 2016-05-11 22:14:05 -07:00
Mark Otto
de91c5e0be fixes #19650: improve non-flexbox card deck behavior so columns are always the same width 2016-05-11 21:18:35 -07:00
Mark Otto
964811d48d Update card header and footer 
- Remove the box-shadow and switch back to border to match .card basics
- Update the header nav margin override--since we restored the border, we need that default negative margin at the bottom
 2016-05-11 20:22:07 -07:00
Mark Otto
6b33c08310 Merge pull request #19667 from vsn4ik/v4-dev-use-border-radius-mixin 
Use @border-radius and add $nav-tabs-border-radius variable
 2016-05-09 09:56:28 -07:00
Mark Otto
3b62fc0806 Merge pull request #19861 from twbs/card-borders 
Jank card borders were too janky
 2016-05-08 13:38:51 -07:00
Mark Otto
83182ad82e Jank card borders were too janky 
- Drops the experiment I had going for `box-shadow`-powered borders
- Reinstates regular `border` using existing variables

Fixes  #19097 and #19143. Nullifies #19828.
 2016-05-08 13:24:45 -07:00
vsn4ik
fdf92b1528 Use @border-radius and add $nav-tabs-border-radius variable 2016-04-03 01:47:12 +03:00
Chris Rebert
3af2ed9438 Add $card-img-overlay-padding variable 
[skip sauce]
[skip variable]
 2016-02-16 23:25:18 -08:00
Chris Rebert
aa7c5f93ce Add $card-columns-sm-up-column-gap variable 
[skip sauce]
[skip validator]
 2016-02-16 23:00:58 -08:00
Mark Otto
33d7ed77c8 linting follow up to #19140 2016-02-08 23:43:37 -08:00
Mark Otto
faa7cea301 fixes #18940: use specific border properties when changing the corners of list groups in cards to avoid overriding combo first-/last-child items 2016-02-08 23:37:38 -08:00
Mark Otto
b75a0ca979 fuck that other class, let's just get tabs and pills in there 2016-02-03 20:52:33 -08:00
Mark Otto
955e0405ea fuck around with card borders and more 2016-01-17 18:55:24 -08:00
ju1ius
bd62b185f6 Don't clearfix if flexbox is enabled. Fixes #18849 2016-01-11 22:36:30 +01:00
Mark Otto
b48eb53962 rename .card-*-outline to .card-outline-* for consistency with button outlines 2016-01-06 01:09:45 -08:00
Chris Rebert
25cecdb55a Apply clearfix to .card-footer 
[skip sauce]
[skip validator]
 2015-12-23 17:25:37 -07:00
Chris Rebert
da533b8926 Apply clearfix to .card-header; fixes #18633 2015-12-23 17:20:23 -07:00
Chris Rebert
2e2b48da13 Apply clearfix to .card-block; fixes #18583 2015-12-23 17:18:19 -07:00
Chris Rebert
6798485323 Introduce $card-deck-margin variable 
[skip sauce]
[skip validator]
 2015-12-08 01:13:37 -08:00
Mark Otto
9e6d1c1ec6 Merge branch 'patch-6' of https://github.com/bassjobsen/bootstrap into bassjobsen-patch-6 2015-12-07 23:48:33 -08:00
Mark Otto
e5b6922258 Merge pull request #18356 from lesleh/card-mixin 
Card mixin
 2015-12-07 21:55:26 -08:00
Chris Rebert
0b01c360fc Use $card-border-width for .card-inverse's header/footer border-bottom override 
Refs #18150

[skip sauce]
[skip validator]
 2015-11-29 20:48:33 -08:00
Leslie Hoare
beb11714dd Use the new mixin. 2015-11-26 13:26:40 +00:00
Mark Otto
0e77265c00 fixes #18170, make cards block level by default so anchors can be used as base element 2015-11-14 21:40:17 -08:00
Chris Rebert
0cdb204867 scss/_card.scss: Remove trailing whitespace 
[ci skip]
 2015-11-13 00:17:25 -08:00
Mark Otto
0aec084cae Merge pull request #18093 from AndersMad/patch-1 
Card fix static -> variable border radius
 2015-11-12 23:56:45 -08:00
Mark Otto
d917f474f4 Merge pull request #17708 from biokillos/feature/add-variable-for-card-link-hover-state 
Add variable for card-link hover state
 2015-11-12 23:29:48 -08:00
Mark Otto
078c7cac8d manually pull in #17212 from @azmenak 2015-11-12 22:02:35 -08:00
Bass Jobsen
2e92360b8b add variant mixins 2015-10-29 13:34:41 +01:00
AndersMad
61e9a01a28 Card fix static -> variable border radius 
Changed card border radius image caps to use variable rather than static values
 2015-10-28 21:54:56 +01:00
Andrey
55994f3274 Add variable for card-link hover state 2015-09-26 14:57:13 +02:00
Aleksey Khudyakov
7ad9d233f2 Add variable for card background color 2015-09-23 09:40:34 +10:00
Mark Otto
741f7d4b5a Fixes #17486: start work on responsive cards for decks, groups, and columns 2015-09-06 09:36:19 -07:00
Mark Otto
e75504366d Merge pull request #17120 from kkirsche/patch-5 
Add white background to cards by default
 2015-08-23 14:44:53 -07:00
Kevin Kirsche
44acff459b Add white background to cards 
Fix #17117
 2015-08-23 08:10:55 -04:00
Mark Otto
24fee99e0e remove another margin-top: 0 2015-08-23 00:25:58 -07:00
Kevin Kirsche
9e8bd818b2 Card variables should be in _variables.scss 
Fixes #17061
 2015-08-19 17:35:34 -04:00
Mark Otto
eaa67a82d3 fix scss linting 2015-06-19 00:14:36 -07:00
Mark Otto
8e6df4325e cards update 2015-05-29 13:09:54 -07:00
Mark Otto
587f5f8efd clean up card styles. add new vars 2015-05-29 01:59:54 -07:00
Mark Otto
74d17ab7a0 rewrite much of cards and the docs 2015-05-28 14:07:34 -07:00
Mark Otto
e07cebc90e add flexbox variation for .card-group 2015-05-28 10:37:12 -07:00
Mark Otto
6e3d4331db new card sizing maybe 2015-05-27 19:00:11 -07:00
Chris Rebert
8e374bd010 put all :hover styles within @media (hover: hover) 2015-01-22 11:37:37 -08:00