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

5309 Commits

Author SHA1 Message Date
fat
6fdb18b641 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-26 20:34:59 -07:00
fat
e2d4cf5f68 change how collapse works - collapse, collapsing, and in 2013-07-26 20:34:39 -07:00
Mark Otto
ae3a1ddd14 Color change to sidenav 2013-07-26 20:20:21 -07:00
Mark Otto
46a332049f Mo betta side nav colors 2013-07-26 19:58:46 -07:00
Mark Otto
d16396f44a Fix broke ass popovers direction example 2013-07-26 19:50:02 -07:00
Mark Otto
20040868c1 Unfuck JS docs spacing and closing divs 2013-07-26 19:46:42 -07:00
Mark Otto
b2c618c212 Update IDs on customize page 2013-07-26 19:38:12 -07:00
Mark Otto
22fda2f54d Upate IDs on components page 2013-07-26 19:37:31 -07:00
Mark Otto
d89c3b9d23 Update IDs on css page 2013-07-26 19:35:24 -07:00
Mark Otto
e2d497c385 Update IDs on getting started page 2013-07-26 19:32:15 -07:00
Mark Otto
e3b8081b7e Better spacing of le docs sections 2013-07-26 19:32:05 -07:00
Mark Otto
e647d54f25 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-26 19:26:58 -07:00
fat
178d8e98de update docs nav targets 2013-07-26 19:25:45 -07:00
Mark Otto
71acb0c42b Tweak getting started section 2013-07-26 19:25:13 -07:00
Mark Otto
259ff8b6a4 More vars work 2013-07-26 19:24:59 -07:00
Mark Otto
305455a9b3 Use some vars for key urls for easier updating 2013-07-26 19:05:43 -07:00
Mark Otto
a285a3db3f more space in sidenav 2013-07-26 18:52:05 -07:00
Mark Otto
bdac42ea40 Merge pull request #8631 from jamescostian/patch-1
Fix ID of buttons section on javascript page
2013-07-26 18:47:08 -07:00
James Costian
2c58fab318 Fix ID of buttons section on javascript page
The old ID caused the link on affix to not work.
2013-07-26 19:15:11 -05:00
Mark Otto
e4159b53f6 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-26 16:53:00 -07:00
Mark Otto
75f5a70f7d Fixes #8293: sub nav links in JS docs 2013-07-26 16:52:09 -07:00
Mark Otto
e686464ad8 Simpler horizontal form button placement 2013-07-26 16:01:34 -07:00
Mark Otto
6585c723f8 Ignore less dir in Jekyll 2013-07-26 16:01:24 -07:00
Mark Otto
01c6617f79 Update inline and horizontal forms
* No more need for `.row.form-group`--only need `.form-group`
* Change tag selectors for inline form to use `.form-control`
* Docs improved to explain what's happening
2013-07-26 15:51:25 -07:00
Mark Otto
68827689e8 Use .form-control in input sizing CSS 2013-07-26 15:41:16 -07:00
Mark Otto
73427f717d Tweak side nav styles 2013-07-26 15:34:50 -07:00
Chris Rebert
7b4c40ddb5 Merge pull request #8630 from caouecs/patch-1
Fix example of textarea in css.html
2013-07-26 15:14:08 -07:00
Mark Otto
c75f3748e8 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-26 15:13:41 -07:00
Mark Otto
b513cd9add grunt on previous commits 2013-07-26 15:13:03 -07:00
Chris Rebert
6aa051b000 README: update stray "2.3.2" to "2.3.3" 2013-07-26 15:12:32 -07:00
Fred Delrieu
4ca3e3677a Example of textarea 2013-07-27 00:09:27 +02:00
Mark Otto
1cf0a07f17 Merge branch 'patch-3' of https://github.com/jholl/bootstrap into jholl-patch-3
Conflicts:
	css.html
2013-07-26 15:08:45 -07:00
Mark Otto
444973e54d Fixes #8605: use .form-control in .input-group instead of HTML tags 2013-07-26 14:31:24 -07:00
Mark Otto
5dd2bff38c more readme clarity and reorg--think this makes more sense now 2013-07-26 14:15:48 -07:00
Mark Otto
fd6f7dcce1 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-26 14:09:45 -07:00
Mark Otto
b82692b2bf more readme love 2013-07-26 14:09:12 -07:00
Chris Rebert
0168ebade2 tweak terminology to be pedantically correct & add link 2013-07-26 14:04:35 -07:00
Mark Otto
953e0e445c update 2.3.x version mention and link in readme 2013-07-26 13:59:56 -07:00
Mark Otto
bc1ba8f08b update readme per comments in pr 2013-07-26 13:58:18 -07:00
Mark Otto
1ad3e1e8a7 Merge branch '3.0.0-wip' of https://github.com/jojohess/bootstrap into jojohess-3.0.0-wip 2013-07-26 13:51:27 -07:00
Mark Otto
ded4ebfa7e Make customize layout match default layout 2013-07-26 13:50:55 -07:00
Mark Otto
52e8aedb8e More customizer changes, and revert to placeholder layout 2013-07-26 11:17:48 -07:00
Mark Otto
e3af87967a Fix broken indentation
Not sure when or how this happened, but I just noticed it—4 spaces were
used instead of 2.
2013-07-26 11:11:09 -07:00
Mark Otto
9e98b733f1 Vars update
* Drop progress bar text-shadow
* Reorganize popover and tooltip vars and fix complier error due to
missing `;`
* Run `grunt`
2013-07-26 11:08:27 -07:00
Mark Otto
e62e992b88 Merge branch '3.0.0-wip' of https://github.com/saas786/bootstrap into saas786-3.0.0-wip 2013-07-26 10:44:46 -07:00
Mark Otto
d28b7913f6 Merge pull request #8619 from jholl/patch-2
align dropdown menu with .pull-right for .input-group-btn when btn on ri...
2013-07-26 10:35:20 -07:00
Mark Otto
caa5b4b718 Merge pull request #8624 from jholl/patch-2
Update typo css.html move double class .form-control from label in examp...
2013-07-26 10:31:20 -07:00
Mark Otto
099e970953 Merge pull request #8625 from liuyl/fixbtnbg
Fix #8623
2013-07-26 10:30:41 -07:00
Chris Rebert
2d91e91b85 Merge pull request #8626 from cowboy/3.0.0-wip
It's Grunt, not GruntJS :)
2013-07-26 09:17:59 -07:00
Ben Alman
102fad4ebd It's Grunt, not GruntJS :) 2013-07-26 12:00:45 -04:00