rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-13 01:08:58 +01:00
Code Issues Actions Packages Releases Activity
10,505 Commits 108 Branches 89 Tags 553 MiB
66217e4a85
Commit Graph

10505 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jacob Thornton
db43777ddf Merge branch '1.2-wip' of github.com:twitter/bootstrap into 1.2-wip 
Conflicts:
	bootstrap-1.2.0.css
	bootstrap-1.2.0.min.css
 2011-09-02 11:49:41 -07:00
Jacob Thornton
3f242bc70c Merge branch 'master' of github.com:twitter/bootstrap into 1.2-wip 
Conflicts:
	bootstrap-1.2.0.css
 2011-09-02 11:49:03 -07:00
Mark Otto
a4dc2c8955 merge in master after merging a pull request, add comment 2011-09-02 09:52:33 -07:00
Mark Otto
f29c8abcbb Merge pull request #138 from pthrasher/master 
Fix for popover issue from #136
 2011-09-02 09:51:32 -07:00
pthrasher
55698b303d ran make build 2011-09-02 12:48:32 -04:00
Mark Otto
b18633ee14 cleanup and tweaks 2011-09-02 09:48:31 -07:00
pthrasher
5960afc349 incorporated idea from @markdotto in #138 2011-09-02 12:45:03 -04:00
Mark Otto
3f22925144 remove fixed width from topbar form to allow for applying classes to resize it 2011-09-02 09:35:26 -07:00
pthrasher
ce1d1c2146 ran make build, issues #136 and #138 2011-09-02 11:19:05 -04:00
pthrasher
e6ffd3a86f Fix for issue #136. Now nests fine in both layouts. 2011-09-02 10:43:26 -04:00
Mark Otto
db830140ee add old dropdown support to tabs dropdowns 2011-09-02 01:03:16 -07:00
Mark Otto
411e324340 fix dropdown bug, remove second topbar from docs now 2011-09-02 00:58:07 -07:00
Mark Otto
46e4fb3133 remove active state from buttons by moving the :active before :disabled 2011-09-02 00:56:03 -07:00
Mark Otto
251882892f resolve conflicts 2011-09-02 00:52:22 -07:00
Mark Otto
fa94b264fa add temp second topbar to nav section, fix it's compatibility issues 2011-09-02 00:50:05 -07:00
Jacob Thornton
2a5d829c4a add doc styles back to topbar-inner 2011-09-02 00:47:06 -07:00
Jacob Thornton
813c55489f fix for dropdown 2011-09-02 00:42:22 -07:00
Jacob Thornton
75afad4325 remake 2011-09-02 00:32:57 -07:00
Jacob Thornton
ec82b613d3 Merge branch '1.2-wip' of github.com:twitter/bootstrap into 1.2-wip 
Conflicts:
	bootstrap-1.2.0.css
	bootstrap-1.2.0.min.css
	lib/patterns.less
 2011-09-02 00:32:09 -07:00
Jacob Thornton
462287e25e div > ul ftw 2011-09-02 00:31:19 -07:00
Mark Otto
5ef4519ca8 move comment so less compiles 2011-09-02 00:29:54 -07:00
Mark Otto
1b06f3e84e resolve conflict 2011-09-02 00:29:27 -07:00
Mark Otto
479e0ccd6b add backwards compatability for dropdowns in topbar 2011-09-02 00:28:54 -07:00
Jacob Thornton
c098225cd5 this works O_O 2011-09-02 00:26:58 -07:00
Jacob Thornton
3f1706f5f6 > seems to work O_O 2011-09-02 00:21:55 -07:00
Jacob Thornton
0ed544a82e backwards compat for old nav o_O 2011-09-02 00:17:13 -07:00
Mark Otto
02abdd6037 remove inset shadow from disabled buttons 2011-09-02 00:02:44 -07:00
Jacob Thornton
0159524413 Merge branch '1.2-wip' of github.com:twitter/bootstrap into 1.2-wip 
Conflicts:
	bootstrap-1.2.0.css
 2011-09-01 22:54:59 -07:00
Jacob Thornton
72da5dd54d for html5 style all inputs -- then unstyle checkbox, radio, button, reset, submit 2011-09-01 22:53:24 -07:00
Mark Otto
0cb6804b69 merging in remote and recompiling 2011-08-31 16:27:28 -07:00
Mark Otto
6258832776 spelling mistakes and undo of one comment 2011-08-31 16:26:47 -07:00
Jacob Thornton
f6a4dd95b6 try daves background thing again... 2011-08-31 10:55:53 -07:00
Jacob Thornton
90d174a34d Merge branch 'master' of github.com:twitter/bootstrap into 1.2-wip 
Conflicts:
	README.md
	bootstrap-1.2.0.css
 2011-08-30 23:37:46 -07:00
Jacob Thornton
4fb1c5bd4b rename all 1.1.1 stuff -> 1.2.0 and remove templates dir and fluid.html 2011-08-30 23:34:19 -07:00
Jacob Thornton
588cb1c06d revert dhg mdo suggestion for fixing ie 2011-08-30 23:25:37 -07:00
Jacob Thornton
49e343c464 ie7 background toggle open 2011-08-30 23:08:34 -07:00
Jacob Thornton
2ed869c2ee remove * hack for ie7 + remove -1 margin bug for ie7 2011-08-30 23:03:01 -07:00
Mark Otto
44b18f4911 Merge pull request #126 from DHS/fix-select-labels 
Fixed duplicate element ids in documentation
 2011-08-30 18:26:11 -07:00
Mark Otto
89b5fd949b Merge pull request #125 from DHS/readme-spelling 
Fixed readme spelling mistake, closes #123
 2011-08-30 18:25:32 -07:00
Mark Otto
ed1139e838 change type of comment 2011-08-30 08:27:55 -07:00
David Haywood Smith
55022228bc Fixed duplicate element ids 
Also updated labels where required
 2011-08-30 11:47:40 +01:00
David Haywood Smith
a16dfb735a Fixed readme spelling mistake, closes #123 2011-08-30 11:19:46 +01:00
Jacob Thornton
afec7859cc fix background color for ie7 -- negative margin bug still there though ;_; 2011-08-29 22:43:40 -07:00
Jacob Thornton
efd6fd609c fix open ui for ie 7 2011-08-29 22:36:05 -07:00
Jacob Thornton
fc0471a450 lulz nbsp 2011-08-29 22:34:13 -07:00
Jacob Thornton
e8f1ae0073 btn's need &nbps; seperating them for ie7 2011-08-29 21:52:45 -07:00
Mark Otto
d42a00c19d remove repeated table reset 2011-08-29 21:42:44 -07:00
Mark Otto
7070d44aed adding more grid docs 2011-08-29 21:41:32 -07:00
Jacob Thornton
589204803b remove duplicate defined btn class O_O 2011-08-29 21:41:12 -07:00
Mark Otto
f17fc367f7 le merging conflicts 2011-08-29 21:26:53 -07:00