aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2016-12-21Merge branch 'v4-dev' of https://github.com/twbs/bootstrap into v4-devMark Otto0-0/+0
2016-12-21Merge branch 'patch-1' of https://github.com/tracker1/bootstrap into ↵Mark Otto3-3/+3
tracker1-patch-1
2016-12-21gruntMark Otto26-9763/+2859
2016-12-21gruntMark Otto26-9763/+2859
2016-12-21Restyle code elements in links (#21392)Mark Otto1-0/+7
* Restyle code elements in links Fixes #21259. Removes the background, color, and padding on code elements within anchors. * Update _code.scss
2016-12-21Flexbox all the time (Drop IE9 support and remove $enable-flex option) (#21389)Mark Otto43-9974/+610
* 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-20Redo color varsMark Otto1-5/+17
This pulls in some changes from #18462 to include a set of generic color variables. It doesn't include a Sass map for generating the theme colors yet, since we can't easily do that for all components, but does give a few more color choices to folks and an easier way to customize.
2016-12-20update docs to use .mt-1 on floated labels; clarify docs for guidanceMark Otto1-5/+5
2016-12-20gruntMark Otto18-14/+18
2016-12-20remove .mb-0 from static form controls to follow up #21270Mark Otto1-3/+3
2016-12-20Overwrite margin-bottom on form-control-static (#21270)Gijs Boddeus1-0/+1
* Overwrite margin-bottom on form-control-static In the documentation the form-control-static class has been used on a p element. On the regular vertical form the margin bottom of the p element gets overwritten by a mb-0 class. In the inline form example this class hasn't been applied, therefore the p element gets a margin-bottom. To prevent this behavior we can add a margin-bottom of 0. * Update _forms.scss
2016-12-19Rename -bg-inverse to -inverse-bg; add -inverse-color (#21371)Mark Otto2-5/+7
2016-12-19gruntMark Otto34-170/+170
2016-12-19Merge branch 'fix-20982' of https://github.com/Starsam80/bootstrap into ↵Mark Otto23-127/+127
Starsam80-fix-20982
2016-12-19Rename _animation.scss to _transitions.scss (#21370)Mark Otto3-4/+2
* Rename _animation.scss to _transitions.scss for accuracy * fix docs reference to file name * cleanup line breaks
2016-12-19gruntMark Otto25-165/+165
2016-12-19Merge branch 'progress-brand' of https://github.com/szastupov/bootstrap into ↵Mark Otto1-1/+1
szastupov-progress-brand
2016-12-19Merge branch '14840-consistent-colors' of https://github.com/Kovah/bootstrap ↵Mark Otto1-26/+26
into Kovah-14840-consistent-colors
2016-12-19Fix typo in migration docs: card-title is replacing panel-title (#21331)Geoffrey Tisserand1-1/+1
2016-12-19Update _modal.scss (#21346)Jesse Mandel1-1/+1
pull->float comment
2016-12-19Add variables for transitions (#21345)Tom Lutzenberger8-8/+25
* Add variables for transitions * Add variables for transitions
2016-12-19fix(readme): locked composer to a proper version (#21338)Michal Zdrojewski1-1/+1
* fix(readme): locked composer to a proper version Without a version lock, users get current stable * match docs
2016-12-19Add 'system-ui' to font stack.Bardi Harborow2-2/+4
2016-12-19Merge pull request #21363 from Johann-S/fixDocPopoversMark Otto2-1/+5
Remove mention of popovers auto placement + add note to migration docs
2016-12-20Use brand color for progress barStepan Zastupov1-1/+1
2016-12-19Remove mention of popovers auto placement + add note to migration docsJohann-S2-1/+5
2016-12-11update jsbin example, fixes #21322Mark Otto1-1/+1
2016-12-10clarify thatMark Otto1-1/+1
2016-12-10gruntMark Otto16-12/+16
2016-12-10linting property orderMark Otto1-1/+1
2016-12-10put the custom control spacer var to useMark Otto1-0/+1
2016-12-08Update _config.ymlMark Otto1-1/+1
2016-12-07Update jQuery CDN to use jQuery.com instead of GoogleChristian Oliff1-2/+2
Fixes: #21130
2016-12-07gruntMark Otto22-661/+473
2016-12-07Fix tabs by using new classesStarsam802-6/+6
2016-12-07Rename `.active` to `.show`Starsam8021-121/+121
2016-12-05Merge pull request #21298 from twbs/carouselMark Otto7-254/+238
Refactor carousel
2016-12-05typoMark Otto1-1/+1
2016-12-04drop the .carousel-control base classMark Otto4-8/+9
2016-12-04update migration docsMark Otto1-1/+8
2016-12-04lintingMark Otto1-1/+1
2016-12-04redo the carousel example to matchMark Otto2-23/+15
2016-12-04simplify svg by only using viewboxMark Otto1-2/+2
2016-12-04rename once moreMark Otto1-8/+8
2016-12-04drop the fixed width of the indicators. instead use the carousel-control ↵Mark Otto2-6/+6
width as margins to ensure content doesn't overlap
2016-12-04rename varMark Otto2-6/+6
2016-12-04there's no font, so rip that varMark Otto2-2/+0
2016-12-04remove unused varsMark Otto1-2/+0
2016-12-04rip responsive styles; they're unnecessary and likely require overriding anywayMark Otto1-34/+0
2016-12-04redo control icons to use open iconic svgs inlinedMark Otto2-16/+12