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

408 Commits

Author SHA1 Message Date
Mark Otto
12500047f9 Merge branch 'master' into pr/11750
Conflicts:
	dist/css/bootstrap.css
	dist/css/bootstrap.min.css
2013-12-08 01:45:42 -08:00
Mark Otto
6273604601 Add .container-fluid variation for full-width containers and layouts
/cc #10711 #9862
2013-12-07 20:52:51 -08:00
Mark Otto
a9b86cbfde Merge branch 'pr/11138'
Conflicts:
	dist/css/bootstrap.min.css
	dist/js/bootstrap.min.js
	docs-assets/js/raw-files.js
2013-12-07 14:10:41 -08:00
Mark Otto
07de53c644 Contextual list group cleanup
* Adds nav link to sidebar for contextual classes
* Refactors to use prefixed classes, like .list-group-item-info, instead of chained classes
* Adds default and linked variations to example in docs
2013-12-07 14:09:03 -08:00
Mark Otto
a1f737b436 grunt dist after adding .text-justify 2013-12-07 12:19:17 -08:00
Mark Otto
b1215d1b2e Fixes #11193: Add kbd element styles to indicate user input via keyboard 2013-12-07 12:18:13 -08:00
Mark Otto
fe58357df1 Fixes #10884: Adds .info variant to contextual table classes 2013-12-07 11:56:35 -08:00
Mark Otto
c07632e4e8 Reorder button and table variants for consistent order 2013-12-07 11:47:37 -08:00
Mark Otto
107b334d34 Fixes #11766: Use color var for background on badges in buttons to restore proper background to default button badge 2013-12-07 11:45:11 -08:00
Zlatan Vasović
78b43d4c99 Darken icon bar to meet WCAG 2013-12-06 22:34:29 +01:00
Luke Noel-Storr
b92bee99ef reverted changes in commit 96109d3 which seemed to break conditional classes in striped tables (ignoring the comment above that the previous rules were needed for just this purpose)
fixes issue twbs/bootstrap#11728
2013-12-06 14:11:58 +00:00
Mark Otto
cf81cb60ef Merge branch 'master' into gradient-prefix-cleanup
Conflicts:
	dist/css/bootstrap.min.css
	docs-assets/js/raw-files.js
2013-12-04 21:23:09 -08:00
Mark Otto
a45d839874 Fixes #11712: Better support for .table-responsive within .panel's 2013-12-04 21:13:33 -08:00
Mark Otto
a42e9163cb Merge branch 'master' into responsive-visibility-table
Conflicts:
	dist/css/bootstrap.min.css
2013-12-03 22:58:25 -08:00
Chris Rebert
4a45650026 fix .btn-group-xs portion of #10979 2013-12-03 18:03:04 -08:00
awebdeveloper
3f1e4b92ee -moz and old webkit syntax removed for gradients based on
http://caniuse.com/#search=grad
2013-12-03 14:13:55 -08:00
Chris Rebert
303f8a33c3 add <table> case to responsive-visibility mixin; see #10056 2013-12-03 13:57:28 -08:00
Chris Rebert
bac153127c grunt 2013-12-03 13:54:56 -08:00
Mark Otto
4876cbeef8 Merge branch 'master' into pr/11412
Conflicts:
	dist/js/bootstrap.min.js
2013-12-01 20:27:30 -08:00
Mark Otto
8a74264344 bump version numbers to 3.0.3 2013-12-01 19:31:52 -08:00
Mark Otto
5a0365524d Rework navbar padding and margins for right aligned last-child elements
This slight reworking of the navbar spacing was brought about by a
problem noted in #11530: use of `.navbar-form.navbar-right` leaves an
extra 15px of space on the right.

Here’s what’s new:

* Removed the `padding` on `.navbar-collapse` within static top, fixed
top, and fixed bottom navbars. Meaning, it’s still there for the
default navbar. This was the root cause of the extra 15px padding for
navbar forms.
* As part of this, I also replaced the existing negative margin
overrides for last-child elements with more contextual ones within
their sub-components.

Overall not too different, but should be more effective now and easier
to work with now.

For example of new changes, see http://jsbin.com/odeSiSo/1/.
2013-12-01 19:27:33 -08:00
Mark Otto
d417fcecea Fixes #11357: Vertically center sm and xs buttons in the navbar 2013-12-01 18:13:27 -08:00
Mark Otto
556d6cef3e Fixes #10941: Fix Glyphicons path for those importing bootstrap.less from another directory 2013-12-01 00:20:47 -08:00
Mark Otto
53047fa587 Merge branch 'master' into pr/11536
Conflicts:
	dist/css/bootstrap.min.css
2013-11-30 23:35:56 -08:00
Mark Otto
48269dcd28 Fixes #11658: Increase min-height of .radio and .checkbox for horizontal forms to ensure alignment of content below 2013-11-30 23:17:43 -08:00
Mark Otto
841da88f3f Remove browser default top margin from dl elements 2013-11-30 23:08:41 -08:00
Mark Otto
cf40b5db60 Fixes #11623: Reset position to static for grid columns within tables to unfuck borders in IE9/10 and Firefox 2013-11-30 23:04:55 -08:00
Mark Otto
22da6fcfb2 grunt 2013-11-30 21:17:53 -08:00
Mark Otto
6bc09dd949 Fixes #11268: Account for badges within buttons by matching background to text color and text color to background 2013-11-30 16:29:52 -08:00
Mark Otto
67d4e3323d Fixes #11277: Drop the abbr element from the .initialism selector 2013-11-30 16:18:07 -08:00
Mark Otto
7aa6b4190b Fixes #11402: Set width: auto; to select.form-control within .form-inline 2013-11-30 15:57:25 -08:00
Mark Otto
d2f8b5327b Fixes #11515: Reorder the headings with body text and text emphasis classes 2013-11-30 14:58:35 -08:00
Mark Otto
21e2ae9489 Fixes #11544: Add color: inherit; to .panel-title to ensure proper text color when customizing @headings-color 2013-11-30 14:53:54 -08:00
Mark Otto
82bbccde9b Merge branch 'master' into pr/11648
Conflicts:
	dist/css/bootstrap.min.css
	less/grid.less
2013-11-30 13:09:55 -08:00
Mark Otto
853b69f2df Fixes #11351: Correct grid class reset on input groups by using attribute selector, not an old class from v3 betas 2013-11-30 12:52:08 -08:00
Mark Otto
a52e528d27 Fix up new margins on modals by not setting auto until screen-sm-min 2013-11-30 11:56:06 -08:00
Mark Otto
080aa7f5c8 Merge branch 'master' into pr/11299
Conflicts:
	dist/css/bootstrap.min.css
	docs-assets/js/raw-files.js
2013-11-30 00:55:00 -08:00
Mark Otto
a7a9dcaeb2 Alternate fix for #11303: add link to site in banner and remove @mdo and @fat usernames from it 2013-11-30 00:42:36 -08:00
Mark Otto
bb4a39d51c Merge branch 'master' into pr/11388
Conflicts:
	dist/css/bootstrap.min.css
2013-11-30 00:26:53 -08:00
Mark Otto
8674228521 Merge branch 'pr/11493'
Conflicts:
	dist/css/bootstrap.min.css
2013-11-29 23:30:26 -08:00
Mark Otto
9f0da54856 grunt to get dist files 2013-11-29 23:29:34 -08:00
Mark Otto
e4848286c8 Fix #10979: Don't use .img-thumbnail as a mixin for .thumbnail to avoid dupe and unnecessary styles 2013-11-29 23:19:04 -08:00
Mark Otto
bf9f39270c Fixes #11425: Use margin instead of padding on .modal-dialog to enable click-thru to .modal-backdrop 2013-11-29 22:03:49 -08:00
Mark Otto
36b82c37ec Implement #11174 to fix #10936: increase height of large inputs to fix Firefox inconsistencies 2013-11-29 21:59:28 -08:00
Mark Otto
a4c54b5e5d Fixes #11390: Add max-width to containers within jumbotrons to avoid horizontal scrollbar 2013-11-29 18:33:59 -08:00
Mark Otto
09cd5289ab Fixes #11468: Prevent default gradient on in Firefox for Android 2013-11-29 17:47:27 -08:00
Zlatan Vasović
08e41d769a Add missing last column float 2013-11-29 08:37:54 +01:00
Mark Otto
b5f9cc2057 Merge branch 'master' into pr/11414
Conflicts:
	dist/css/bootstrap.min.css
2013-11-28 15:55:17 -08:00
Mark Otto
d654f90502 Fixes #10147: Remove outline from carousel controls on focus 2013-11-28 15:37:11 -08:00
Mark Otto
9d939080e6 Fixes #10483 and #10357: Make .container mixin-friendly by moving the width declarations within one class 2013-11-28 14:22:31 -08:00