19 Commits

Author	SHA1	Message	Date
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	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
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