0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-02 14:24:19 +01:00
Commit Graph

35 Commits

Author SHA1 Message Date
Mark Otto
22fa371259 Merge branch 'normalize' of https://github.com/necolas/bootstrap into necolas-normalize
Conflicts:
	bootstrap.css
	bootstrap.min.css
	lib/type.less
2012-01-23 11:25:16 -08:00
Jon Stevens
e0238bfb08 clean up variable usage with colors 2012-01-21 15:24:06 -08:00
Jacob Thornton
719713ca87 fix typo 2012-01-20 20:28:40 -08:00
Nicolas Gallagher
782c994060 Remove global reset in favour of contextual reset.
Rather than having a partial reset with individual elements having
their styles built back up, only elements without replacement
styles have specific properties 'reset'.

This commit also includes: a correction to the font mixin arguments
used on forms (the output is now valid CSS); the removal of
`overflow-y:scroll` from the `html` element which is now known to
cause some problems for jQuery modal plugins in Firefox.
2012-01-20 21:21:59 +00:00
Mark Otto
47b8184bbb scope table styles to a class, .table, instead of on the generic element as a smarter default 2012-01-17 23:39:18 -08:00
Mark Otto
8ceea1f559 fix some ie7 bugs, improve dropdowns for ie due to lack of a shadow, fix pager example code 2012-01-15 11:26:06 -08:00
Mark Otto
dab6d2b17c change up classes on tables and forms, fix nav list styles in example 2012-01-14 21:28:47 -08:00
Mark Otto
55ea574f8a update preventing double border line for bordered tables by account for th elements in tr elements 2012-01-14 16:50:36 -08:00
Mark Otto
32c6287259 comments and borders for multiple tbody 2012-01-11 09:43:13 -08:00
Mark Otto
a2ebf0c0c1 account for multiple tbody with 2px border between 2012-01-10 21:54:11 -08:00
Mark Otto
a339f0051b fixing tablesorter styles by adding the jquery plugin back to the lib, fixing the docs examples 2012-01-07 12:22:51 -08:00
Mark Otto
6dee40f469 adding back table grid sizing; will need support for responsive perhaps 2012-01-07 04:34:30 -08:00
Mark Otto
fb9401b355 tweaks abound, updated prettify styles, new sidenav component started, sprite icons started 2012-01-05 01:34:14 -08:00
Mark Otto
53c6dbff0d add appended input example to docs, fix help-text wrapping issue by clearing float 2011-12-27 17:04:55 -06:00
Mark Otto
cbb291b8ab Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Conflicts:
	bootstrap.css
	bootstrap.min.css
2011-11-29 22:35:58 -08:00
Mark Otto
b36df46310 misc docs updates, revamped tables CSS save for grid columns and tablesorter options 2011-11-29 22:35:03 -08:00
Jacob Thornton
3157de8d1d clean up comments for better built files 2011-11-25 21:34:55 -08:00
Mark Otto
4e6275d0fe update property order and do some misc cleanup 2011-11-17 01:28:42 -08:00
Mark Otto
02bf27592c overhaul the table styles and update those everywhere in the docs, update the button docs, spec out the forms docs 2011-10-31 19:37:10 -07:00
Mark Otto
96dd7a2903 update variables to inlude @baseFontSize, @baseFontFamily, @baseLineHeight for easier customization; added placeholder for @primaryButtonColor, but didn't implement 2011-10-04 00:20:38 -07:00
Mark Otto
b188c0da8b updated table styles a bit and floated the fluid columns to clear the row dropping problem we were having 2011-09-16 09:41:58 -07:00
Mark Otto
ba08055a7b update the modals and alert-messages to use the same .close styles, save for some positioning in the modal after knocking down the modal padding 2011-09-08 23:01:28 -07:00
Mark Otto
c474f996a9 tweaks to table styles to make them use @basefont and @baseline 2011-09-08 10:47:05 -07:00
Mark Otto
c705521e08 rebuild and updated tables to remove tags from selectors 2011-08-21 20:07:15 -07:00
Jacob Thornton
b342c4cca3 Simplification for table header generated-content arrow #9 2011-08-19 19:52:07 -07:00
Jacob Thornton
6d0b083b7d update whitspace and comment styles 2011-08-16 22:58:01 -07:00
Jacob Thornton
799fd6add0 get rid of assets/img in favor of css arrows 2011-07-02 11:51:05 -07:00
Mark Otto
460a84a926 Updated offset columns, fix app.js bug, misc tweaks to copy 2011-06-30 15:56:25 -07:00
Mark Otto
9e33ab20ab clean up commented out css, slightly updated docs again 2011-06-30 00:15:37 -07:00
Jacob Thornton
e72283ccaf fix comments up for non minified built file 2011-06-29 15:40:52 -07:00
Mark Otto
5f818d3d22 bunch of small tweaks, fixed a typo 2011-06-29 07:40:14 -07:00
Mark Otto
4e95e558db reseting baseline to 18px, fixing wells, moving pre styles for chili to docs 2011-06-28 15:11:41 -07:00
Jacob Thornton
e91a74e8e8 fix license indent and make comments consistent 2011-06-28 14:24:02 -07:00
Mark Otto
dd769f9a6e update to use latest version of bootstrap, docs cleanup, etc 2011-06-27 16:47:12 -07:00
Jacob Thornton
d447898bf2 rearranging everything 2011-05-03 18:09:25 -07:00