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

5045 Commits

Author SHA1 Message Date
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
Mark Otto
7c5f7a4e82 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-19 17:36:16 -07:00
Mark Otto
b6238c5f20 Fixes #8385: update carousel captions
* No longer hidden by default--up to users to figure that part out with
longer content
* Cleaned up styles and spacing
2013-07-19 17:36:03 -07:00
Mark Otto
8ab77191ce Twerk callouts and fix an unstyled one 2013-07-19 17:17:52 -07:00
Mark Otto
6cce56061f Better code snippets on mobile in docs 2013-07-19 17:09:39 -07:00
Mark Otto
dd3eefc0f9 Merge pull request #8530 from codeodor/3.0.0-wip
ignore .files for bower packaging
2013-07-19 16:54:22 -07:00
Mark Otto
95b9f44190 Fixes #8278: fix on print 2013-07-19 16:49:38 -07:00
Mark Otto
f25d8c0080 hacky way of not showing ads or analytics in local dev 2013-07-19 14:08:16 -07:00
Mark Otto
4b0fa356f3 Variables reorganization and breadcrumbs update
* Place component vars alongside the rest of the component vars
* Redo some of the breadcrumbs code to add a var and remove
`text-shadow`
2013-07-19 11:44:35 -07:00
Mark Otto
b1819755b8 Merge branch '3.0.0-wip' of https://github.com/saas786/bootstrap into saas786-3.0.0-wip 2013-07-19 11:29:21 -07:00
Sammy Larbi
b8348416b0 ignore .files for bower packaging 2013-07-19 13:23:17 -05:00
syed
65ee36a7bf Improved and followed pattern suggestions 2013-07-19 23:14:13 +05:00
Mark Otto
416fd9d19b Merge pull request #8528 from dtmax/3.0.0-wip
typo fixed: highligted source code of second radio button was missing
2013-07-19 09:34:20 -07:00
syed
5e898fa2a1 move breadcrumb.less inline properties and also added @color-2 missed in last commit 2013-07-19 18:39:51 +05:00
syed
b37127e2fc move badges inline properties to variables.less 2013-07-19 18:29:19 +05:00
syed
95be924926 Move accordion inline properties to variables.les 2013-07-19 18:18:01 +05:00
Max
6f9ed7efeb typo fixed: highligted source code of second radio button was missing in css.html -> checkboxes & radios -> default section 2013-07-19 13:28:26 +03:00
Mark Otto
710dbb5260 Merge pull request #8524 from jholl/patch-1
fix typo / doc components.html responsive menu dropdowns now have ref to...
2013-07-18 21:07:34 -07:00
James Holland
bbe0d0d874 fix typo / doc components.html responsive menu dropdowns now have ref to .dropdown-header instead of .nav-header 2013-07-19 00:04:58 -04:00
Mark Otto
49f2f7fad9 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-18 19:53:53 -07:00
Mark Otto
e440ff4b3f <input> and <select> sizing update
Restores `font-size` and more to the `<select>` element while also
changing from `min-height` to `height` for input sizing.

Fixes #8520 as opened by @ShaunR (would've merged that PR but I moved
everything around right before).
2013-07-18 19:53:32 -07:00
Mark Otto
e160b14223 Merge pull request #8521 from epicyclist/3.0.0-wip
Documentation updates.
2013-07-18 19:36:16 -07:00
Christopher Canipe
896d159987 Remove Mustache comment regarding contribution: it's going away. 2013-07-18 20:09:33 -06:00
Christopher Canipe
3e8b3a246a Clean up tooltip's trigger description in the docs. 2013-07-18 19:41:42 -06:00
Mark Otto
0a3722112c Add minified CSS to dist folder 2013-07-18 18:33:20 -07:00