rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-13 01:08:58 +01:00
Code Issues Actions Packages Releases Activity
7,548 Commits 108 Branches 89 Tags 553 MiB
a925a0b985
Commit Graph

515 Commits

Author SHA1 Message Date
Mark Otto
a7029edc61 Restyle the blockquote to not thin text or change line-height 2013-12-15 11:29:58 -08:00
Mark Otto
168469f545 Fixes #11588: Scope font-size to only p elements in a .jumbotron and remove the supersized line-height from the base class 2013-12-14 21:50:47 -08:00
Mark Otto
072ccd4dda Fixes #11572: Add contextual background-color classes to match text classes; move both sets of classes to Helper Classes section of the CSS docs 2013-12-14 21:40:16 -08:00
Mark Otto
432b9f9cde Fixes #11561: Add float: left; to .form-control within input groups to prevent IE9 from screwing up placeholder text and select menu arrows 2013-12-14 20:04:12 -08:00
Mark Otto
35dd6b9fd7 Merge pull request #10704 from XhmikosR/various 
rm unused vars
 2013-12-14 18:55:25 -08:00
Mark Otto
46c3d27468 Merge branch 'master' into pr/11435 
Conflicts:
	dist/css/bootstrap.css
	dist/css/bootstrap.min.css
 2013-12-14 16:56:56 -08:00
Mark Otto
4c64c1eecd Merge branch 'master' into pr/11302 
Conflicts:
	dist/css/bootstrap.css
	dist/css/bootstrap.min.css
 2013-12-14 16:46:40 -08:00
Mark Otto
323a40cc53 Merge branch 'master' into pr/11162 
Conflicts:
	less/modals.less
 2013-12-14 16:29:47 -08:00
Mark Otto
544b8ecab7 Fixes #10921: Add support for input groups within button toolbars 
* Floats any `.input-group` within a toolbar
* Simplifies the CSS to remove sibling selectors and instead use a
negative amrgin on the parent with only `margin-left`

See it in action: http://jsbin.com/aGEcUqAT/1/.
 2013-12-14 16:03:21 -08:00
Mark Otto
a54dbfdf2a Merge branch 'master' into pr/10951 
Conflicts:
	dist/css/bootstrap.min.css
	less/modals.less
 2013-12-14 15:38:21 -08:00
Mark Otto
11c6ab767c Fixes #10370: Improved and deprecated dropdown menu alignment options 
* Removes an old pair of selectors that didn’t properly target the
right-aligned navbar alignment of dropdown menus.
* Deprecates the `.pull-right` alignment in favor of a more specific
and unique class name.
* Adds `.dropdown-menu-right` as the new alignment class. This is then
mixin-ed into the `.navbar-right.navbar-nav` dropdown menus for
auto-alignment.
* To override that auto-alignment, use `.dropdown-menu-left` as needed.
 2013-12-14 13:22:56 -08:00
Mark Otto
ecc6f4e6bc Merge branch 'master' into pr/11868 
Conflicts:
	dist/css/bootstrap.min.css
 2013-12-14 11:36:54 -08:00
Mark Otto
22820d7151 Fixes #10495: Float Glyphicon and set margins in .navbar-brand to ensure there is no added height because wtf even is CSS 2013-12-13 23:06:04 -08:00
Tobias Lindig
37b2c8a812 add dist files. 2013-12-13 12:27:56 +01:00
XhmikosR
5749039f8d Remove unused variables. 2013-12-10 10:11:10 +02:00
Mark Otto
d466d527a4 Undo merge of #11778 and use cleancss min option 2013-12-09 00:12:11 -08:00
Mark Otto
ea61a19a04 Merge branch 'pr/11778' into drop_recess_for_less 
Conflicts:
	Gruntfile.js
	dist/css/bootstrap-theme.min.css
	dist/css/bootstrap.min.css
 2013-12-08 23:48:07 -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
2a4621b71f Merge branch 'master' into drop_recess_for_less 
Conflicts:
	dist/css/bootstrap.min.css
 2013-12-08 23:00:01 -08:00
Mark Otto
e4c1ef7c6d more closely align property order with recess 2013-12-08 22:55:09 -08:00
Mark Otto
0991c7c341 specify block indent as numeral to prevent fubared media query output 2013-12-08 22:33:24 -08:00
Mark Otto
e90ce1c0d5 single array == no rogue spaces 2013-12-08 22:32:07 -08:00
Mark Otto
4540f9e2d2 derp, don't sort min /cc @cvrebert 2013-12-08 22:16:43 -08:00
Mark Otto
aae9c2d136 merge, compile 2013-12-08 22:11:46 -08:00
Mark Otto
6df909ad9b Fixes #11786: Nest media queries within print utilities for mixin-friendliness 2013-12-08 19:19:06 -08:00
XhmikosR
fdc5d1dc34 Minify css with clean-css. 2013-12-08 13:05:10 +02:00
XhmikosR
eca8ff3803 Use single quotes consistently. 2013-12-08 12:44:14 +02: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
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
Mark Otto
2b4fa90902 grunt dist 2013-12-07 11:44:32 -08:00
Mark Otto
94a5413ec7 Merge pull request #11757 from ZDroid/darken-toggle 
Darken navbar toggle icon bar to meet WCAG
 2013-12-07 11:34:03 -08:00
XhmikosR
f4087df47e Remove incompatible properties. 2013-12-07 04:52:20 +02:00
Chris Rebert
4be126e014 Merge pull request #11745 from XhmikosR/function-spaces 
Be consistent with function () spaces
 2013-12-06 16:43:09 -08:00
Zlatan Vasović
78b43d4c99 Darken icon bar to meet WCAG 2013-12-06 22:34:29 +01:00
Chris Rebert
2e9cde6fd9 grunt 2013-12-06 11:33:18 -08: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
XhmikosR
4aad52797c Use a space after function consistently. 2013-12-06 12:43:48 +02: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