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

45 Commits

Author SHA1 Message Date
Mark Otto
6d118411e1 resolve conflict 2011-09-02 22:09:49 -07:00
Mark Otto
1625341391 fix repeated margin-left 2011-09-02 22:09:12 -07:00
Mark Otto
5c3f0e32e6 updated container mixin to be fixed-container instead so we can keep the .container in scaffolding while removing the repeated code 2011-09-02 22:08:38 -07:00
Jacob Thornton
3c9c85b1ed Merge branch 'js-examples' into 1.3-wip
Conflicts:
	bootstrap-1.2.0.css
2011-09-02 21:06:49 -07:00
Jacob Thornton
0e13f8dca1 Merge branch 'master' of github.com:twitter/bootstrap into js-examples
Conflicts:
	bootstrap-1.2.0.css
	bootstrap-1.2.0.min.css
	lib/patterns.less
	lib/scaffolding.less
2011-09-02 21:04:25 -07:00
Mark Otto
c4481b54a8 improve CSS properties for centering content, the container, and fluid container so as to not override properties where possible 2011-09-02 21:00:01 -07:00
Mark Otto
298e1b59bb fix broken checkbox in ie7 2011-09-02 12:46:47 -07:00
Mark Otto
cb244d5d51 fix docs.css spacing, add gradient support for ie9 back 2011-09-02 12:31:14 -07:00
Mark Otto
8c1e60c638 add reset filter to preboot for turning off gradients in IE when necessary; make :disabled [disabled] for crossbrowser usage 2011-09-02 12:19:43 -07:00
Jacob Thornton
60409660d7 \9 for 8 or less ie 2011-09-02 12:01: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
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
c26eb016fb starting up bootstrap-js... 2011-08-26 23:57:35 -07:00
Mark Otto
0fcda16209 be more specific in gradient mixin 2011-08-25 23:31:16 -07:00
Mark Otto
0758f64045 updated classnames in the docs for the alerts, updated colors on error and info alerts/buttons 2011-08-25 22:52:21 -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
Jacob Thornton
0739583a46 optimize btn for outputted code + line-height: normal for firefox with adjusted padding 2011-08-24 15:55:08 -07:00
Jacob Thornton
7d7156bff9 optimized grid system from @necolas 2011-08-23 20:16:39 -07:00
Jacob Thornton
411b90e4ff comment out button method with // so less doesn't compile it into source 2011-08-22 22:02:31 -07:00
Mark Otto
ebec320395 Merge pull request #58 from sankage/master
fixed #10: color-stop() function removed, @colorStop fixed for moz to be unitless
2011-08-22 09:34:39 -07:00
sankage
6145fd2931 changed @colorStop to be unitless 2011-08-22 18:19:39 -03:00
sankage
e45dbf52de fixed color-stop for opera, ie10, w3c, new webkit 2011-08-22 18:01:11 -03:00
Mark Otto
a98d2cccb8 merge in master, resolve conflicts 2011-08-21 20:47:24 -07:00
Mark Otto
254e70550e remove 60px top margin on body and tweak a few other things 2011-08-21 17:06:37 -07:00
Mark Otto
aaf9f752c4 docs spacing, spare divs in a few places, updating css spacing 2011-08-20 23:25:22 -07:00
sankage
f824009e20 mozilla doesn't support color-stop() function in gradients 2011-08-21 02:16:04 -03:00
sankage
ee6f3077c0 serif font stack would default to sans-serif 2011-08-20 07:12:39 -03:00
Jacob Thornton
73f1bcf717 Simpler clearfix #2 http://nicolasgallagher.com/micro-clearfix-hack/ 2011-08-19 20:20:48 -07:00
Divya Manian
36b41f2e7a adding o/ms gradient and unprefixed one 2011-08-19 12:53:19 -07:00
Jacob Thornton
6d0b083b7d update whitspace and comment styles 2011-08-16 22:58:01 -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
Mark Otto
cddc565d07 Merge branch 'master' of http://git.local.twitter.com/bootstrap 2011-06-29 17:11:02 -07:00
Mark Otto
936d7acb31 trying out new doc style stuff 2011-06-29 15:51:27 -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
a878b83e69 remove display: inline from columns since it's an IE6 specific fix and doesn't work with floats 2011-06-28 19:56:26 -07:00
Mark Otto
b11784fec0 adding attribution in footer, link up names, clean up button styles 2011-06-28 15:31:05 -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
9660f6f18d new buttons, new modal updates around spacing and placeholder content 2011-06-28 11:56:49 -07:00
Mark Otto
243fc873d9 mucho updato around buttons to fix some stuff that was introduced with the bootstrap update 2011-06-27 17:15:26 -07:00
Mark Otto
dd769f9a6e update to use latest version of bootstrap, docs cleanup, etc 2011-06-27 16:47:12 -07:00