Commit Graph

  • 2fd8689b08 Change line-height value with variable for btn-large and btn-small Elvis Ratzlaff 2013-08-03 03:56:06 -04:00
  • 4bac2c567a Merge branch 'btngroup' of https://github.com/liuyl/bootstrap into liuyl-btngroup Mark Otto 2013-08-02 20:19:20 -07:00
  • 05a8efccca Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into gh-pages Mark Otto 2013-08-02 20:01:32 -07:00
  • a1c29c1e72 fixes #8950 by updating links to new repo Mark Otto 2013-08-02 20:01:21 -07:00
  • a0c44329e3 Merge pull request #8939 from frabrunelle/3.0.0-wip Mark Otto 2013-08-02 19:58:17 -07:00
  • 3581c99afd update dist for v3 Mark Otto 2013-08-02 19:47:01 -07:00
  • 5abdcb3e71 Merge branch '3.0.0-wip' into gh-pages Mark Otto 2013-08-02 19:45:57 -07:00
  • a3be713f8f Merge branch 'navtext' of https://github.com/liuyl/bootstrap into liuyl-navtext Mark Otto 2013-08-02 19:30:03 -07:00
  • e8145ac939 Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip Mark Otto 2013-08-02 19:05:49 -07:00
  • b5dcbf5045 Merge pull request #8934 from twbs/generalize-horiz-form-example Mark Otto 2013-08-02 18:59:06 -07:00
  • 9435991ff0 move form layouts from input groups back to forms (messed this up in b281ad6409) Mark Otto 2013-08-02 18:48:44 -07:00
  • 6b850132d0 Remove requirement of .list-group-flush when list groups are in panels Mark Otto 2013-08-02 17:57:19 -07:00
  • 0a7b185224 Merge pull request #36 from ggam/patch-1 Mark Otto 2013-08-02 17:17:28 -07:00
  • 0fefbbe659 fix typo in comment Chris Rebert 2013-08-02 16:36:54 -07:00
  • f6cec812a6 fixes #8957 fat 2013-08-02 15:13:12 -07:00
  • e969d2ff18 Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip fat 2013-08-02 15:10:47 -07:00
  • 69f9920132 fixes #8955 fat 2013-08-02 15:10:14 -07:00
  • 173dac4e54 Tighten up buttons and form controls Mark Otto 2013-08-02 15:09:48 -07:00
  • 7cd54e52f2 Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip Mark Otto 2013-08-02 14:08:58 -07:00
  • d46e645a0f fixes #9015: bold links not semibold in alerts Mark Otto 2013-08-02 14:07:26 -07:00
  • b86cac65b6 Merge pull request #9018 from adamwoodbeck/3.0.0-wip Mark Otto 2013-08-02 14:04:16 -07:00
  • 83eea13e63 Merge branch '3.0.0-wip-fixed-grid-push-pull-offset' of https://github.com/jtickle/fp-bootstrap into jtickle-3.0.0-wip-fixed-grid-push-pull-offset Mark Otto 2013-08-02 13:58:06 -07:00
  • cfacd228eb Added ".col-sm-*" to the grid example per the description above the example. Adam Woodbeck 2013-08-02 16:30:13 -04:00
  • e23b7ec20e Merge pull request #9017 from jonschlinkert/3.0.0-wip Mark Otto 2013-08-02 12:48:39 -07:00
  • c017e19ed2 Resolves https://github.com/twbs/bootstrap/issues/9014. updates mixins to consistently use semicolons as argument separator. Rebuild to confirm, no diff in compiled CSS. Jon Schlinkert 2013-08-02 15:31:13 -04:00
  • 08ce3ef9e1 run grunt dist for #8967 Mark Otto 2013-08-02 10:11:39 -07:00
  • dfd6c23527 Merge pull request #8967 from bassjobsen/patch-2 Mark Otto 2013-08-02 10:11:06 -07:00
  • e4b113934d Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip Mark Otto 2013-08-02 10:02:46 -07:00
  • 696e619fd9 Merge pull request #8979 from ggam/patch-6 Mark Otto 2013-08-02 09:44:32 -07:00
  • 048e19b892 Fixes #8996: shift placement of justified CSS for nav component Mark Otto 2013-08-02 09:42:50 -07:00
  • 34e5c7542b whitespace in js file? Mark Otto 2013-08-02 09:33:12 -07:00
  • d0b94ead9a Fix #9008: consolidate .alert-block styles into .alert Mark Otto 2013-08-02 09:32:58 -07:00
  • 21be3efad3 Merge pull request #9011 from Rycul/patch-1 Mark Otto 2013-08-02 09:27:03 -07:00
  • 6467009572 Merge pull request #8980 from ggam/patch-7 Mark Otto 2013-08-02 09:26:19 -07:00
  • f4b983ed11 Added short instruction for obtaining respond.js Bryan Keiren 2013-08-02 18:07:31 +02:00
  • ee6db98136 Included required JavaScript in navbar-static-top Guillermo González de Agüero 2013-08-02 11:53:25 +02:00
  • 9546fc9cf0 fix typo in CSS docs; fixes #8992 Chris Rebert 2013-08-01 17:05:23 -07:00
  • 655e84c532 Removed data-toggle class when it wasn't been applied Guillermo González de Agüero 2013-08-01 20:13:08 +02:00
  • 824d5d5de4 Fix #8944 Guillermo González de Agüero 2013-08-01 20:07:34 +02:00
  • cbd0b7a505 Merge pull request #8965 from leonardovcid/patch-1 Chris Rebert 2013-08-01 09:33:09 -07:00
  • 1583dd55e9 Added classes for lg-pull, lg-push, lg-offset, sm-pull, sm-push, sm-offset Jeff Tickle 2013-08-01 11:49:16 -04:00
  • a5641b0cca Update input-groups.less Bass Jobsen 2013-08-01 16:05:07 +02:00
  • 15b98a0bb1 Correct comment which is showing a wrong mixin call example (mixins.less) leonardovcid 2013-08-01 14:39:28 +01:00
  • 7a3c61ee33 fixes #8892 Jacob Thornton 2013-07-31 22:57:00 -07:00
  • ccd4c9d7b5 fixes #8864 Jacob Thornton 2013-07-31 22:28:05 -07:00
  • 56aedcb713 add table-layout liuyl 2013-08-01 11:26:12 +08:00
  • 521ff5c8a7 add nav to media object and thumbnails Francis Brunelle 2013-07-31 22:37:36 -04:00
  • e9413315b5 fixes #8937: align the dropdown menus in input groups Mark Otto 2013-07-31 18:06:20 -07:00
  • 3cdb07fab3 Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip Mark Otto 2013-07-31 18:02:49 -07:00
  • 7e19b6b02c add the theme file derp Mark Otto 2013-07-31 18:02:41 -07:00
  • 3c39bc0d96 start on navbar Mark Otto 2013-07-31 18:02:12 -07:00
  • 60e1f5e0e8 start with buttons Mark Otto 2013-07-31 17:48:22 -07:00
  • 4c27f3ce80 Run make on prev work Mark Otto 2013-07-31 17:07:55 -07:00
  • afef74d03d Updated homepage more Mark Otto 2013-07-31 17:05:06 -07:00
  • e660963689 use separate form-groups in horiz form example for greater generality; fixes #8925 Chris Rebert 2013-07-31 16:46:21 -07:00
  • f62fb27b04 Merge pull request #8911 from codejet/patch-1 Chris Rebert 2013-07-31 12:18:09 -07:00
  • f5f171f0ed Update javascript.html Oliver Schmidt 2013-07-31 20:51:37 +02:00
  • f43fa23ae0 Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip Mark Otto 2013-07-31 10:27:52 -07:00
  • 29b36bf962 dat purple homepage--http://www.youtube.com/watch?v=k2C5TjS2sh4 Mark Otto 2013-07-31 10:27:43 -07:00
  • d7d0f226f9 Merge pull request #8915 from diowa/whitespaces-tabs-etc Mark Otto 2013-07-31 10:24:20 -07:00
  • ba05b7a63c Merge pull request #8908 from bbeng89/3.0.0-wip Mark Otto 2013-07-31 09:48:33 -07:00
  • daed9378ca Merge pull request #8899 from englishtown/twbs-pullrequest Mark Otto 2013-07-31 09:44:27 -07:00
  • 3696530aaf Removed trailing whitespaces Changed hard tabs to soft tabs Cesidio Di Landa 2013-07-31 18:11:11 +02:00
  • 034fb3bc87 Update javascript.html Oliver Schmidt 2013-07-31 16:14:27 +02:00
  • 2433faa528 Small fix to justified button groups docs Blake Bengtson 2013-07-31 08:39:07 -05:00
  • a538c8dfb3 miss one 'div' close tag under components page faceach 2013-07-31 18:57:39 +08:00
  • 55e1fcef60 Merge pull request #8885 from mikefrancis/patch-1 Chris Rebert 2013-07-31 01:33:18 -07:00
  • 873f884327 Added attribute whitespace Mike Francis 2013-07-31 09:26:45 +01:00
  • b9f59428f9 Removed background color from #gradient mixins to support transparent gradients Archan Luhar 2013-07-30 19:30:24 -07:00
  • 031ed98c8b Merge pull request #22 from Dev-Ad/patch-1 Mark Otto 2013-07-30 17:43:55 -07:00
  • 2a4aacc037 Merge pull request #9 from ssorallen/carousel-img-height-js-path Mark Otto 2013-07-30 17:43:39 -07:00
  • 26053b94e5 Merge pull request #7 from sprice/update_scripts Mark Otto 2013-07-30 17:43:18 -07:00
  • 1edaabb250 Merge pull request #18 from p8952/local-jquery Mark Otto 2013-07-30 17:42:46 -07:00
  • aa90811fb0 Merge pull request #13 from hph/master Mark Otto 2013-07-30 17:42:33 -07:00
  • a9830a0bab Merge pull request #10 from ssorallen/sigin-input-block Mark Otto 2013-07-30 17:42:10 -07:00
  • 6c2db4bbbe Merge pull request #16 from ssorallen/starter-template-js Mark Otto 2013-07-30 17:41:57 -07:00
  • 4a060881d7 Merge pull request #11 from ssorallen/jumbotron-js-inputs Mark Otto 2013-07-30 17:41:43 -07:00
  • 0f23f514ab Merge pull request #24 from ssorallen/sticky-footer-js Mark Otto 2013-07-30 17:37:21 -07:00
  • 46a424fc93 edit modal docs code to fix #8769 Mark Otto 2013-07-30 15:14:38 -07:00
  • e6ac348bfc Merge pull request #8726 from andreypopp/3.0.0-wip Mark Otto 2013-07-30 14:14:51 -07:00
  • 96eef43dee Merge pull request #8852 from briannelsondesign/label_baselines Mark Otto 2013-07-30 14:07:00 -07:00
  • fc8f4f0465 fixes #8216 fat 2013-07-30 13:41:24 -07:00
  • c54b8adb85 fixes #8814 fat 2013-07-30 13:33:56 -07:00
  • 5ee2a221ca fixes #8816 fat 2013-07-30 13:31:57 -07:00
  • da98c5c2c3 trivial spacing fix Chris Rebert 2013-07-30 12:35:39 -07:00
  • c5d3e1421f updated v3 wip dist zip--holy crap that's a messed up commit message Mark Otto 2013-07-30 11:11:16 -07:00
  • 0d30dabade Merge branch '3.0.0-wip' into gh-pages Mark Otto 2013-07-30 11:08:08 -07:00
  • ad01dd8ce8 Use correct class for header in jumbotron dropdown nav Ross Allen 2013-07-30 10:33:48 -07:00
  • 6a8f76f020 Enable dropdown in sticky-footer with Bootstrap JS Ross Allen 2013-07-30 10:10:34 -07:00
  • 934cf4f683 Use correct dropdown header class in sticky-footer Ross Allen 2013-07-30 10:09:30 -07:00
  • d9266f95c4 Merge pull request #8846 from ggam/patch-5 Mark Otto 2013-07-30 09:40:01 -07:00
  • dcbf1e51c4 Compiles changes to CSS Brian Nelson 2013-07-30 11:35:13 -04:00
  • 220fee80bf Improves label and badge alignment so text aligns with baseline Brian Nelson 2013-07-30 11:23:25 -04:00
  • 3d54fe180c Fix #8658 Guillermo González de Agüero 2013-07-30 16:34:13 +02:00
  • a9144b50ea .navbar-wrapper need higher z-index to be on top of the carousel Gerhard 2013-07-30 16:23:34 +02:00
  • 5ef1fe160e Merge pull request #8821 from twbs/twbs-license-faq-tweak Chris Rebert 2013-07-29 22:11:37 -07:00
  • 652f056556 tweak part of license FAQ to reflect Twitter->twbs change Chris Rebert 2013-07-29 18:48:50 -07:00
  • 7cfcfdfe64 make navbar-text float left liuyl 2013-07-30 09:30:21 +08:00
  • 8b5e41d900 Refactor .input-* sizing a bit by not chaining to .form-control (fixes #8672) Mark Otto 2013-07-29 17:30:36 -07:00
  • 09edfcf8c2 fixes #8670: move list group bg color to individual items for mo betta rendering Mark Otto 2013-07-29 17:23:08 -07:00