root
/
bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Issues Actions 2 Packages Projects Releases Wiki Activity
576 Commits 133 Branches 94 Tags 680 MiB
Commit Graph

292 Commits

Author SHA1 Message Date
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
Mark Otto 6258832776 spelling mistakes and undo of one comment 2011-08-31 16:26:47 -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
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
Mark Otto ed1139e838 change type of comment 2011-08-30 08:27:55 -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 d42a00c19d remove repeated table reset 2011-08-29 21:42:44 -07:00
Mark Otto 7070d44aed adding more grid docs 2011-08-29 21:41:32 -07:00
Jacob Thornton 589204803b remove duplicate defined btn class O_O 2011-08-29 21:41:12 -07:00
Mark Otto f17fc367f7 le merging conflicts 2011-08-29 21:26:53 -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 df8b65445c small typo in offset generation 2011-08-26 19:31:50 -07:00
Jacob Thornton a63fb4d234 Merge branch '1.1.1-wip' 2011-08-26 15:21:20 -07:00
Jacob Thornton 273659c8e7 update everything to 1.1.1 2011-08-26 11:13:47 -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 0fcda16209 be more specific in gradient mixin 2011-08-25 23:31:16 -07:00
Mark Otto ab77d7abd3 spacing 2011-08-25 23:19:01 -07:00
Mark Otto 8c2df3ac3a resolve conflicts in merging in other branch 2011-08-25 23:12:29 -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
Igor Bozato 9a00619d6e .sidebar and .content in fluid layouts don't need to be divs 2011-08-26 03:17:38 -03:00
Mark Otto 7d821f18ac resolve issue #87 in this branch 2011-08-25 22:44:23 -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 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 0bfce13983 add delete button + give .btn cursor:pointer 2011-08-22 23:53:02 -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
Jacob Thornton 40aba9ca1d append checkbox to password input #36 2011-08-22 21:51:17 -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
Mark Otto 16064bed2d Bugfix and copy changes 2011-08-22 12:34:55 -07:00
Jacob Thornton 8497d935ad Merge branch 'master' of github.com:twitter/bootstrap 2011-08-22 11:27:21 -07:00
Mark Otto ee6402b6c8 Merge pull request #51 from Tigraine/master 
Fixed syntax error in patterns.less
 2011-08-22 09:35:09 -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
Daniel Hoelbling 96ec9ee083 Fixed a syntax error preventing less compilation with dotless 2011-08-22 09:36:35 +02:00
Jacob Thornton 3ef86aa703 v1.1.0 2011-08-21 22:30:39 -07: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 e11c49cc48 Merge branch 'master' of github.com:twitter/bootstrap 
Conflicts:
	bootstrap-1.0.0.css
	bootstrap-1.0.0.min.css
	docs/index.html
 2011-08-21 21:42:56 -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 0df17f06d8 re-add div to error class 2011-08-21 20:53:52 -07:00
Mark Otto 23ec21d049 resolve conflicts 2011-08-21 20:51:13 -07:00
Mark Otto a98d2cccb8 merge in master, resolve conflicts 2011-08-21 20:47:24 -07:00
Jacob Thornton 2f6f9ec6e0 Merge branch 'misc_css_fixes' of github.com:twitter/bootstrap into misc_css_fixes 
Conflicts:
	lib/forms.less
 2011-08-21 20:42:54 -07:00
Jacob Thornton 0e92acd9ff more little ie6-7 hacks :/ 2011-08-21 20:41:34 -07:00
Mark Otto b59b82b032 updated to resolve conflicts 2011-08-21 20:38:57 -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
Mark Otto f630615d26 remove tags from form selectors 2011-08-21 20:27:19 -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 c705521e08 rebuild and updated tables to remove tags from selectors 2011-08-21 20:07:15 -07:00
Mark Otto 80e0e9c413 updated list html, tweaks to patterns 2011-08-21 20:03:12 -07:00
Jacob Thornton 60fc4eb7b9 touch up less 2011-08-21 19:59:43 -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
Jacob Thornton e1e4ceee3f fix disabled button for ie 8 and below 2011-08-21 18:07:47 -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
Mark Otto 254e70550e remove 60px top margin on body and tweak a few other things 2011-08-21 17:06:37 -07:00
Jacob Thornton 22dbf9d8e4 fix up the modals for ie8 2011-08-21 13:36:06 -07:00
Jacob Thornton 0ca33aa1ba darken shadow for ie 2011-08-21 13:27:17 -07:00
Jacob Thornton 7c45f6cc7f define button border size for ie 2011-08-21 13:26:01 -07:00
Jacob Thornton 96af4f6acf add "shadows" for ie buttons 2011-08-21 13:22:39 -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 1d96417201 try only -ms-filter 2011-08-21 12:06:22 -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 6db39d0ec3 fix error styles a bit on stacked form fields 2011-08-20 23:56:32 -07:00
Mark Otto 79bdb80543 fix bg-clip property's old value, move from padding to padding-box 2011-08-20 23:47:23 -07:00
Mark Otto 4512cc5652 updated compiled and minified, fix bug where links didn't inherit font weight 2011-08-20 23:45:01 -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
Mark Otto 5a2d1abfbf Merge pull request #30 from sankage/master 
color-stop() not supported in mozilla gradients
 2011-08-20 21:06:01 -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
sankage ee6f3077c0 serif font stack would default to sans-serif 2011-08-20 07:12:39 -03:00
Mark Otto 261a473a72 adding more details on browser support, adding snippet of about text, changed p tags to have half the bottom margin 2011-08-20 01:51:06 -07: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
Mark Otto 6dcfe94bab remove the cite tag from blockquote since we pulled it from the docs 2011-08-19 22:15:57 -07:00
Jacob Thornton 73f1bcf717 Simpler clearfix #2 http://nicolasgallagher.com/micro-clearfix-hack/ 2011-08-19 20:20:48 -07:00
Jacob Thornton b342c4cca3 Simplification for table header generated-content arrow #9 2011-08-19 19:52:07 -07:00
Jacob Thornton 630b874dbd small or cite tag for Blockquotes 2011-08-19 19:38:44 -07:00
Divya Manian 36b41f2e7a adding o/ms gradient and unprefixed one 2011-08-19 12:53:19 -07:00
Mark Otto bd1d389751 tweaks around names and such 2011-08-18 11:37:47 -07:00
Mark Otto 8ba5a29456 capitalize github properly, fix url for compiled css 2011-08-17 22:38:14 -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
Mark Otto 68d4b85ffc no idea what these changes are 2011-07-29 12:30:59 -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 088bfcc13a add formal checks to makefile to make sure people have neccessary software installed 
add date to built file!
 2011-07-02 10:45:59 -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