0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-10 22:24:19 +01:00
Commit Graph

10810 Commits

Author SHA1 Message Date
Mark Otto
8c954fd13d run cssmin on docs css for dist-css task 2014-11-10 00:20:41 -08:00
Mark Otto
aa5f040a87 rename gruntfile less tasks 2014-11-10 00:19:46 -08:00
Mark Otto
8611ed4dbd baseurl 2014-11-09 23:54:13 -08:00
Mark Otto
2cc66cbb58 Merge branch 'master' into derp
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-09 23:48:56 -08:00
Mark Otto
c4847c8f6b Merge branch 'master' of github.com:twbs/bootstrap 2014-11-09 23:12:02 -08:00
Mark Otto
eb74a8cbf3 darken primary blue for accessibility contrast on link colors 2014-11-09 23:11:28 -08:00
Mark Otto
f17b636bce color contrast for links, gets us to 4.63:1 2014-11-09 23:01:50 -08:00
XhmikosR
1764c6e509 Bump Jekyll to v2.5.1. 2014-11-10 08:06:45 +02:00
Mark Otto
e020d50838 fix variable, run grunt 2014-11-09 22:05:09 -08:00
Mark Otto
86af1f39ab Merge branch 'master' into derp
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-09 22:02:53 -08:00
Mark Otto
d1278efcc5 grunt 2014-11-09 18:04:00 -08:00
Mark Otto
99148166c5 Merge pull request #15052 from twbs/badge-in-non-anchor-list-group-item
Badges: fix active styles when in non-anchor `.list-group-item`
2014-11-09 15:05:40 -08:00
Mark Otto
5670dd8930 comment and formatting 2014-11-09 15:04:32 -08:00
Mark Otto
46d1bf8eef Fixes #14234 again
- 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-09 15:03:33 -08:00
Heinrich Fenkart
a05f07528a Badges: fix active styles when in non-anchor .list-group-item 2014-11-08 11:00:37 +01:00
Mark Otto
df28b7e25f Fixes #14965: Reset top border-radii on dropdown menus in fixed bottom navbars 2014-11-08 00:13:19 -08:00
Mark Otto
852eef9689 grunt 2014-11-08 00:10:53 -08:00
Mark Otto
39f8c8183b Merge pull request #15018 from twbs/fix-theme-active-items
Theme: Correctly override active dropdown items in collapsed navbars
2014-11-08 00:07:39 -08:00
Mark Otto
8fbb2bbbd1 Fixes #14979: Override .jumbotron padding within .container-fluid to match .container 2014-11-07 23:01:20 -08:00
Mark Otto
2862c30320 Fixes #15046: Add full font overrides for popovers and tooltips 2014-11-07 22:17:39 -08:00
Chris Rebert
d904429e05 Merge pull request #14986 from twbs/safari-broken-printing-doc
Add #14868 to the compatibility docs
2014-11-05 14:59:24 -08:00
Heinrich Fenkart
f85c5921dd grunt 2014-11-05 20:11:46 +01:00
Heinrich Fenkart
1342c63893 Merge pull request #15031 from twbs/customizer-remove-file-type-check
Customizer: Remove file type check from config import
2014-11-05 20:09:17 +01:00
Heinrich Fenkart
d77546963b Customizer: Remove file type check from config import
Fixes #14978.
2014-11-05 19:14:52 +01:00
Heinrich Fenkart
0383486665 Merge pull request #15030 from twbs/config-bridge-jekyll-plugin
Use a Jekyll plugin instead of the `copy:configBridge` grunt task
2014-11-05 18:52:09 +01:00
Heinrich Fenkart
0d851e8b8a Theme: Correctly override active dropdown items in collapsed navbars 2014-11-05 18:36:53 +01:00
Heinrich Fenkart
30df201abc Use a Jekyll plugin instead of the copy:configBridge grunt task 2014-11-05 18:35:13 +01:00
Heinrich Fenkart
e27dc5d71e grunt 2014-11-05 01:56:18 +01:00
Heinrich Fenkart
00fa64650a Merge pull request #14921 from bassjobsen/patch-3
Update grid-framework.less
2014-11-05 01:54:13 +01:00
Chris Rebert
21644321e4 Merge pull request #14993 from twbs/fix-14991
Have Carousel ignore keyboard events from <input>s or <textarea>s
2014-11-04 16:50:36 -08:00
Heinrich Fenkart
db90ff6df7 grunt 2014-11-05 01:45:16 +01:00
Heinrich Fenkart
72ad89b077 Merge pull request #14933 from twbs/center-modal-at-all-times
Center modal at all times
2014-11-05 01:39:46 +01:00
Heinrich Fenkart
da74fba490 Center modal dialog at all times 2014-11-05 01:37:44 +01:00
Chris Rebert
469dc3ab1f Have Carousel ignore keyboard events from <input>s or <textarea>s; fixes #14991 2014-11-04 16:23:44 -08:00
Heinrich Fenkart
425a985491 Update head of all visual tests to use our basic template 2014-11-05 01:18:11 +01:00
Heinrich Fenkart
6020bb06f2 grunt 2014-11-05 00:36:52 +01:00
Julian Thilo
0018723cce Merge pull request #15019 from twbs/whoomp_there_it_was
Deprecate diagonal tooltip classes
2014-11-05 00:33:04 +01:00
Heinrich Fenkart
e62a1264b9 Merge pull request #14927 from twbs/fix-modal-backdrop-above-scrollbar
Fix modal backdrop overlaying the modal's scrollbar
2014-11-05 00:15:52 +01:00
Julian Thilo
da3870feac Deprecate diagonal tooltip classes 2014-11-05 00:09:56 +01:00
Julian Thilo
3a988c3588 Merge pull request #14938 from twbs/oh_arrow_where_art_thou
Fix #14936: Use correct left/right and margin on tooltip arrows
2014-11-04 23:21:59 +01:00
Heinrich Fenkart
14e5fb04e9 Fix modal backdrop overlaying the modal's scrollbar
Fixes #14916.
2014-11-04 23:17:55 +01:00
Jayanth Koushik
e55feacf5b Add initialization examples to tooltip and popover "Opt-in functionality" callouts
Fixes #14950.
Closes #15015 by merging it.
2014-11-04 20:00:08 +01:00
Heinrich Fenkart
0d291e8623 HTTPS for Apple Safari Radar in bugify filter 2014-11-04 19:40:39 +01:00
Heinrich Fenkart
1a833e75d5 Merge pull request #14987 from twbs/overengineer-wall-of-browser-bugs
Use Jekyll data for Wall of Browser Bugs
2014-11-04 19:38:04 +01:00
Heinrich Fenkart
d6a99cb955 Merge pull request #14980 from twbs/customizer-autoprefixer
Use autoprefixer for Customizer builds
2014-11-04 19:35:34 +01:00
Heinrich Fenkart
1582039193 Use autoprefixer for Customizer builds 2014-11-04 19:34:29 +01:00
Heinrich Fenkart
9dea306097 Merge pull request #14982 from twbs/grunt-customizer-share-common
Remove duplicate code from Customizer/Gruntfile by sharing it
2014-11-04 19:30:13 +01:00
Heinrich Fenkart
d107004278 Remove duplicate code from Customizer/Gruntfile by sharing it 2014-11-04 12:35:38 +01:00
Chris Rebert
203912b9c5 Merge pull request #14989 from twbs/modal-relatedTarget-data-example
Add event.relatedTarget + `data-*` example to Modal docs
2014-11-03 23:37:38 -08:00
Heinrich Fenkart
069488dea3 Use Jekyll data for Wall of Browser Bugs 2014-11-04 07:25:52 +01:00