162 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	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	f6a4dd95b6	try daves background thing again...	2011-08-31 10:55:53 -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
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
Mark Otto	654cc5ad3f	resolving deltas between that epic css selector specifity pull request and latest changes here	2011-08-29 21:24:00 -07:00
Jacob Thornton	58cc70531a	drop top position a bit	2011-08-28 17:50:14 -07:00
Jacob Thornton	484ed088fc	blah	2011-08-28 17:45:57 -07:00
Jacob Thornton	ebff554430	remake with opacity thin	2011-08-28 17:42:09 -07:00
Jacob Thornton	9059a72bf8	try using tricker opacity thingy	2011-08-28 17:40:25 -07:00
Jacob Thornton	a0cb72f9ae	change window to 'body'	2011-08-28 16:36:44 -07:00
Jacob Thornton	1a5f8205ff	alpha for ie	2011-08-28 16:23:57 -07:00
Jacob Thornton	0b1d2cc03c	change backdrop for ie	2011-08-28 14:06:37 -07:00
Jacob Thornton	e05d39d4cc	make generic fade animation css class	2011-08-27 18:03:01 -07:00
Jacob Thornton	2ee7c20692	adds popover js	2011-08-27 17:22:49 -07:00
Mark Otto	650251228b	redefine the grid to use attribute selectors with css regex, make previously fixed grid values use variables we use elsewhere	2011-08-27 15:30:18 -07:00
Jacob Thornton	11721f376d	add boostrap-twipsy and bootstrap-alerts	2011-08-27 13:03:06 -07:00
Jacob Thornton	1cbda504a0	clean up show logic	2011-08-27 00:28:58 -07:00
Jacob Thornton	24c4ca0391	display none for inactive modals	2011-08-27 00:03:11 -07:00
Jacob Thornton	c26eb016fb	starting up bootstrap-js...	2011-08-26 23:57:35 -07:00
Mark Otto	b552281558	make dropdowns in the topbar black again	2011-08-26 23:18:39 -07:00
Mark Otto	4f67e135dc	adding dropdowns to tabs by refactoring the shizzzz out of them	2011-08-26 20:38:23 -07:00
Jacob Thornton	a63fb4d234	Merge branch '1.1.1-wip'	2011-08-26 15:21:20 -07:00
Weslly Honorato	9e0a526a66	fixed background-color for disabled links in pagination ('none' isn't a valid value for background-color property http://www.w3.org/TR/CSS2/colors.html#propdef-background-color)	2011-08-26 13:30:38 -03:00
Mark Otto	8c2df3ac3a	resolve conflicts in merging in other branch	2011-08-25 23:12:29 -07:00
Mark Otto	ce615d016a	merged in my pending changes from 1.2-wip branch, resolve diffs as best as i could, update docs and alerts to use original classes, updated docs to include smaller section for layouts	2011-08-25 22:41:45 -07:00
Jacob Thornton	04b8e667d0	clean up btn selectors a bit	2011-08-25 13:52:04 -07:00
Jacob Thornton	0e9d7c1c4d	update alert and button styling aproach	2011-08-25 13:31:46 -07:00
Mark Otto	50f484eed6	big update to change the alerts, normal and block level, to have simpler css and new colors independent of the base color scheme	2011-08-25 02:00:07 -07:00
Mark Otto	2d99e3f8a6	base import of normalize into the reset css, tweaks to selector specificity across the board	2011-08-25 00:13:40 -07:00
Jacob Thornton	899c6f8d12	remake	2011-08-22 21:47:34 -07:00
Jacob Thornton	8a27d281a9	goodbye -ms-filter.	2011-08-22 21:31:30 -07:00
Mark Otto	d324a24268	adding first template to the repo for a generic website page	2011-08-22 12:50:30 -07:00
Daniel Hoelbling	96ec9ee083	Fixed a syntax error preventing less compilation with dotless	2011-08-22 09:36:35 +02:00
Jacob Thornton	109027433d	finish cleaning up ie 7-8 support	2011-08-21 22:26:54 -07:00
Jacob Thornton	f408f5c29b	update few things for ie	2011-08-21 22:13:35 -07:00
Jacob Thornton	b54dc13535	Merge branch 'misc_css_fixes' ... Conflicts: bootstrap-1.0.0.css lib/patterns.less	2011-08-21 21:42:10 -07:00