Mark Otto
663576a7ae
Merge branch 'v4' of https://github.com/twbs/derpstrap into v4
...
Conflicts:
dist/css/bootstrap.css
dist/css/bootstrap.css.map
docs/assets/css/docs.min.css
2015-05-27 15:49:55 -07:00
XhmikosR
315907c97c
Use https
when possible.
2015-05-17 12:43:20 +03:00
XhmikosR
9b6a2013d6
docs: update uglify-js to v2.4.21.
...
[ci skip]
2015-05-17 00:55:26 +03:00
XhmikosR
c56032a0e5
Remove grunt-banner completely.
...
Add a license header in theme instead.
2015-05-16 12:57:27 +03:00
XhmikosR
9e395712a5
Run grunt
.
2015-05-16 09:58:16 +03:00
Bryan Braun
dec2faec3d
Update Anchor.js and port over the existing styles.
...
Anchor.js 1.0.0 drops the need to use anchor.css, so we remove it
from the codebase and move any leftover styles over to docs.css.
Closes #16488 by merging it.
2015-05-16 09:58:15 +03:00
Chris Rebert
c111c291be
Relicense ie10-viewport-bug-workaround.js under MIT License
...
Fixes #16470
Closes #16483
2015-05-14 22:43:27 -07:00
Mark Otto
588b7e564e
grrrrrrrrrrrrrrrrrrrunt
2015-05-14 11:11:03 -07:00
Mark Otto
82279a8eb2
Merge branch 'btn-borders' of https://github.com/martinbean/bootstrap into martinbean-btn-borders
2015-05-13 21:20:02 -07:00
XhmikosR
414d0a535a
Run grunt
.
2015-05-05 11:57:42 +03:00
XhmikosR
5ae00f2e7c
Run grunt
.
2015-05-05 06:50:18 +03:00
XhmikosR
49c4556354
Comply to the new JSCS rules.
2015-05-05 06:50:18 +03:00
XhmikosR
07e76a571d
Redo changes needed to hide Copy button.
2015-04-29 08:56:33 +03:00
XhmikosR
438cae9d90
Revert "Update ZeroClipboard and remove Copy buttons when Flash is unavailable"
...
This reverts commit 229e88892913d5c8b712510c28b78bfa114596e5.
ZeroClipboard v2.x drops IE < 9 support.
2015-04-29 08:55:29 +03:00
XhmikosR
16a44c208d
Fix dab6a4f0e3af750f5b1c7b88db1e7d14a15eb8b0.
2015-04-29 08:54:32 +03:00
XhmikosR
5ca44f94ac
Run grunt
.
2015-04-28 14:24:37 +03:00
XhmikosR
86400070b5
Bump copyright year.
...
[ci skip]
2015-04-28 11:40:42 +03:00
XhmikosR
3e7ca3bbc8
Minor lint tweaks.
2015-04-28 11:03:37 +03:00
Mark Otto
dab6a4f0e3
scope anchorjs to immediate children, fixes #16129
2015-04-27 14:16:27 -07:00
Martin Bean
9a451d4aea
Add @btn-border-radius variables ( #16271 )
2015-04-26 17:42:34 +01:00
XhmikosR
fa4d7d2bd2
Run grunt
.
2015-04-26 14:03:35 +03:00
XhmikosR
8cc39a3951
Update autoprefixer.js.
...
Taken from https://github.com/ai/autoprefixer-rails/blob/master/vendor/autoprefixer.js
[ci skip]
2015-04-26 14:01:17 +03:00
XhmikosR
a2680e8b6b
Run grunt
.
...
[ci skip`
2015-04-23 09:18:46 +03:00
XhmikosR
b29c15dfc8
Update Blob.js to v2015-03-21.
...
[ci skip]
2015-04-23 09:18:45 +03:00
XhmikosR
6df6452619
Update FileSaver.js to v2015-03-04.
...
[ci skip]
2015-04-23 09:18:45 +03:00
XhmikosR
7da5f13383
Update JSZip to v2.5.0.
...
[ci skip]
2015-04-23 09:18:45 +03:00
XhmikosR
cd23569d49
Update uglify-js to v2.4.20.
...
[ci skip]
2015-04-23 09:18:45 +03:00
XhmikosR
69308dc883
Update Holder.js to v2.6.0.
...
[ci skip]
2015-04-23 09:18:45 +03:00
XhmikosR
09f98453ce
Update devDependencies.
2015-04-19 00:07:37 +03:00
Chris Rebert
3a279860b0
grunt docs
2015-04-16 17:25:00 -07:00
Mark Tareshawty
229e888929
Update ZeroClipboard and remove Copy buttons when Flash is unavailable
...
Fixes #16269 .
Closes #16301 by merging a rebased version of it.
2015-04-16 17:17:28 -07:00
Mark Otto
c84cf4f7f5
rename classes from .bs-docs and .bs to .bd
2015-04-16 14:07:20 -07:00
Chris Rebert
bf3a64f2df
grunt dist docs
...
[skip sauce]
2015-04-07 19:18:35 -07:00
Chris Rebert
05d381afc6
Upgrade to Holder v2.5.2
...
Fixes #16216 , FWICT
2015-04-07 19:18:23 -07:00
Mark Otto
ce75f289f2
grunt
2015-03-28 23:33:11 -07:00
Chris Rebert
a10eb60bc0
full grunt
2015-03-16 08:44:41 -07:00
Chris Rebert
4d652035dc
v3.3.2 => v3.3.4
2015-03-16 08:39:31 -07:00
XhmikosR
d18a043ddc
Run grunt
.
2015-03-15 04:27:44 -07:00
Mark Otto
14e3b6b7bd
scope the anchor highlighting
2015-03-09 15:21:34 +00:00
Mark Otto
edecd2c5f3
nuke theme toggler js
2015-03-09 15:02:51 +00:00
XhmikosR
f8e34ff48b
Disable es3 for tests and customizer.js.
2015-03-02 11:16:06 +02:00
XhmikosR
ea3c7028bd
Run grunt
.
2015-03-02 11:16:06 +02:00
Mark Otto
c16fee5efd
Merge branch 'master' into v4
...
Conflicts:
.travis.yml
Gruntfile.js
bower.json
dist/css/bootstrap.css
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
dist/js/bootstrap.js
dist/js/bootstrap.min.js
docs/_data/glyphicons.yml
docs/_includes/components/breadcrumbs.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/labels.html
docs/_includes/components/list-group.html
docs/_includes/components/media.html
docs/_includes/components/navs.html
docs/_includes/components/panels.html
docs/_includes/components/progress-bars.html
docs/_includes/components/thumbnails.html
docs/_includes/components/wells.html
docs/_includes/css/buttons.html
docs/_includes/css/forms.html
docs/_includes/css/helpers.html
docs/_includes/css/images.html
docs/_includes/css/less.html
docs/_includes/customizer-variables.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/examples.html
docs/_includes/getting-started/grunt.html
docs/_includes/getting-started/license.html
docs/_includes/getting-started/template.html
docs/_includes/header.html
docs/_includes/js/affix.html
docs/_includes/js/alerts.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/popovers.html
docs/_includes/js/scrollspy.html
docs/_includes/js/tabs.html
docs/_includes/js/tooltips.html
docs/_includes/js/transitions.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/assets/js/vendor/FileSaver.js
docs/assets/js/vendor/autoprefixer.js
docs/assets/js/vendor/uglify.min.js
docs/dist/css/bootstrap.css
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
docs/dist/js/bootstrap.min.js
docs/examples/blog/index.html
docs/examples/carousel/index.html
docs/examples/cover/index.html
docs/examples/dashboard/index.html
docs/examples/narrow-jumbotron/narrow-jumbotron.css
docs/examples/navbar-fixed-top/index.html
docs/examples/navbar-static-top/index.html
docs/examples/non-responsive/index.html
docs/examples/non-responsive/non-responsive.css
docs/examples/theme/index.html
grunt/configBridge.json
js/affix.js
js/carousel.js
js/collapse.js
js/dropdown.js
js/modal.js
js/popover.js
js/scrollspy.js
js/tab.js
js/tests/unit/affix.js
js/tests/unit/button.js
js/tests/unit/carousel.js
js/tests/unit/modal.js
js/tests/unit/tooltip.js
js/tooltip.js
less/badges.less
less/glyphicons.less
less/type.less
less/variables.less
package.json
scss/_dropdown.scss
scss/_forms.scss
test-infra/npm-shrinkwrap.json
2015-03-01 13:44:10 -08:00
XhmikosR
05b444aee3
Run grunt
.
2015-02-26 11:30:23 +02:00
XhmikosR
e6dbaea97e
Run grunt
.
2015-02-20 11:35:45 +02:00
XhmikosR
81115cd089
Run grunt
.
2015-02-10 10:50:57 +02:00
XhmikosR
f674f8786b
Run grunt
.
2015-01-30 15:26:31 +02:00
XhmikosR
2139f01a76
Update uglify.js to v2.4.16.
2015-01-30 15:25:55 +02:00
XhmikosR
8e18eb8c18
Update autoprefixer to v5.1.0.
2015-01-30 15:24:39 +02:00
XhmikosR
c918289b46
Bump FileSaver.js to v2015-01-04.
2015-01-30 15:22:56 +02:00