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
315907c97c
Use `https` when possible.
2015-05-17 12:43:20 +03:00
9b6a2013d6
docs: update uglify-js to v2.4.21.
...
[ci skip]
2015-05-17 00:55:26 +03:00
c56032a0e5
Remove grunt-banner completely.
...
Add a license header in theme instead.
2015-05-16 12:57:27 +03:00
9e395712a5
Run `grunt`.
2015-05-16 09:58:16 +03:00
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
c111c291be
Relicense ie10-viewport-bug-workaround.js under MIT License
...
Fixes #16470
Closes #16483
2015-05-14 22:43:27 -07:00
588b7e564e
grrrrrrrrrrrrrrrrrrrunt
2015-05-14 11:11:03 -07:00
82279a8eb2
Merge branch 'btn-borders' of https://github.com/martinbean/bootstrap into martinbean-btn-borders
2015-05-13 21:20:02 -07:00
414d0a535a
Run `grunt`.
2015-05-05 11:57:42 +03:00
5ae00f2e7c
Run `grunt`.
2015-05-05 06:50:18 +03:00
49c4556354
Comply to the new JSCS rules.
2015-05-05 06:50:18 +03:00
07e76a571d
Redo changes needed to hide Copy button.
2015-04-29 08:56:33 +03:00
438cae9d90
Revert "Update ZeroClipboard and remove Copy buttons when Flash is unavailable"
...
This reverts commit 229e888929
2015-04-29 08:55:29 +03:00
16a44c208d
Fix dab6a4f0e3.
2015-04-29 08:54:32 +03:00
5ca44f94ac
Run `grunt`.
2015-04-28 14:24:37 +03:00
86400070b5
Bump copyright year.
...
[ci skip]
2015-04-28 11:40:42 +03:00
3e7ca3bbc8
Minor lint tweaks.
2015-04-28 11:03:37 +03:00
dab6a4f0e3
scope anchorjs to immediate children, fixes #16129
2015-04-27 14:16:27 -07:00
9a451d4aea
Add @btn-border-radius variables ( #16271 )
2015-04-26 17:42:34 +01:00
fa4d7d2bd2
Run `grunt`.
2015-04-26 14:03:35 +03:00
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
a2680e8b6b
Run `grunt`.
...
[ci skip`
2015-04-23 09:18:46 +03:00
b29c15dfc8
Update Blob.js to v2015-03-21.
...
[ci skip]
2015-04-23 09:18:45 +03:00
6df6452619
Update FileSaver.js to v2015-03-04.
...
[ci skip]
2015-04-23 09:18:45 +03:00
7da5f13383
Update JSZip to v2.5.0.
...
[ci skip]
2015-04-23 09:18:45 +03:00
cd23569d49
Update uglify-js to v2.4.20.
...
[ci skip]
2015-04-23 09:18:45 +03:00
69308dc883
Update Holder.js to v2.6.0.
...
[ci skip]
2015-04-23 09:18:45 +03:00
09f98453ce
Update devDependencies.
2015-04-19 00:07:37 +03:00
3a279860b0
grunt docs
2015-04-16 17:25:00 -07:00
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
c84cf4f7f5
rename classes from .bs-docs and .bs to .bd
2015-04-16 14:07:20 -07:00
bf3a64f2df
grunt dist docs
...
[skip sauce]
2015-04-07 19:18:35 -07:00
05d381afc6
Upgrade to Holder v2.5.2
...
Fixes #16216 , FWICT
2015-04-07 19:18:23 -07:00
ce75f289f2
grunt
2015-03-28 23:33:11 -07:00
a10eb60bc0
full grunt
2015-03-16 08:44:41 -07:00
4d652035dc
v3.3.2 => v3.3.4
2015-03-16 08:39:31 -07:00
d18a043ddc
Run `grunt`.
2015-03-15 04:27:44 -07:00
14e3b6b7bd
scope the anchor highlighting
2015-03-09 15:21:34 +00:00
edecd2c5f3
nuke theme toggler js
2015-03-09 15:02:51 +00:00
f8e34ff48b
Disable es3 for tests and customizer.js.
2015-03-02 11:16:06 +02:00
ea3c7028bd
Run `grunt`.
2015-03-02 11:16:06 +02:00
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
05b444aee3
Run `grunt`.
2015-02-26 11:30:23 +02:00
e6dbaea97e
Run `grunt`.
2015-02-20 11:35:45 +02:00
81115cd089
Run `grunt`.
2015-02-10 10:50:57 +02:00
f674f8786b
Run `grunt`.
2015-01-30 15:26:31 +02:00
2139f01a76
Update uglify.js to v2.4.16.
2015-01-30 15:25:55 +02:00
8e18eb8c18
Update autoprefixer to v5.1.0.
2015-01-30 15:24:39 +02:00
c918289b46
Bump FileSaver.js to v2015-01-04.
2015-01-30 15:22:56 +02:00
8fd5718e71
Run `grunt`.
2015-01-30 15:13:24 +02:00
9f25895015
Fix validation errors.
...
Surprisingly those weren't reported by the validator; only in the grunt-contrib-htmlmin branch they were reported, so after digging into it, I saw they were indeed errors...
2015-01-26 17:58:09 +02:00
a3890a72cf
Merge branch 'master' into move-inline-css
...
Conflicts:
docs/assets/css/docs.min.css
2015-01-21 20:16:08 -08:00
84e41378e6
style changes
2015-01-21 19:20:16 -08:00
3f512c927b
Add AnchorJS for docs anchors.
2015-01-21 09:50:51 +02:00
24aad4fe3a
customizer typo
2015-01-19 09:19:09 -08:00
fa47de717e
grunt
2015-01-19 08:33:33 -08:00
c683e7dea7
bump versions
2015-01-19 08:32:13 -08:00
ce29def7a6
grunt
2015-01-19 08:27:15 -08:00
4ed95f5fa2
fixes #15497 : increase decimals on line-height-large from 1.33 to 1.3333333 to fix button sizing in Win 8.1 Chrome
2015-01-18 15:03:14 -08:00
db8eeaa17a
Fixes #15142 : Add position: relative; to .dropup for proper placement of menus
2015-01-18 13:39:40 -08:00
1bf1ba7103
Merge branch 'master' into pr/15278
...
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
2015-01-18 12:24:29 -08:00
22b79dae3c
grunt
2015-01-18 12:22:43 -08:00
d4f1331e51
grunt
2015-01-15 15:51:02 -08:00
0e5d17d5f6
Merge branch 'master' into v4
...
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
dist/js/bootstrap.min.js
docs/_data/glyphicons.yml
docs/_includes/components/alerts.html
docs/_includes/components/badges.html
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/input-groups.html
docs/_includes/components/jumbotron.html
docs/_includes/components/labels.html
docs/_includes/components/list-group.html
docs/_includes/components/media.html
docs/_includes/components/navbar.html
docs/_includes/components/navs.html
docs/_includes/components/page-header.html
docs/_includes/components/pagination.html
docs/_includes/components/panels.html
docs/_includes/components/progress-bars.html
docs/_includes/components/responsive-embed.html
docs/_includes/components/thumbnails.html
docs/_includes/components/wells.html
docs/_includes/css/buttons.html
docs/_includes/css/code.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/tables.html
docs/_includes/css/type.html
docs/_includes/customizer-variables.html
docs/_includes/getting-started/accessibility.html
docs/_includes/getting-started/disabling-responsiveness.html
docs/_includes/getting-started/download.html
docs/_includes/getting-started/whats-included.html
docs/_includes/js/alerts.html
docs/_includes/js/buttons.html
docs/_includes/js/carousel.html
docs/_includes/js/collapse.html
docs/_includes/js/modal.html
docs/_includes/js/overview.html
docs/_includes/js/popovers.html
docs/_includes/js/tabs.html
docs/_includes/js/tooltips.html
docs/_includes/nav/components.html
docs/_includes/nav/javascript.html
docs/_jade/customizer-variables.jade
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/raw-files.min.js
docs/assets/js/src/customizer.js
docs/customize.html
docs/dist/css/bootstrap-theme.css.map
docs/dist/css/bootstrap.css
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
less/glyphicons.less
less/mixins/vendor-prefixes.less
less/navbar.less
less/popovers.less
less/tables.less
less/theme.less
less/tooltip.less
less/variables.less
package.json
scss/_carousel.scss
scss/_close.scss
scss/_forms.scss
test-infra/npm-shrinkwrap.json
2015-01-03 20:08:58 -08:00
401ace65f4
add indeterminate checkbox support
2015-01-01 12:01:55 -08:00
1a932b7e02
Merge branch 'v4' of https://github.com/twbs/derpstrap into v4
2014-12-31 10:39:56 -08:00
a0dbe55678
add missing global declaration for SimpleJekyllSearch
2014-12-29 12:42:31 -08:00
18e08e777b
add custom forms, stub out examples for radios and checkboxes
2014-12-24 04:13:23 -08:00
73e59c26e6
basic docs search
2014-12-24 02:44:38 -08:00
977646d7a0
grunt
2014-12-22 19:48:48 -08:00
c4a23cc040
grunt
2014-12-22 19:18:26 -08:00
28d847a1e0
grunt
2014-12-20 23:05:23 -08:00
f24a1cb28d
remove remaining remnants of the Customizer
2014-12-17 13:44:52 -08:00
e0a9a7722f
Merge pull request #14 from twbs/nuke_customizer
...
Nuke the customizer
2014-12-11 12:21:05 -08:00
2a78159a20
grunt
2014-12-11 12:06:08 -08:00
4e27c48248
Run `grunt`.
2014-12-11 08:24:31 +02:00
95da2a9428
nuke the customizer
2014-12-10 13:51:43 -08:00
37183edfd5
Customizer: Catch and properly report compile errors that Less.js's toCSS() can throw.
...
Currently these errors are only reported in the JavaScript console, not in the Customizer UI.
Refs #15296
[skip sauce]
[skip validator]
2014-12-05 13:06:01 -08:00
dbe4765416
Nested button groups with only one child now have rounded corners (Iss.#15270)
2014-12-03 11:44:35 -05:00
75943868be
update home and side nav to use new navbar structure
2014-12-01 15:41:11 -08:00
9180e15e33
Clean up navbar to remove .navbar-toggle, .navbar-collapse, and .navbar-header as they are no longer used; Add .navbar-toggler to .navbar-inverse
2014-12-01 15:03:09 -08:00
7a799af939
fixes and grunt
2014-11-30 21:01:50 -08:00
4bba2d0e0c
fix more broke shit, run grunt
2014-11-30 20:29:47 -08:00
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
61bbe74df1
Update devDependencies.
2014-11-30 12:51:16 +02:00
bcb90ef3a0
Bump Glyphicons to v1.9
2014-11-30 01:31:49 -08:00
9928144dc4
Fixes #15241 : Add simple example to docs for collapse plugin
2014-11-29 23:03:47 -08:00
23bdfc45eb
grunt
2014-11-29 21:40:04 -08:00
9c049c99e2
grunt
2014-11-29 20:58:14 -08:00
80d7be1126
grunt
2014-11-29 18:36:21 -08:00
c901287394
remove more mentions of theme
2014-11-29 15:01:44 -08:00
12be9044f4
fix a bunch of padding and alignment things for forms
2014-11-25 18:00:52 -08:00
15d98dc6b7
disable shadows on buttons for now
2014-11-25 17:47:32 -08:00
7ca73b7542
fix margin on .bs-example thumbs
2014-11-25 17:10:47 -08:00
7ea49019b8
Run `grunt`.
2014-11-24 09:53:42 +02:00
c2abfc0a44
grunt
2014-11-17 18:57:02 +01:00
9a7e365c2c
bump version to v3.3.1
2014-11-12 09:03:16 -08:00
143c4a2f8f
grunt
2014-11-12 08:51:35 -08:00
ff386147ce
grunt
2014-11-11 20:25:09 -08:00
Mark Otto
XhmikosR
Bryan Braun
Chris Rebert
Martin Bean
Mark Tareshawty
Mark Otto
Matt Smith
Heinrich Fenkart