Mark Otto
|
b648a77ed3
|
Merge branch 'master' into v4
Conflicts:
Gruntfile.js
_config.yml
dist/css/bootstrap-theme.css
dist/css/bootstrap-theme.min.css
dist/css/bootstrap.css
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
dist/fonts/glyphicons-halflings-regular.eot
dist/fonts/glyphicons-halflings-regular.svg
dist/fonts/glyphicons-halflings-regular.ttf
dist/fonts/glyphicons-halflings-regular.woff
docs/_data/glyphicons.yml
docs/_includes/components/alerts.html
docs/_includes/components/badges.html
docs/_includes/components/button-dropdowns.html
docs/_includes/components/button-groups.html
docs/_includes/components/dropdowns.html
docs/_includes/components/glyphicons.html
docs/_includes/components/input-groups.html
docs/_includes/components/labels.html
docs/_includes/components/media.html
docs/_includes/components/navbar.html
docs/_includes/components/navs.html
docs/_includes/components/pagination.html
docs/_includes/components/panels.html
docs/_includes/components/progress-bars.html
docs/_includes/css/buttons.html
docs/_includes/css/forms.html
docs/_includes/css/grid.html
docs/_includes/css/helpers.html
docs/_includes/css/images.html
docs/_includes/css/less.html
docs/_includes/css/responsive-utilities.html
docs/_includes/css/sass.html
docs/_includes/css/tables.html
docs/_includes/css/type.html
docs/_includes/getting-started/accessibility.html
docs/_includes/getting-started/browser-device-support.html
docs/_includes/getting-started/community.html
docs/_includes/getting-started/download.html
docs/_includes/getting-started/examples.html
docs/_includes/getting-started/whats-included.html
docs/_includes/js/affix.html
docs/_includes/js/alerts.html
docs/_includes/js/buttons.html
docs/_includes/js/carousel.html
docs/_includes/js/collapse.html
docs/_includes/js/dropdowns.html
docs/_includes/js/modal.html
docs/_includes/js/overview.html
docs/_includes/js/tabs.html
docs/_includes/nav/components.html
docs/_includes/nav/css.html
docs/_includes/nav/javascript.html
docs/_includes/nav/main.html
docs/about.html
docs/assets/css/docs.min.css
docs/assets/js/customize.min.js
docs/assets/js/raw-files.min.js
docs/dist/css/bootstrap-theme.css
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/dist/fonts/glyphicons-halflings-regular.eot
docs/dist/fonts/glyphicons-halflings-regular.svg
docs/dist/fonts/glyphicons-halflings-regular.ttf
docs/dist/fonts/glyphicons-halflings-regular.woff
docs/examples/carousel/index.html
docs/examples/navbar-fixed-top/index.html
docs/examples/navbar-static-top/index.html
docs/examples/navbar/index.html
docs/examples/non-responsive/index.html
docs/examples/non-responsive/non-responsive.css
docs/examples/sticky-footer-navbar/index.html
docs/examples/theme/index.html
fonts/glyphicons-halflings-regular.eot
fonts/glyphicons-halflings-regular.svg
fonts/glyphicons-halflings-regular.ttf
fonts/glyphicons-halflings-regular.woff
less/_carousel.less
less/_forms.less
less/glyphicons.less
|
2014-11-30 20:17:45 -08:00 |
|
XhmikosR
|
61bbe74df1
|
Update devDependencies.
|
2014-11-30 12:51:16 +02:00 |
|
Mark Otto
|
bcb90ef3a0
|
Bump Glyphicons to v1.9
|
2014-11-30 01:31:49 -08:00 |
|
Mark Otto
|
9928144dc4
|
Fixes #15241: Add simple example to docs for collapse plugin
|
2014-11-29 23:03:47 -08:00 |
|
Mark Otto
|
23bdfc45eb
|
grunt
|
2014-11-29 21:40:04 -08:00 |
|
Mark Otto
|
9c049c99e2
|
grunt
|
2014-11-29 20:58:14 -08:00 |
|
Mark Otto
|
80d7be1126
|
grunt
|
2014-11-29 18:36:21 -08:00 |
|
Mark Otto
|
c901287394
|
remove more mentions of theme
|
2014-11-29 15:01:44 -08:00 |
|
Mark Otto
|
12be9044f4
|
fix a bunch of padding and alignment things for forms
|
2014-11-25 18:00:52 -08:00 |
|
Mark Otto
|
15d98dc6b7
|
disable shadows on buttons for now
|
2014-11-25 17:47:32 -08:00 |
|
Mark Otto
|
7ca73b7542
|
fix margin on .bs-example thumbs
|
2014-11-25 17:10:47 -08:00 |
|
XhmikosR
|
7ea49019b8
|
Run grunt.
|
2014-11-24 09:53:42 +02:00 |
|
XhmikosR
|
0c816d910d
|
Merge pull request #15159 from twbs/docs-muted
Clean up old `muted` references and switch to `text-muted`.
|
2014-11-20 10:27:42 +02:00 |
|
Chris Rebert
|
af77842ce7
|
Merge pull request #15111 from twbs/events-tables-wrapping
Don't line wrap event names in JS plugin docs
|
2014-11-20 00:06:33 -08:00 |
|
XhmikosR
|
a1b8aa351e
|
Clean up old muted references and switch to text-muted.
|
2014-11-20 08:02:25 +02:00 |
|
Heinrich Fenkart
|
c2abfc0a44
|
grunt
|
2014-11-17 18:57:02 +01:00 |
|
Chris Rebert
|
ddf39cc2e7
|
Don't line wrap event names in JS plugin docs
|
2014-11-12 16:32:51 -08:00 |
|
Mark Otto
|
9a7e365c2c
|
bump version to v3.3.1
|
2014-11-12 09:03:16 -08:00 |
|
Mark Otto
|
143c4a2f8f
|
grunt
|
2014-11-12 08:51:35 -08:00 |
|
Mark Otto
|
ff386147ce
|
grunt
|
2014-11-11 20:25:09 -08:00 |
|
Patrick H. Lauke
|
9391ef207f
|
aria-hidden added to some stray glyphicons
plus minor tweak to customizer's generated alerts
|
2014-11-11 22:41:21 +00:00 |
|
XhmikosR
|
bf4a331f1a
|
Run grunt.
|
2014-11-10 12:55:26 +02:00 |
|
Mark Otto
|
8c954fd13d
|
run cssmin on docs css for dist-css task
|
2014-11-10 00:20:41 -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
|
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 |
|
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
|
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 |
|
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
|
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 |
|
Heinrich Fenkart
|
f85c5921dd
|
grunt
|
2014-11-05 20:11:46 +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
|
e27dc5d71e
|
grunt
|
2014-11-05 01:56:18 +01:00 |
|
Heinrich Fenkart
|
db90ff6df7
|
grunt
|
2014-11-05 01:45:16 +01:00 |
|
Heinrich Fenkart
|
6020bb06f2
|
grunt
|
2014-11-05 00:36:52 +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
|
1582039193
|
Use autoprefixer for Customizer builds
|
2014-11-04 19:34:29 +01:00 |
|
Heinrich Fenkart
|
d107004278
|
Remove duplicate code from Customizer/Gruntfile by sharing it
|
2014-11-04 12:35:38 +01:00 |
|
Heinrich Fenkart
|
069488dea3
|
Use Jekyll data for Wall of Browser Bugs
|
2014-11-04 07:25:52 +01:00 |
|
Chris Rebert
|
594831f4f3
|
Add event.relatedTarget + data-* example to Modal docs
Fixes #14245
|
2014-11-03 13:37:27 -08:00 |
|
Heinrich Fenkart
|
a2c0bb49b1
|
grunt
|
2014-10-31 11:09:01 +01:00 |
|
Heinrich Fenkart
|
12b3ba7278
|
Customizer: listen to the right event for manual file selection in import
|
2014-10-31 10:58:03 +01:00 |
|
Heinrich Fenkart
|
b91474e538
|
grunt
|
2014-10-31 10:31:56 +01:00 |
|
Heinrich Fenkart
|
b8c3c5c19b
|
grunt
|
2014-10-30 04:45:04 +01:00 |
|
Mark Otto
|
16dbdbd7a2
|
Merge branch 'master' into v3.3.0
Conflicts:
docs/assets/js/customize.min.js
docs/assets/js/raw-files.min.js
|
2014-10-29 11:56:48 -07:00 |
|
Mark Otto
|
15d668dd15
|
grunt
|
2014-10-29 11:13:25 -07:00 |
|
Mark Otto
|
5429e71401
|
fixes #14913: badges in list group shouldn't have text shadow
|
2014-10-29 10:27:18 -07:00 |
|
Mark Otto
|
e07d741088
|
grunt
|
2014-10-29 09:54:43 -07:00 |
|
Mark Otto
|
22f9c8fc0a
|
grunt
|
2014-10-29 08:58:51 -07:00 |
|
Mark Otto
|
94b59b57d6
|
version bump
|
2014-10-29 08:56:20 -07:00 |
|
Mark Otto
|
a369a0a729
|
grunt
|
2014-10-29 08:51:05 -07:00 |
|
Mark Otto
|
a75c6d84e1
|
grunt
|
2014-10-28 23:08:42 -07:00 |
|
Mark Otto
|
45b59f4307
|
Reverts #14848, the overflow scrolling in the docs sidebar /cc @hnrch02
|
2014-10-28 22:57:16 -07:00 |
|
Heinrich Fenkart
|
cf88a65f30
|
Fix customizer download with Firefox.
|
2014-10-29 06:48:00 +02:00 |
|
Heinrich Fenkart
|
bf2ad00ee0
|
grunt
|
2014-10-29 04:56:02 +01:00 |
|
Heinrich Fenkart
|
94b544c229
|
grunt
|
2014-10-29 04:44:52 +01:00 |
|
Heinrich Fenkart
|
a7f58a8356
|
grunt
|
2014-10-29 04:30:31 +01:00 |
|
Mark Otto
|
a5497da5be
|
grunt
|
2014-10-27 20:37:17 -07:00 |
|
Mark Otto
|
892f6e35b8
|
Merge branch 'master' of github.com:twbs/bootstrap
|
2014-10-27 20:30:02 -07:00 |
|
Chris Rebert
|
a43d4767ba
|
.bs-customizer-input => .col-xs-4
|
2014-10-27 15:02:21 -07:00 |
|
Mark Otto
|
e3d2146350
|
fix rounded corners on copy buttons
|
2014-10-27 03:23:44 -07:00 |
|
Mark Otto
|
c15aa36798
|
switch to max-width on containers
|
2014-10-27 03:07:34 -07:00 |
|
Mark Otto
|
d896faa1b9
|
grunt
|
2014-10-27 01:35:02 -07:00 |
|
Mark Otto
|
252583b661
|
grunt
|
2014-10-26 23:07:20 -07:00 |
|
Mark Otto
|
dcee894a8c
|
grunt
|
2014-10-26 22:57:38 -07:00 |
|
Mark Otto
|
f26821a83a
|
fix progress bar animated biznas
|
2014-10-26 22:48:12 -07:00 |
|
Mark Otto
|
d6b0f45fb7
|
Merge branch 'master' into derp
Conflicts:
Gruntfile.js
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/dropdowns.html
docs/_includes/components/media.html
docs/_includes/components/navs.html
docs/_includes/components/progress-bars.html
docs/_includes/components/responsive-embed.html
docs/_includes/css/buttons.html
docs/_includes/css/forms.html
docs/_includes/css/less.html
docs/_includes/css/overview.html
docs/_includes/css/responsive-utilities.html
docs/_includes/customizer-variables.html
docs/_includes/getting-started/browser-device-support.html
docs/_includes/getting-started/grunt.html
docs/_includes/getting-started/template.html
docs/_includes/header.html
docs/_includes/js/alerts.html
docs/_includes/js/buttons.html
docs/_includes/js/carousel.html
docs/_includes/js/collapse.html
docs/_includes/js/dropdowns.html
docs/_includes/js/modal.html
docs/_includes/js/popovers.html
docs/_includes/js/scrollspy.html
docs/_includes/js/tabs.html
docs/_includes/js/tooltips.html
docs/_includes/nav/components.html
docs/_includes/nav/getting-started.html
docs/_layouts/default.html
docs/about.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/components.html
docs/components/navbar.md
docs/css.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/blog/index.html
docs/examples/carousel/index.html
docs/examples/cover/index.html
docs/examples/dashboard/index.html
docs/examples/grid/index.html
docs/examples/jumbotron-narrow/index.html
docs/examples/jumbotron/index.html
docs/examples/justified-nav/index.html
docs/examples/navbar-fixed-top/index.html
docs/examples/navbar-static-top/index.html
docs/examples/navbar/index.html
docs/examples/non-responsive/index.html
docs/examples/offcanvas/index.html
docs/examples/signin/index.html
docs/examples/starter-template/index.html
docs/examples/sticky-footer-navbar/index.html
docs/examples/sticky-footer/index.html
docs/examples/theme/index.html
docs/examples/tooltip-viewport/index.html
docs/getting-started.html
docs/javascript.html
docs/migration.html
less/_animation.less
less/_modal.less
less/_navbar.less
less/_variables.less
less/glyphicons.less
less/navs.less
less/panels.less
less/progress-bars.less
|
2014-10-26 22:31:59 -07:00 |
|
Mark Otto
|
66bb0b4fc9
|
Merge branch 'master' into need-to-activate-animated-progressbar
|
2014-10-26 14:43:32 -07:00 |
|
Mark Otto
|
05c785bfae
|
grunt
|
2014-10-26 14:42:06 -07:00 |
|
Heinrich Fenkart
|
66e140db82
|
Docs: progress bars' animation now needs to be manually toggled
Refs #14409
|
2014-10-26 20:43:41 +01:00 |
|
Mark Otto
|
743aaf6100
|
fix clipboard button and examples
|
2014-10-25 22:39:01 -07:00 |
|
Heinrich Fenkart
|
2cbb1d9374
|
grunt
|
2014-10-26 04:39:49 +01:00 |
|
Mark Otto
|
783eced7ab
|
follow up fix for #14837 /cc @hnrch02
|
2014-10-25 20:20:24 -07:00 |
|
Heinrich Fenkart
|
5f2e6fa58b
|
grunt
|
2014-10-26 03:53:10 +01:00 |
|
Heinrich Fenkart
|
44cc763229
|
grunt
|
2014-10-26 03:17:19 +01:00 |
|
Mark Otto
|
2c2564faef
|
Fixes #14736: Reverts the remaining progress bar min value overrides from #12848
|
2014-10-25 19:10:03 -07:00 |
|
Mark Otto
|
3fcd65af41
|
Fixes #14806: reset the text-shadow in the themed buttons
|
2014-10-25 18:57:27 -07:00 |
|
Mark Otto
|
9bf9aab132
|
grunt
|
2014-10-25 18:29:15 -07:00 |
|
Mark Otto
|
41a26ced24
|
Fixes #14814: Use the link active bg variables for theme navbar gradients
|
2014-10-25 18:27:40 -07:00 |
|
Mark Otto
|
38217ee405
|
Merge branch 'pr/14801'
Conflicts:
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
docs/assets/js/customize.min.js
docs/assets/js/raw-files.min.js
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
|
2014-10-25 18:16:40 -07:00 |
|
Mark Otto
|
6e3c55a115
|
grunt
|
2014-10-25 18:13:50 -07:00 |
|
Mark Otto
|
a0e6bd96de
|
grunt
|
2014-10-25 17:54:06 -07:00 |
|
Mark Otto
|
018c1c0b6e
|
Merge pull request #14871 from twbs/fix-#14810
Move "Copy" button in `code`.
|
2014-10-25 17:49:13 -07:00 |
|
Heinrich Fenkart
|
e9d6f256c2
|
grunt
|
2014-10-26 01:59:25 +02:00 |
|
XhmikosR
|
db550a9235
|
Run grunt.
|
2014-10-25 14:12:21 +03:00 |
|
XhmikosR
|
0ba39d45b4
|
Move "Copy" button in code.
|
2014-10-25 01:48:02 +03:00 |
|
Mark Otto
|
80aca8c17e
|
grunt
|
2014-10-24 13:27:28 -07:00 |
|
Mark Otto
|
79b38361ab
|
20px from bottom because the final frontier
|
2014-10-24 13:26:05 -07:00 |
|
Mark Otto
|
1979a311d4
|
Merge branch 'master' of github.com:twbs/bootstrap
|
2014-10-24 13:24:34 -07:00 |
|
Mark Otto
|
23e3995cec
|
guhrunt
|
2014-10-24 13:24:28 -07:00 |
|
Mark Otto
|
e631b721ec
|
Merge pull request #14848 from knownasilya/patch-1
Make the docs' nav sidebar scrollable
|
2014-10-24 13:24:14 -07:00 |
|
Heinrich Fenkart
|
51f1f58be8
|
grunt
|
2014-10-23 06:39:51 +02:00 |
|
Heinrich Fenkart
|
9814256736
|
Merge pull request #14852 from twbs/jquery-version-check
Add jQuery version check to existing jQuery presence check
|
2014-10-23 06:15:36 +02:00 |
|
Heinrich Fenkart
|
1604af041b
|
Add jQuery version check to existing jQuery presence check
Fixes #14809.
Closes #14825.
|
2014-10-23 05:57:15 +02:00 |
|
Heinrich Fenkart
|
e0cea19cbc
|
grunt
|
2014-10-23 05:23:29 +02:00 |
|
Heinrich Fenkart
|
40c309b39a
|
grunt
|
2014-10-22 21:39:37 +02:00 |
|