rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-01 13:24:25 +01:00
Code Issues Actions Packages Releases Activity
20,213 Commits 108 Branches 89 Tags 547 MiB
82ac087c4d
Commit Graph

128 Commits

Author SHA1 Message Date
Mark Otto
88b9e558fb clip to border-box, update overlay 2017-06-30 15:28:50 -07:00
Mark Otto
180d78c013 Drop .card-{color} modifiers for .bg-{color}, .text-{color}, and .border-{color} utilities 2017-06-30 15:23:36 -07:00
Mark Otto
9372eef9e1 rename .card-inverse to .card-dark, update docs to match 2017-06-25 18:30:24 -07:00
Mark Otto
222eddda5e Merge branch 'v4-dev' into colors-redux 2017-06-18 18:32:42 -07:00
obinnangini
532493e6ec Updated flex-basis property to fix issue #18569 in .scss files 2017-06-18 18:17:48 -07:00
Mark Otto
597e9f8618 remove - vars, update docs to generate from data yml files, update mixins, and generate card, button, bg, and color classes from the sass map 2017-06-18 02:57:16 -07:00
Mark Otto
6c8c0aa4cf Rename .card-block to .card-body to match nomenclature of modals 2017-06-15 09:05:16 -07:00
Patrick Yeo
891bca435f Fix overflowing text in Cards with word-wrap: break-word 2017-06-03 22:19:19 -07:00
Patrick Yeo
ec56bbe6bf Rename $card-border-radius-inner to $card-inner-border-radius 2017-06-03 22:17:57 -07:00
Patrick Yeo
dd0ce3e4b2 Rename variable $input-border-focus to $input-border-color-focus (#22413) 
* Rename variable $input-border-focus to $input-border-color-focus
* Rename variables $pagination-hover-border, $pagination-active-border, $pagination-disabled-border to $pagination-hover-border-color, $pagination-active-border-color, $pagination-disabled-border-color, respectively
* Rename variables $state-*-border to $state-*-border-color, respectively
* Rename variables $alert-*-border to $alert-*-border-color
* Rename $list-group-active-border to $list-group-active-border-color
* Rename $table-inverse-border to $table-inverse-border-color
* Rename $btn-*-border to $btn-*-border-color
* Rename $navbar-*-toggler-border to $navbar-*-toggler-border-color
 2017-04-16 15:45:10 -07:00
Mark Otto
2075610491 Prevent long words in .card-titles from breaking auto layout 2017-04-16 14:02:12 -07:00
Mark Otto
7f075bfb23 fixes #22135 2017-04-08 21:26:25 -07:00
Mark Otto
bebdbe4119 Fix wrapping card decks (#22289) 
fixes #22007 and fixes #21976 by changing margin strategy for card deck gutters
 2017-03-27 22:53:39 -07:00
Mark Otto
fe3acc097a Card image fixes (#22288) 
* fix image stretching due to flexbox
* fix broke text-muted on dark bg
* no img-fluid needed
 2017-03-27 22:52:24 -07:00
Starsam80
7fdedbd5e6 Remove some leftover IE9/flex stuff 2016-12-25 15:32:34 -08:00
Mark Otto
040acd30db change card deck margin strategy 
- Instead of negative left/right margins, we selectively apply margins to the cards as needed. This way the first and last child never receive a left and right margin (respectively), so we don't need to negative indent those at the .card-deck level.

- Drops the margin-bottom override on the .card because there's no more default margin there.

- Drop the margin-bottom from the .card-deck to match our lack of margins on the card.

This and the previous commit fixes #19883.
 2016-12-22 18:59:05 -08:00
Mark Otto
5d592d16db switch from block to flex 
add flex direction too
 2016-12-22 16:41:28 -08:00
Mark Otto
050716903f remove default bottom margin on cards 
use utils instead
 2016-12-22 16:41:11 -08:00
Mark Otto
8d3b40211b move the card-block flex action up to all card-blocks 
this allows us to easily scale card blocks in groups and decks, without repeating it in our css
 2016-12-22 16:40:58 -08:00
Mark Otto
390a2a6c60 remove commented out code 2016-12-22 16:40:19 -08:00
Mark Otto
0873fccd63 comment typo 2016-12-22 16:39:23 -08:00
Mark Otto
2c48655d07 fix comment 2016-12-22 16:39:18 -08:00
Mark Otto
cd2584870e add card column margin variable instead of relying on a default card margin 
this assumes no margin on the .card to start (which will follow in a later commit)
 2016-12-22 16:39:11 -08:00
Mark Otto
246151aa12 add card column count variable 2016-12-22 16:38:22 -08:00
Mark Otto
5f40770d19 Rename card column gap variable 2016-12-22 16:38:09 -08:00
Mark Otto
eb2e1102be Flexbox all the time (Drop IE9 support and remove $enable-flex option) (#21389) 
* remove the $enable-flex variable option

* remove bootstrap-flex.css dist file and it's grunt task

* remove the separate flex css file for docs; it's all the same now

* remove flexbox docs (porting some to the main grid docs in next commit)

* clean up few grid docs bits to simplify copy, start to mention flexbox

* port relevant flexbox-grid.md content to grid.md

- clean up mixins
- update how it works section
- bring over sizing and alignment sections

* remove the $enable-flex from the options.md page

* update lead paragraph to mention flexbox

* update migration to mention loss of ie9 support

* remove mention of flexbox dist file

* clarify IE support

* making a note

* remove flexbox variant mentions from component docs

- updates docs for media object, navs, list group, and cards to consolidate docs
- no more need to callout flexbox variants since it's now the default

* remove $enable-flex if/else from sass files

* remove flex dist files

* update scss lint property order to account for flex properties

* linting

* change to numberless classes for autosizing, wrap in highlighting div

* bump gruntfile and postcss to ie10

* redo intro sections

* rearrange

* phew, redo hella grid docs

- rearrange all the things
- consolidate some bits

* remove reference to flexbox mode

* more border action for demo

* Make some changes to the .card's in .card-deck's to ensure footers align to the bottom
 2016-12-21 20:26:17 -08:00
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
Mark Otto
fef873a840 fix all validation, turn off some settings, add sort order 2014-12-11 12:05:29 -08:00
Mark Otto
27df020852 convert to scss 2014-12-02 14:02:35 -08:00