0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-11-29 11:24:18 +01:00
Commit Graph

125 Commits

Author SHA1 Message Date
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
Jacob Thornton
b39a9a680d go with greyed out next 2011-08-21 21:30:19 -07:00
Jacob Thornton
d8d12e20b4 fix border for popover ie6-7 2011-08-21 21:20:51 -07:00
Jacob Thornton
d90136b585 remove ie8 hack 2011-08-21 21:18:36 -07:00
Jacob Thornton
8ebdf4483f ie-6/7 hack for border colors 2011-08-21 21:09:54 -07:00
Mark Otto
34a19915f4 resolve conflicts 2011-08-21 20:33:54 -07:00
Mark Otto
027538e66d fix topbar dropdown active and hover states 2011-08-21 20:30:58 -07:00
Jacob Thornton
842ad01fce fix color for alert blocks in ie6-7 2011-08-21 20:21:59 -07:00
Mark Otto
59aea3bafd give popovers and modals border colors you can see in IE8 and down 2011-08-21 20:17:10 -07:00
Mark Otto
12efeccdf7 tweak pagination styles to include better border and box shadow 2011-08-21 20:12:18 -07:00
Mark Otto
80e0e9c413 updated list html, tweaks to patterns 2011-08-21 20:03:12 -07:00
Jacob Thornton
f17b2633ad fix btn borders ie7/ie8 2011-08-21 19:56:43 -07:00
Jacob Thornton
c3143b4729 Fix for alert box gradients in IE7/8 2011-08-21 19:49:31 -07:00
Jacob Thornton
48c3c6f1b6 make topbar .fill wrap 2011-08-21 18:14:53 -07:00
Mark Otto
2aeed35f24 pull filter gradients out completely because IE can't render them correctly in half of all instances and they are performance problems with them; tweak alert message styles, particularly close button; 2011-08-21 17:30:45 -07:00
Jacob Thornton
22dbf9d8e4 fix up the modals for ie8 2011-08-21 13:36:06 -07:00
Jacob Thornton
d019c677ad no gradients on alerts for <= ie8 2011-08-21 13:04:09 -07:00
Jacob Thornton
f8e9c6cf4e ie hack 2011-08-21 12:48:29 -07:00
Jacob Thornton
8ec7566f8b rgba breaks whole def 2011-08-21 12:42:43 -07:00
Jacob Thornton
7e67ddf788 another attempt at getting ie border thign working 2011-08-21 12:40:47 -07:00
Jacob Thornton
d671d566e1 more ie border junk 2011-08-21 12:35:14 -07:00
Jacob Thornton
971336c808 don't display right border for ie 2011-08-21 12:31:55 -07:00
Jacob Thornton
2435b6417a give pagination nav borders in ie 2011-08-21 12:26:51 -07:00
Jacob Thornton
b18e76f990 introduce .fill class to top-nav for overflow bug 2011-08-21 12:19:01 -07:00
Jacob Thornton
bb94457b4b blah 2011-08-21 12:01:27 -07:00
Jacob Thornton
d97fb89480 just disable filter 2011-08-21 11:59:50 -07:00
Jacob Thornton
612e5c3c9e add # to color 2011-08-21 11:57:25 -07:00
Jacob Thornton
0e8e30bf1d ie8 dropdown tweaks 2011-08-21 11:56:16 -07:00
Jacob Thornton
2203ba3df1 ie Xp 2011-08-21 11:53:06 -07:00
Jacob Thornton
3d73e674dd more debugging of ie nav display issues 2011-08-21 11:45:24 -07:00
Jacob Thornton
1fc4491cd6 simplify drop down logic - fix color of search hover for ie 2011-08-21 11:22:33 -07:00
Mark Otto
2fcb67777a merging in misc fixes to docs and css from other branch 2011-08-20 20:19:03 -07:00
Mark Otto
72899a4ee8 updated docs to fix inconsistent display of code elements, update scaffolding to fix padding issue on fluid containers, add placeholder hero unit in patterns for future use, continue to refactor some rgba to hex values 2011-08-20 18:58:12 -07:00
Daniel Liuzzi
536529c255 Fixed a couple of missing parentheses. 2011-08-21 06:27:06 +03:00
Mark Otto
3f388ef07a updates to the topbar markup and css to remove the logo classname and simplify the selectors for it 2011-08-19 22:28:22 -07:00
Jacob Thornton
6d0b083b7d update whitspace and comment styles 2011-08-16 22:58:01 -07:00
Mark Otto
88bd6f72da resolve compiled css merge prob, refine few small things 2011-07-29 13:10:33 -07:00
Jacob Thornton
7f99892b86 change popover stufff 2011-07-28 17:50:38 -07:00
Mark Otto
5a1a01869a new popover ideas 2011-07-05 14:24:53 -07:00
Mark Otto
768fa3c8a6 Merge branch 'master' of http://git.local.twitter.com/bootstrap 2011-07-02 15:29:57 -07:00
Jacob Thornton
799fd6add0 get rid of assets/img in favor of css arrows 2011-07-02 11:51:05 -07:00
Jacob Thornton
e112d34b42 Merge branch 'master' of http://git.local.twitter.com/bootstrap 2011-07-02 10:47:25 -07:00
Jacob Thornton
52dfbe6500 add "make watch" to auto watch less files - change patterns.less to use opacity method 2011-07-01 23:21:11 -07:00
Mark Otto
3117fc979d getting popovers in 2011-07-01 23:10:39 -07:00
Mark Otto
5992b4e0af spacing fixes 2011-07-01 22:21:49 -07:00
Mark Otto
cbf6919959 drop padding on twipsies 2011-07-01 22:19:15 -07:00
Jacob Thornton
8245a7087e add twipsies... 2011-07-01 21:30:12 -07:00
Mark Otto
87f9ea00e4 updated docs 2011-06-30 13:17:58 -07:00
Mark Otto
b57221e4ca attempts to resolve bad chrome position fixed bug 2011-06-30 11:13:00 -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
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
e3865e75ac nav change to undo the top nav bold active state 2011-06-28 12:39:58 -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
80abe21189 resolve conflict in patterns from modals 2011-06-28 10:47:26 -07:00
Mark Otto
68f421eac7 more modal tweaks i think 2011-06-28 10:45:27 -07:00
Jacob Thornton
e33808447e started workign on modals 2011-06-28 01:15:03 -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
Jacob Thornton
d447898bf2 rearranging everything 2011-05-03 18:09:25 -07:00