0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-11-30 12:24:19 +01:00
Commit Graph

15419 Commits

Author SHA1 Message Date
Mark Otto
df0842d1c2 grunt 2016-12-22 13:42:01 -08:00
Bardi Harborow
855a67b1d6 Remove IE9 browser hacks. (#21393) 2016-12-22 13:41:31 -08:00
Patrick Cameron
b01f5a1a38 Changed a word in a comment (#21399) 2016-12-22 13:25:41 -08:00
Mark Otto
a86f8f7bcf grunt 2016-12-21 20:37:46 -08:00
Mark Otto
537c998464 Merge branch 'v4-dev' of https://github.com/twbs/bootstrap into v4-dev 2016-12-21 20:34:48 -08:00
Mark Otto
1f9619a517 Merge branch 'patch-1' of https://github.com/tracker1/bootstrap into tracker1-patch-1 2016-12-21 20:34:29 -08:00
Mark Otto
e111e2e58e grunt 2016-12-21 20:33:54 -08:00
Mark Otto
84cdf82d80 grunt 2016-12-21 20:30:35 -08:00
Mark Otto
a2b2f99e3b Restyle code elements in links (#21392)
* Restyle code elements in links

Fixes #21259. Removes the background, color, and padding on code elements within anchors.

* Update _code.scss
2016-12-21 20:28:34 -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
Mark Otto
f464a5b214 Redo color vars
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-20 23:24:24 -08:00
Mark Otto
a6f03b0f71 update docs to use .mt-1 on floated labels; clarify docs for guidance 2016-12-20 22:55:01 -08:00
Mark Otto
a6a87b0d9d grunt 2016-12-20 14:53:50 -08:00
Mark Otto
c1cf6310f2 remove .mb-0 from static form controls to follow up #21270 2016-12-20 14:46:45 -08:00
Gijs Boddeus
1c2f372aad Overwrite margin-bottom on form-control-static (#21270)
* 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-20 14:45:08 -08:00
Mark Otto
37de11e386 Rename -bg-inverse to -inverse-bg; add -inverse-color (#21371) 2016-12-19 21:50:31 -08:00
Mark Otto
ab38529dcc grunt 2016-12-19 21:48:24 -08:00
Mark Otto
8eeb71c91c Merge branch 'fix-20982' of https://github.com/Starsam80/bootstrap into Starsam80-fix-20982 2016-12-19 21:44:03 -08:00
Mark Otto
7e5f21c2b4 Rename _animation.scss to _transitions.scss (#21370)
* Rename _animation.scss to _transitions.scss for accuracy

* fix docs reference to file name

* cleanup line breaks
2016-12-19 21:37:09 -08:00
Mark Otto
a8b3e09f22 grunt 2016-12-19 21:08:24 -08:00
Mark Otto
50d5f60696 Merge branch 'progress-brand' of https://github.com/szastupov/bootstrap into szastupov-progress-brand 2016-12-19 21:06:27 -08:00
Mark Otto
be4fc23fdb Merge branch '14840-consistent-colors' of https://github.com/Kovah/bootstrap into Kovah-14840-consistent-colors 2016-12-19 20:54:41 -08:00
Geoffrey Tisserand
69a09520d8 Fix typo in migration docs: card-title is replacing panel-title (#21331) 2016-12-19 20:35:02 -08:00
Jesse Mandel
f3282b5656 Update _modal.scss (#21346)
pull->float comment
2016-12-19 20:34:27 -08:00
Tom Lutzenberger
e1653edb95 Add variables for transitions (#21345)
* Add variables for transitions

* Add variables for transitions
2016-12-19 20:33:17 -08:00
Michal Zdrojewski
372d156f21 fix(readme): locked composer to a proper version (#21338)
* fix(readme): locked composer to a proper version
Without a version lock, users get current stable

* match docs
2016-12-19 20:31:44 -08:00
Bardi Harborow
da18d07d8e Add 'system-ui' to font stack. 2016-12-19 20:29:44 -08:00
Mark Otto
621706d209 Merge pull request #21363 from Johann-S/fixDocPopovers
Remove mention of popovers auto placement + add note to migration docs
2016-12-19 20:29:09 -08:00
Stepan Zastupov
7800b3d97c Use brand color for progress bar 2016-12-20 00:58:37 +03:00
Johann-S
8b538c8ad3 Remove mention of popovers auto placement + add note to migration docs 2016-12-19 09:38:56 +01:00
Mark Otto
3c12d73203 update jsbin example, fixes #21322 2016-12-11 19:01:47 -08:00
Mark Otto
d04eb86715 clarify that 2016-12-10 17:03:32 -08:00
Mark Otto
14ce741fa0 grunt 2016-12-10 17:03:28 -08:00
Mark Otto
d8bdb819a7 linting property order 2016-12-10 16:58:52 -08:00
Mark Otto
65aed32d95 put the custom control spacer var to use 2016-12-10 16:58:52 -08:00
Mark Otto
eb40c2a747 Update _config.yml 2016-12-08 10:48:06 -08:00
Christian Oliff
d9ab97b2d0 Update jQuery CDN to use jQuery.com instead of Google
Fixes: #21130
2016-12-07 21:32:00 -08:00
Mark Otto
cd76a6775d grunt 2016-12-07 20:46:17 -08:00
Starsam80
d991c868a4
Fix tabs by using new classes 2016-12-07 21:20:18 -07:00
Starsam80
bf39bb3ac3
Rename .active to .show 2016-12-07 21:20:15 -07:00
Mark Otto
ede925d79b Merge pull request #21298 from twbs/carousel
Refactor carousel
2016-12-05 23:31:14 -08:00
Mark Otto
e0edea0d1a typo 2016-12-05 20:37:22 -08:00
Mark Otto
4ef547f4bb drop the .carousel-control base class 2016-12-04 23:19:54 -08:00
Mark Otto
6d9ded8375 update migration docs 2016-12-04 23:17:30 -08:00
Mark Otto
e331db31fd linting 2016-12-04 22:19:20 -08:00
Mark Otto
e40a09ba2e redo the carousel example to match 2016-12-04 22:18:49 -08:00
Mark Otto
7c3bda24f0 simplify svg by only using viewbox 2016-12-04 22:06:29 -08:00
Mark Otto
9fca3e3ec8 rename once more 2016-12-04 22:05:16 -08:00
Mark Otto
89f5e65cfb drop the fixed width of the indicators. instead use the carousel-control width as margins to ensure content doesn't overlap 2016-12-04 22:05:05 -08:00
Mark Otto
1980854c14 rename var 2016-12-04 22:01:31 -08:00