Commits · b9a53b146811ed5cc844aebf563d48bf5b6d2bc5 · Administrator / bootstrap

02 Sep, 2011 32 commits
- button tweaks · b9a53b14
  Mark Otto authored Sep 02, 2011
  
  b9a53b14
- resolve conflicts · 6638f87f
  Mark Otto authored Sep 02, 2011
  
  6638f87f
- update the file input to undo the damage of the generic input selector · 62f89164
  Mark Otto authored Sep 02, 2011
  
  62f89164
- Merge branch '1.2-wip' of github.com:twitter/bootstrap into 1.2-wip · db43777d
  Jacob Thornton authored Sep 02, 2011
```
Conflicts:
	bootstrap-1.2.0.css
	bootstrap-1.2.0.min.css
```
  db43777d
- Merge branch 'master' of github.com:twitter/bootstrap into 1.2-wip · 3f242bc7
  Jacob Thornton authored Sep 02, 2011
```
Conflicts:
	bootstrap-1.2.0.css
```
  3f242bc7
- merge in master after merging a pull request, add comment · a4dc2c89
  Mark Otto authored Sep 02, 2011
  
  a4dc2c89
- Merge pull request #138 from pthrasher/master · f29c8abc
  Mark Otto authored Sep 02, 2011
```
Fix for popover issue from #136
```
  f29c8abc
- ran make build · 55698b30
  pthrasher authored Sep 02, 2011
  
  55698b30
- cleanup and tweaks · b18633ee
  Mark Otto authored Sep 02, 2011
  
  b18633ee
- incorporated idea from @markdotto in #138 · 5960afc3
  pthrasher authored Sep 02, 2011
  
  5960afc3
- remove fixed width from topbar form to allow for applying classes to resize it · 3f229251
  Mark Otto authored Sep 02, 2011
  
  3f229251
- ran make build, issues #136 and #138 · ce1d1c21
  pthrasher authored Sep 02, 2011
  
  ce1d1c21
- Fix for issue #136. Now nests fine in both layouts. · e6ffd3a8
  pthrasher authored Sep 02, 2011
  
  e6ffd3a8
- add old dropdown support to tabs dropdowns · db830140
  Mark Otto authored Sep 02, 2011
  
  db830140
- fix dropdown bug, remove second topbar from docs now · 411e3243
  Mark Otto authored Sep 02, 2011
  
  411e3243
- remove active state from buttons by moving the :active before :disabled · 46e4fb31
  Mark Otto authored Sep 02, 2011
  
  46e4fb31
- resolve conflicts · 25188289
  Mark Otto authored Sep 02, 2011
  
  25188289
- add temp second topbar to nav section, fix it's compatibility issues · fa94b264
  Mark Otto authored Sep 02, 2011
  
  fa94b264
- add doc styles back to topbar-inner · 2a5d829c
  Jacob Thornton authored Sep 02, 2011
  
  2a5d829c
- fix for dropdown · 813c5548
  Jacob Thornton authored Sep 02, 2011
  
  813c5548
- remake · 75afad43
  Jacob Thornton authored Sep 02, 2011
  
  75afad43
- Merge branch '1.2-wip' of github.com:twitter/bootstrap into 1.2-wip · ec82b613
  Jacob Thornton authored Sep 02, 2011
```
Conflicts:
	bootstrap-1.2.0.css
	bootstrap-1.2.0.min.css
	lib/patterns.less
```
  ec82b613
- div > ul ftw · 462287e2
  Jacob Thornton authored Sep 02, 2011
  
  462287e2
- move comment so less compiles · 5ef4519c
  Mark Otto authored Sep 02, 2011
  
  5ef4519c
- resolve conflict · 1b06f3e8
  Mark Otto authored Sep 02, 2011
  
  1b06f3e8
- add backwards compatability for dropdowns in topbar · 479e0ccd
  Mark Otto authored Sep 02, 2011
  
  479e0ccd
- this works O_O · c098225c
  Jacob Thornton authored Sep 02, 2011
  
  c098225c
- > seems to work O_O · 3f1706f5
  Jacob Thornton authored Sep 02, 2011
  
  3f1706f5
- backwards compat for old nav o_O · 0ed544a8
  Jacob Thornton authored Sep 02, 2011
  
  0ed544a8
- remove inset shadow from disabled buttons · 02abdd60
  Mark Otto authored Sep 02, 2011
  
  02abdd60
- Merge branch '1.2-wip' of github.com:twitter/bootstrap into 1.2-wip · 01595244
  Jacob Thornton authored Sep 02, 2011
```
Conflicts:
	bootstrap-1.2.0.css
```
  01595244
- for html5 style all inputs -- then unstyle checkbox, radio, button, reset, submit · 72da5dd5
  Jacob Thornton authored Sep 02, 2011
  
  72da5dd5
31 Aug, 2011 8 commits
- merging in remote and recompiling · 0cb6804b
  Mark Otto authored Aug 31, 2011
  
  0cb6804b
- spelling mistakes and undo of one comment · 62588327
  Mark Otto authored Aug 31, 2011
  
  62588327
- try daves background thing again... · f6a4dd95
  Jacob Thornton authored Aug 31, 2011
  
  f6a4dd95
- Merge branch 'master' of github.com:twitter/bootstrap into 1.2-wip · 90d174a3
  Jacob Thornton authored Aug 31, 2011
```
Conflicts:
	README.md
	bootstrap-1.2.0.css
```
  90d174a3
- rename all 1.1.1 stuff -> 1.2.0 and remove templates dir and fluid.html · 4fb1c5bd
  Jacob Thornton authored Aug 31, 2011
  
  4fb1c5bd
- revert dhg mdo suggestion for fixing ie · 588cb1c0
  Jacob Thornton authored Aug 31, 2011
  
  588cb1c0
- ie7 background toggle open · 49e343c4
  Jacob Thornton authored Aug 31, 2011
  
  49e343c4
- remove * hack for ie7 + remove -1 margin bug for ie7 · 2ed869c2
  Jacob Thornton authored Aug 31, 2011
  
  2ed869c2