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

5120 Commits

Author SHA1 Message Date
Mark Otto
2447f03758 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-23 21:22:52 -07:00
Jacob Thornton
faba6808b7 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-23 20:53:32 -07:00
Jacob Thornton
72d2661ff0 fixes #8232 2013-07-23 20:53:12 -07:00
Mark Otto
00976ff09a Merge pull request #8576 from sfaxon/3.0.0-wip
update carousel js docs to reflect leading .glyphicon
2013-07-23 20:17:40 -07:00
Mark Otto
ced204c774 Clear up license FAQs by using "Bootstrap" as noun instead of "Twitter open source software" 2013-07-23 20:16:02 -07:00
Mark Otto
984a0d1c78 Update link to blog 2013-07-23 19:52:44 -07:00
Seth Faxon
13f2a68a23 update carousel js docs to reflect leading .glyphicon
https://github.com/twitter/bootstrap/pull/6342 icons section
  mentions the change to using glyphicon base class
  this adds it to the docs
2013-07-23 19:38:23 -07:00
Jacob Thornton
faa00629c4 add additional carousel test 2013-07-23 18:56:00 -07:00
Jacob Thornton
68e87183a0 fixes #8134 2013-07-23 18:54:00 -07:00
Jacob Thornton
f1009c19b3 revert collapse change + add emulateTransitionEvent to catch dead css transitions 2013-07-23 18:44:08 -07:00
Jacob Thornton
43e5e90a6d shown.bs.modal fix 2013-07-23 17:32:20 -07:00
Jacob Thornton
7b12a0dcbc fixes #7970 2013-07-23 17:23:02 -07:00
Mark Otto
e87508854e Merge pull request #8572 from mohnish/patch-1
Use input type `password` for the password field in the CSS documentatio...
2013-07-23 14:23:17 -07:00
Mark Otto
29b4caf1d5 Merge pull request #8573 from cvrebert/patch-2
getting-started.html: add <code> around mention of `placeholder`
2013-07-23 14:22:59 -07:00
Chris Rebert
d8583a1064 getting-started.html: add <code> around mention of placeholder 2013-07-23 13:00:28 -07:00
Mohnish Thallavajhula
4629bed2c4 Use input type password for the password field in the CSS documentation. 2013-07-23 11:50:01 -07:00
Mark Otto
4cec956e0c Drop rounded corners on .table-bordered
* Cuts  close to 100 lines of CSS from the table CSS
* File size aside, this drastically simplifies CSS for folks looking to
build on top of the `.table-bordered` option as a starting point
2013-07-23 10:48:30 -07:00
Mark Otto
b5f2482a58 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Conflicts:
	dist/css/bootstrap.min.css
2013-07-23 10:19:04 -07:00
Mark Otto
8aa3c375f0 No more left margin on dd elements, fixes #8567 2013-07-23 10:18:34 -07:00
Mark Otto
e7b0f4e81f Merge pull request #8564 from frabrunelle/3.0.0-wip
@badge-bg should be @gray-light not #f5f5f5
2013-07-23 10:05:49 -07:00
Francis Brunelle
4b9cacae91 @badge-bg should be @gray-light not #f5f5f5 2013-07-23 00:05:45 -04:00
Mark Otto
0b1ddeb353 fixes #8559 2013-07-22 14:44:36 -07:00
Mark Otto
98ce40d0f6 Merge pull request #8549 from ggam/patch-2
Updated readme.md to reflect the latest changes in directory structure
2013-07-21 16:07:55 -07:00
Guillermo González de Agüero
abb1013f25 Updated readme.md to reflect the latest changes in directory structure 2013-07-21 21:57:41 +02:00
Mark Otto
12468c6103 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Conflicts:
	dist/css/bootstrap.min.css
2013-07-21 08:52:25 -07:00
Mark Otto
582e9986a8 Merge pull request #8546 from jeroenvisser101/patch-1
Fixed typo
2013-07-21 08:50:12 -07:00
Mark Otto
e78ba0ff82 Merge pull request #8545 from liuyl/refactor-btngroups
refactor button-groups.less
2013-07-21 08:49:52 -07:00
Mark Otto
832fdf9a36 Merge pull request #8544 from liuyl/removeuseless
remove useless display:inline-block
2013-07-21 08:49:34 -07:00
Jeroen Visser
c926309371 Fixed typo 2013-07-21 14:20:21 +02:00
liuyl
f5fc6254c7 refactor button-groups.less 2013-07-21 20:03:59 +08:00
liuyl
be2693369d remove useless display:inline-block 2013-07-21 19:44:30 +08:00
Mark Otto
a63db4d2f9 Update file input to remove height and line-height
This particular form control is wildly inaccurate across browsers, so
we're removing the `height` and `line-height`, but adding `display:
block` so it renders similarly to our other inputs.
2013-07-20 21:09:03 -07:00
Mark Otto
df851b40d1 Update docs on responsive images and elaborate on IE8 support using Respond.js 2013-07-20 20:58:23 -07:00
Mark Otto
d651c01e10 Update forms example to show sequential form inputs for later testing 2013-07-20 20:11:53 -07:00
Mark Otto
51dfa21009 Remove more commented out CSS from forms 2013-07-20 19:32:21 -07:00
Mark Otto
732e4196fb Remove commented out CSS 2013-07-20 19:31:56 -07:00
Mark Otto
6952d655f4 Merge pull request #8538 from brentmulligan/3.0.0-wip
Update Normalize.css URL to new Github.io domain
2013-07-20 16:58:00 -07:00
Mark Otto
3d5e9f0318 Merge pull request #8536 from ggam/patch-1
Fixed breadcrumbs link in customize
2013-07-20 16:57:30 -07:00
Brent Mulligan
23015bc7c1 Update Normalize.css URL to new Github.io domain 2013-07-20 15:38:38 -04:00
Guillermo González de Agüero
faa9a22f74 Fixed breadcrumbs link 2013-07-20 14:38:10 +02:00
syed
330f40c864 moving forms, labels and list-group to variables.less 2013-07-20 13:38:27 +05:00
syed
1683e6767a moving code and dropdowns to variables.less 2013-07-20 13:17:56 +05:00
syed
c2e37414d8 Move inline properties to variables.less
moved buttons.less, carousel.less & close.less in this commit
2013-07-20 12:56:20 +05:00
Mark Otto
453346262f Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-20 00:11:02 -07:00
Mark Otto
e347fffb14 update headings and nav 2013-07-20 00:10:51 -07:00
Mark Otto
a1065a1ef8 undo change to config exclude 2013-07-20 00:07:04 -07:00
Mark Otto
4b7f63a3a2 Update vars for badges, breadcrumbs; update customize page 2013-07-20 00:03:08 -07:00
Mark Otto
72d913baeb Move var in customize layout 2013-07-19 23:43:17 -07:00
Mark Otto
c2d3dad15b Merge pull request #8533 from frabrunelle/bower-link
update links to bower
2013-07-19 21:42:30 -07:00
Francis Brunelle
0f8d6e3112 update links to bower 2013-07-19 21:28:21 -04:00