Commits · 46e4fb31338807be1535208fb07dfc3fff89fe08 · Administrator / bootstrap

02 Sep, 2011 17 commits
- 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 10 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
- Merge pull request #126 from DHS/fix-select-labels · 44b18f49
  Mark Otto authored Aug 31, 2011
```
Fixed duplicate element ids in documentation
```
  44b18f49
- Merge pull request #125 from DHS/readme-spelling · 89b5fd94
  Mark Otto authored Aug 31, 2011
```
Fixed readme spelling mistake, closes #123
```
  89b5fd94
30 Aug, 2011 12 commits
- change type of comment · ed1139e8
  Mark Otto authored Aug 30, 2011
  
  ed1139e8
- Fixed duplicate element ids · 55022228
  David Haywood Smith authored Aug 30, 2011
```
Also updated labels where required
```
  55022228
- Fixed readme spelling mistake, closes #123 · a16dfb73
  David Haywood Smith authored Aug 30, 2011
  
  a16dfb73
- fix background color for ie7 -- negative margin bug still there though ;_; · afec7859
  Jacob Thornton authored Aug 30, 2011
  
  afec7859
- fix open ui for ie 7 · efd6fd60
  Jacob Thornton authored Aug 30, 2011
  
  efd6fd60
- lulz nbsp · fc0471a4
  Jacob Thornton authored Aug 30, 2011
  
  fc0471a4
- btn's need &nbps; seperating them for ie7 · e8f1ae00
  Jacob Thornton authored Aug 30, 2011
  
  e8f1ae00
- remove repeated table reset · d42a00c1
  Mark Otto authored Aug 30, 2011
  
  d42a00c1
- adding more grid docs · 7070d44a
  Mark Otto authored Aug 30, 2011
  
  7070d44a
- remove duplicate defined btn class O_O · 58920480
  Jacob Thornton authored Aug 30, 2011
  
  58920480
- le merging conflicts · f17fc367
  Mark Otto authored Aug 30, 2011
  
  f17fc367
- resolving deltas between that epic css selector specifity pull request and latest changes here · 654cc5ad
  Mark Otto authored Aug 30, 2011
  
  654cc5ad
27 Aug, 2011 1 commit
- redefine the grid to use attribute selectors with css regex, make previously... · 65025122
  Mark Otto authored Aug 27, 2011
```
redefine the grid to use attribute selectors with css regex, make previously fixed grid values use variables we use elsewhere
```
  65025122