| Age | Commit message (Collapse) | Author | Files | Lines | |
|---|---|---|---|---|---|
| 2013-02-05 | nuke rogue conflict comment and remake | Mark Otto | 2 | -1/+4705 | |
| 2013-02-05 | Merge branch '2.3.0-wip' into 3.0.0-wip | Mark Otto | 1 | -1/+1 | |
| Conflicts: docs/assets/css/bootstrap-responsive.css docs/assets/css/bootstrap.css docs/examples/hero.html less/buttons.less less/carousel.less less/close.less less/dropdowns.less less/labels-badges.less less/mixins.less less/navbar.less less/navs.less less/pagination.less less/responsive-navbar.less less/scaffolding.less less/sprites.less less/thumbnails.less less/type.less | |||||
| 2013-02-05 | Merge branch '2.3.0-wip' into 3.0.0-wip | Mark Otto | 16 | -4724/+61 | |
| Conflicts: docs/assets/css/bootstrap-responsive.css docs/assets/css/bootstrap.css docs/examples/hero.html less/buttons.less less/carousel.less less/close.less less/dropdowns.less less/labels-badges.less less/mixins.less less/navbar.less less/navs.less less/pagination.less less/responsive-navbar.less less/scaffolding.less less/sprites.less less/thumbnails.less less/type.less | |||||
| 2013-02-05 | derp, fix broke css and recompile | Mark Otto | 2 | -4/+6155 | |
| 2013-02-05 | restore comma between selectors | Mark Otto | 1 | -1/+1 | |
| 2013-02-05 | Merge branch '2.3.0-wip' of https://github.com/patrickhlauke/bootstrap into ↵ | Mark Otto | 2 | -2/+2 | |
| patrickhlauke-2.3.0-wip Conflicts: docs/assets/css/bootstrap.css less/navbar.less | |||||
| 2013-02-05 | Merge branch '2.3.0-wip' of https://github.com/patrickhlauke/bootstrap into ↵ | Mark Otto | 19 | -6159/+126 | |
| patrickhlauke-2.3.0-wip Conflicts: docs/assets/css/bootstrap.css less/navbar.less | |||||
| 2013-02-05 | Merge pull request #6737 from openwide-java/fix-tooltip-positioning-for-ie8 | fat-kun | 1 | -1/+1 | |
| Fix tooltip positioning for IE8 broken in 2.3.0 | |||||
| 2013-02-05 | simplify media docs | Mark Otto | 2 | -12/+4 | |
| 2013-02-05 | reorganize progress bars docs | Mark Otto | 2 | -116/+64 | |
| 2013-02-05 | simpler alerts docs | Mark Otto | 2 | -34/+12 | |
| 2013-02-05 | mo betta thumbnails docs | Mark Otto | 2 | -2/+4 | |
| 2013-02-05 | reorder counters docs | Mark Otto | 2 | -14/+20 | |
| 2013-02-05 | pagination docs cleanup | Mark Otto | 2 | -24/+6 | |
| 2013-02-05 | simpler breadcrumbs docs | Mark Otto | 2 | -4/+2 | |
| 2013-02-05 | Increase margins and line-height on h3; overhaul button dropdown docs | Mark Otto | 5 | -191/+65 | |
| 2013-02-05 | Add justified button groups for link buttons; reorganize dropdowns and ↵ | Mark Otto | 4 | -58/+63 | |
| button groups docs sections | |||||
| 2013-02-05 | Forgot to remove base-css.mustache | Mark Otto | 1 | -2101/+0 | |
| 2013-02-04 | Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip | Mark Otto | 1 | -1/+1 | |
| 2013-02-04 | Remove base-css.html after recent merges | Mark Otto | 1 | -2229/+0 | |
| 2013-02-04 | Merge branch '2.3.0-wip' into 3.0.0-wip | Mark Otto | 8 | -11/+360 | |
| Conflicts: docs/assets/css/bootstrap.css less/type.less | |||||
| 2013-02-04 | Fixes #6794: incorrect docs mention of th element | Mark Otto | 2 | -4/+2 | |
| 2013-02-04 | Fixes #6794: incorrect docs mention of th element | Mark Otto | 2 | -4/+2 | |
| 2013-02-04 | fix typo | Joseph Price | 1 | -1/+1 | |
| 2013-02-02 | Merge pull request #6638 from GeoffYoung/2.3.0-wip | Mark Otto | 1 | -1/+1 | |
| Update package.json to current Recess version | |||||
| 2013-02-02 | Revamp button mixins and pseudo states | Mark Otto | 2 | -55/+25 | |
| * Remove .darken-button-states and .buttonBackground mixins (latter wasn't being used anyway) * Create new .btn-pseudo-states mixin for setting button background and border colors for default and pseudo states | |||||
| 2013-02-02 | Merge branch '3.0.0-wip' of https://github.com/vickash/bootstrap into ↵ | Mark Otto | 2 | -38/+105 | |
| vickash-3.0.0-wip | |||||
| 2013-02-02 | Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip | Mark Otto | 2 | -6/+8 | |
| 2013-02-02 | Add changelog file to repo instead of relying on the wiki | Mark Otto | 1 | -0/+324 | |
| 2013-02-02 | Verion number in JS makefile | Mark Otto | 2 | -2/+2 | |
| 2013-02-02 | Rearrange forms content | Mark Otto | 2 | -236/+238 | |
| 2013-02-02 | Simplify input and input group sizing | Mark Otto | 5 | -53/+84 | |
| * Remove .input-mini because who really needs inputs that small * Remove unnecessary border-radius resets from large and small input groups | |||||
| 2013-02-02 | Merge branch '3.0.0-wip' of https://github.com/gilbarbara/bootstrap into ↵ | Mark Otto | 3 | -14/+148 | |
| gilbarbara-3.0.0-wip | |||||
| 2013-02-02 | reordered access of options in tooltip and popover to allow overriding data ↵ | Joseph Price | 2 | -4/+4 | |
| attrs from js | |||||
| 2013-02-02 | Add @btn-color variable and use in buttons and carets; fixes dropup caret as ↵ | Mark Otto | 4 | -24/+14 | |
| well | |||||
| 2013-02-02 | Merge pull request #6763 from rjregenold/2.3.0-wip | Mark Otto | 2 | -6/+8 | |
| fixes jankiness with anchor tags in carousel. | |||||
| 2013-02-02 | Move to new selector interpolation, supported from 1.3.1 | Luke Page | 1 | -7/+6 | |
| 2013-02-01 | Refactor navbar dividers | Mark Otto | 5 | -35/+57 | |
| * Instead of .divider-vertical, use .divider * Makes use of .nav-divider mixin * Dividers are horizontal to start, matching the default state of navbar nav links * Dividers become vertical above 768px via media queries | |||||
| 2013-02-01 | Fixes #6657: Upgrade Normalize to 2.1.0 | Mark Otto | 2 | -10/+43 | |
| 2013-02-01 | Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip | Mark Otto | 2 | -0/+3 | |
| 2013-02-01 | Merge branch 'dospuntocero-master' into 2.3.0-wip | Mark Otto | 3 | -1/+26 | |
| 2013-02-01 | add horizontal-three-color gradient test | Mark Otto | 2 | -1/+15 | |
| 2013-02-01 | Refactor colors and progress bars | Mark Otto | 5 | -179/+173 | |
| * Buttons and progress bars now make use of more semantic global @brand- colors * Progress bars have been rewritten to reduce the number of possible selectors * Instead of .progress .bar, it's .progress-bar for individual bars of color, ultimately making for less CSS | |||||
| 2013-02-01 | Merge pull request #6776 from ndabas/fix-inline-lists-ie7 | Mark Otto | 2 | -0/+3 | |
| Fix inline lists for IE7 | |||||
| 2013-02-02 | Fixing inline lists for IE7 | Nikhil Dabas | 2 | -0/+3 | |
| 2013-02-01 | Merge branch '2.3.0-wip' into 3.0.0-wip | Mark Otto | 3 | -6/+6 | |
| Conflicts: docs/examples/hero.html docs/examples/sticky-footer-navbar.html | |||||
| 2013-02-01 | Merge branch '2.3.0-wip' into 3.0.0-wip | Mark Otto | 3 | -6/+6 | |
| Conflicts: docs/examples/hero.html docs/examples/sticky-footer-navbar.html | |||||
| 2013-02-01 | Use button element instead of a for responsive navbar buttons | Mark Otto | 5 | -10/+10 | |
| 2013-02-01 | Use button element instead of a for responsive navbar buttons | Mark Otto | 5 | -10/+10 | |
| 2013-02-01 | start to refactor justified nav example | Mark Otto | 1 | -44/+55 | |
