root
/
bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Issues Actions 3 Packages Projects Releases Wiki Activity
7,469 Commits 132 Branches 94 Tags 672 MiB
Commit Graph

2256 Commits

Author SHA1 Message Date
Chris Rebert ab29b1a335 misc strictMath compliance fixes 2013-12-09 16:14:44 -08:00
Chris Rebert 9664f8da58 add parens around arithmetic in recursive mixin calls to comply with LESS strictMath 
<3 @seven-phases-max for helping to confirm & debug this
X-Ref: https://github.com/less/less.js/issues/1725
 2013-12-09 16:02:24 -08:00
Chris Rebert 10e74a94e6 improve compliance with LESS's strictMath 2013-12-09 15:35:13 -08:00
Mark Otto 25ec09f06a Merge pull request #11790 from twbs/drop_recess_for_less 
Drop grunt-recess for grunt-contrib-less
 2013-12-09 11:30:10 -08:00
Chris Rebert 9ceff60057 more nesting in .list-group-item-variant mixin 2013-12-08 23:34:24 -08:00
Mark Otto 0016c17f93 Switch to `&:extend(.clearfix all)` for clearfix mixin 
Original discussion:
https://github.com/less/less.js/issues/1437#issuecomment-21383639.

Since we’re switching to `grunt-contrib-less`, we can take advantage of
newer LESS features than what RECESS supported. Included in that is the
ability to `:extend`, and not only that, but `:extend(.mixin-name
all)`. By doing so, we remove duplicate CSS for all our elements that
were being clearfix-ed.

Fixes #8947, #8968, #8991, #9257, #9268, #9291, #9430, #9604, #9686,
#9929, #10731, #10793, #11305, #11498, #11533, #11570, #11604, #11652.

(dem issues, tho)
 2013-12-08 23:18:28 -08:00
Mark Otto 6df909ad9b Fixes #11786: Nest media queries within print utilities for mixin-friendliness 2013-12-08 19:19:06 -08:00
Mark Otto 1f9bfa89dc Fixes #11741: Don't set headings font-family again, just use inherit 2013-12-08 02:14:24 -08:00
Mark Otto c37b710e85 Merge branch 'master' into pr/11744 
Conflicts:
	dist/css/bootstrap.min.css
 2013-12-08 02:00:37 -08:00
Mark Otto b5008ebf9c add vertical-align back to where it's necessary since we reset from block to inline-block on several inputs 2013-12-08 01:59:44 -08:00
Mark Otto e43e87b2f3 Merge pull request #11748 from bganicky/patch-1 
Updated .scale() mixin so that it accepts optional vertical scale factor...
 2013-12-08 01:49:38 -08:00
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 bfd8f8c83a Merge branch 'master' of github.com:twbs/bootstrap 2013-12-07 12:18:52 -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 a691d54436 Merge pull request #11675 from GraceNut/feature/text-justify 
Added text-justify class to type.less
 2013-12-07 11:58:31 -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
XhmikosR f4087df47e Remove incompatible properties. 2013-12-07 04:52:20 +02: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
Bohdan Ganicky 9ce7e5620c Updated .scale() mixin so that it accepts optional vertical scale factor parameter. 2013-12-06 14:09:55 +01:00
Mark Otto 0a5aa8e0a3 Merge pull request #11714 from ZDroid/redundant-comment 
Remove redundant, duplicate comment
 2013-12-04 22:52:12 -08:00
Zlatan Vasović 01afe84b31 Remove redundant, duplicate comment 2013-12-05 07:43:50 +01:00
Mark Otto 45930acdf7 Fixes #11610: Add @grid-float-breakpoint-max to better link navbar behavior across viewports and improve customization. 
Also addresses #10371, #10395, and #10465.
 2013-12-04 22:32:56 -08: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 199872418c reference root issue in explanatory comment 2013-12-03 11:14:13 -08:00
Lipis 92a624a31c Get rid of empty line before the last closing bracket 2013-12-03 15:03:07 +01:00
Haley 3a65b2c11f Added text-justify class to type.less 2013-12-02 13:29:54 -06:00
Mark Otto cc6951fa15 Merge pull request #10662 from kevinlisota/thumbnail-images 
add responsive CSS to hyperlinked images when thumbnail caption markup used
 2013-12-01 21:18:41 -08:00
Mark Otto 561aff7942 Merge pull request #11499 from bassjobsen/patch-3 
fix navbar dropdown window resize bug
 2013-12-01 20:18:40 -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 17dee30892 Merge pull request #11662 from ZDroid/deprecation-fix 
Use mixin instead of whole code
 2013-12-01 11:16:17 -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
Zlatan Vasović ed29a99df4 Use mixin instead of whole code 2013-12-01 09:18:27 +01: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 ed98ac7560 Merge branch 'master' of github.com:twbs/bootstrap 2013-11-30 16:37:49 -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