aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2014-11-09Merge branch 'master' into derpMark Otto12-21/+21
Conflicts: dist/css/bootstrap-theme.css dist/css/bootstrap-theme.css.map dist/css/bootstrap-theme.min.css dist/css/bootstrap.css dist/css/bootstrap.css.map dist/css/bootstrap.min.css docs/_includes/customizer-variables.html docs/assets/js/customize.min.js docs/assets/js/raw-files.min.js docs/dist/css/bootstrap-theme.css docs/dist/css/bootstrap-theme.css.map docs/dist/css/bootstrap-theme.min.css docs/dist/css/bootstrap.css docs/dist/css/bootstrap.css.map docs/dist/css/bootstrap.min.css less/_variables.less
2014-11-09Merge branch 'master' of github.com:twbs/bootstrapMark Otto2-2/+2
2014-11-09darken primary blue for accessibility contrast on link colorsMark Otto17-162/+162
2014-11-09color contrast for links, gets us to 4.63:1Mark Otto11-68/+68
2014-11-10Bump Jekyll to v2.5.1.XhmikosR2-2/+2
2014-11-09fix variable, run gruntMark Otto12-496/+544
2014-11-09Merge branch 'master' into derpMark Otto91-580/+19655
Conflicts: Gruntfile.js _config.yml dist/css/bootstrap-theme.css dist/css/bootstrap-theme.css.map dist/css/bootstrap-theme.min.css dist/css/bootstrap.css dist/css/bootstrap.css.map dist/css/bootstrap.min.css docs/_includes/components/button-groups.html docs/_includes/components/jumbotron.html docs/_includes/components/media.html docs/_includes/components/navs.html docs/_includes/customizer-variables.html docs/_includes/footer.html docs/_includes/getting-started/browser-device-support.html docs/_includes/js/carousel.html docs/_includes/js/dropdowns.html docs/_includes/js/modal.html docs/_includes/js/popovers.html docs/_includes/js/tooltips.html docs/_includes/nav/getting-started.html docs/_includes/nav/javascript.html docs/_layouts/default.html docs/assets/css/docs.min.css docs/assets/css/src/docs.css docs/assets/js/customize.min.js docs/assets/js/docs.min.js docs/assets/js/raw-files.min.js docs/browser-bugs.html docs/dist/css/bootstrap-theme.css docs/dist/css/bootstrap-theme.css.map docs/dist/css/bootstrap-theme.min.css docs/dist/css/bootstrap.css docs/dist/css/bootstrap.css.map docs/dist/css/bootstrap.min.css docs/examples/justified-nav/index.html less/_forms.less less/_tooltip.less less/navs.less less/theme.less
2014-11-09gruntMark Otto8-20/+20
2014-11-09Merge pull request #15052 from twbs/badge-in-non-anchor-list-group-itemMark Otto2-9/+7
Badges: fix active styles when in non-anchor `.list-group-item`
2014-11-09comment and formattingMark Otto1-5/+4
2014-11-09Fixes #14234 againMark Otto9-133/+59
- Rather than override and hack for IE8-10 and then IE11, scope to just Safari. - Drops the IE hacks for a media query Webkit hack
2014-11-08Badges: fix active styles when in non-anchor `.list-group-item`Heinrich Fenkart2-9/+7
2014-11-08Fixes #14965: Reset top border-radii on dropdown menus in fixed bottom navbarsMark Otto9-6/+11
2014-11-08gruntMark Otto8-6/+32
2014-11-08Merge pull request #15018 from twbs/fix-theme-active-itemsMark Otto1-0/+12
Theme: Correctly override active dropdown items in collapsed navbars
2014-11-07Fixes #14979: Override .jumbotron padding within .container-fluid to match ↵Mark Otto9-9/+12
.container
2014-11-07Fixes #15046: Add full font overrides for popovers and tooltipsMark Otto9-5/+15
2014-11-05Merge pull request #14986 from twbs/safari-broken-printing-docChris Rebert2-3/+12
Add #14868 to the compatibility docs
2014-11-05gruntHeinrich Fenkart1-2/+2
2014-11-05Merge pull request #15031 from twbs/customizer-remove-file-type-checkHeinrich Fenkart1-19/+13
Customizer: Remove file type check from config import
2014-11-05Customizer: Remove file type check from config importHeinrich Fenkart1-19/+13
Fixes #14978.
2014-11-05Merge pull request #15030 from twbs/config-bridge-jekyll-pluginHeinrich Fenkart3-6/+10
Use a Jekyll plugin instead of the `copy:configBridge` grunt task
2014-11-05Theme: Correctly override active dropdown items in collapsed navbarsHeinrich Fenkart1-0/+12
2014-11-05Use a Jekyll plugin instead of the `copy:configBridge` grunt taskHeinrich Fenkart3-6/+10
2014-11-05gruntHeinrich Fenkart8-9/+11
2014-11-05Merge pull request #14921 from bassjobsen/patch-3Heinrich Fenkart1-2/+2
Update grid-framework.less
2014-11-04Merge pull request #14993 from twbs/fix-14991Chris Rebert2-0/+43
Have Carousel ignore keyboard events from <input>s or <textarea>s
2014-11-05gruntHeinrich Fenkart6-22/+72
2014-11-05Merge pull request #14933 from twbs/center-modal-at-all-timesHeinrich Fenkart1-8/+33
Center modal at all times
2014-11-05Center modal dialog at all timesHeinrich Fenkart1-8/+33
2014-11-04Have Carousel ignore keyboard events from <input>s or <textarea>s; fixes #14991Chris Rebert2-0/+43
2014-11-05Update head of all visual tests to use our basic templateHeinrich Fenkart11-13/+126
2014-11-05gruntHeinrich Fenkart14-26/+84
2014-11-05Merge pull request #15019 from twbs/whoomp_there_it_wasJulian Thilo1-0/+1
Deprecate diagonal tooltip classes
2014-11-05Merge pull request #14927 from twbs/fix-modal-backdrop-above-scrollbarHeinrich Fenkart2-2/+19
Fix modal backdrop overlaying the modal's scrollbar
2014-11-05Deprecate diagonal tooltip classesJulian Thilo1-0/+1
2014-11-04Merge pull request #14938 from twbs/oh_arrow_where_art_thouJulian Thilo1-4/+8
Fix #14936: Use correct left/right and margin on tooltip arrows
2014-11-04Fix modal backdrop overlaying the modal's scrollbarHeinrich Fenkart2-2/+19
Fixes #14916.
2014-11-04Add initialization examples to tooltip and popover "Opt-in functionality" ↵Jayanth Koushik2-0/+13
callouts Fixes #14950. Closes #15015 by merging it.
2014-11-04HTTPS for Apple Safari Radar in bugify filterHeinrich Fenkart1-1/+1
2014-11-04Merge pull request #14987 from twbs/overengineer-wall-of-browser-bugsHeinrich Fenkart5-120/+252
Use Jekyll data for Wall of Browser Bugs
2014-11-04Merge pull request #14980 from twbs/customizer-autoprefixerHeinrich Fenkart2-11/+16045
Use autoprefixer for Customizer builds
2014-11-04Use autoprefixer for Customizer buildsHeinrich Fenkart2-11/+16045
2014-11-04Merge pull request #14982 from twbs/grunt-customizer-share-commonHeinrich Fenkart5-70/+73
Remove duplicate code from Customizer/Gruntfile by sharing it
2014-11-04Remove duplicate code from Customizer/Gruntfile by sharing itHeinrich Fenkart5-70/+73
2014-11-03Merge pull request #14989 from twbs/modal-relatedTarget-data-exampleChris Rebert3-0/+92
Add event.relatedTarget + `data-*` example to Modal docs
2014-11-04Use Jekyll data for Wall of Browser BugsHeinrich Fenkart5-120/+252
2014-11-03Add event.relatedTarget + `data-*` example to Modal docsChris Rebert3-0/+92
Fixes #14245
2014-11-03Add #14868 to the compatibility docsChris Rebert2-3/+12
2014-11-03Merge pull request #14985 from twbs/14972-wallHeinrich Fenkart1-0/+6
Add Wall of Browser Bugs entry for #14972