rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-11-29 11:24:18 +01:00
Code Issues Actions Packages Releases Activity
5,183 Commits 108 Branches 89 Tags 547 MiB
c8883647ae
Commit Graph

5183 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Yulong Liu
e4300fa1bf fix background of btn-link 2013-07-26 22:27:55 +08:00
Yulong Liu
a2f120a7aa remove background:none 2013-07-26 21:59:50 +08:00
James Holland
0e7aad8b8d Update typo css.html move double class .form-control from label in example mark up to input 
missed the double class in label in recent commit #8621
 2013-07-26 09:43:05 -04:00
James Holland
2e7593a40d Update forms.less to remove .form-horizontal .row + .row 
use .form-group to apply consistent vertical spacing on form rows
 2013-07-26 09:04:39 -04:00
James Holland
6115f01adb Update css.html in .form-horizontal 
to use .row.form-group for horizontal spacing instead of .form-horizontal .row + .row
 2013-07-26 08:58:47 -04:00
syed
1b8ba0d159 move things around :) 
Moved pager, pagination, popovers, tooltip, progress bars & type
properties to variables.less
 2013-07-26 17:04:15 +05:00
James Holland
f7a376569a align dropdown menu with .pull-right for .input-group-btn when btn on right of input 2013-07-26 07:52:40 -04:00
Jordan Hess
cd23ae00dd Added windows hint to jekyll documentation instructions. 2013-07-26 03:25:12 -06:00
Jordan Hess
fe095d17a2 Changed old reference to "grunt bootstrap" to "grunt dist" 2013-07-26 03:16:27 -06:00
Mark Otto
2a51ebf671 readme /cc @zdroid 2013-07-26 01:46:30 -07:00
Mark Otto
5b2b46fe28 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-26 01:43:53 -07:00
Mark Otto
5d766d9e2f Mo betta placement of old docs callouts 2013-07-26 01:43:43 -07:00
Chris Rebert
2910e3cb5a Merge pull request #8614 from cvrebert/grunt 
Switch from `make` to `grunt`
Rebase of #7786 against soon-to-be 3.0.0-rc.1
 2013-07-26 01:34:58 -07:00
Chris Rebert
2d58534519 Merge pull request #8616 from caouecs/patch-1 
Small typo in less/mixins.less
 2013-07-26 01:20:10 -07:00
Chris Rebert
a317f67c1c re-integrate #8560 using @fat's code from the comment on #8614 2013-07-26 01:15:41 -07:00
Fred Delrieu
06980ae5a1 Small typo 2013-07-26 10:10:35 +02:00
Chris Rebert
292d8d6819 specify explicit ordering for grunt concat step 2013-07-26 01:07:56 -07:00
John-Philip Johansson
0d33455ef4 Replace Makefile with GruntJS 
A rebase (against soon-to-be 3.0.0-rc.1) & squash of
https://github.com/twbs/bootstrap/pull/7786 AKA
https://github.com/twitter/bootstrap/pull/7786
originally by
@seriema
@mokkabonna
@jojohess

Rebased by @cvrebert
 2013-07-26 00:39:14 -07:00
fat
995add132e Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-26 00:22:48 -07:00
fat
91b6a43ed9 fix makefile error thing 2013-07-26 00:22:20 -07:00
Mark Otto
210ee63693 Fixes #8586: add addional color text classes to apply all of branch colors easily 2013-07-26 00:18:18 -07:00
Mark Otto
d604052aa5 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-26 00:04:24 -07:00
Mark Otto
c23ba4d50b Fuck a color purple 2013-07-26 00:04:15 -07:00
Mark Otto
b4f023f809 Make it so back to top link ain't broked no mo 2013-07-26 00:02:20 -07:00
fat
5588e14867 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-25 23:57:37 -07:00
fat
778f3a3df7 update docs a bit more for affix 2013-07-25 23:57:21 -07:00