0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-12 00:08:59 +01:00
Commit Graph

10817 Commits

Author SHA1 Message Date
Chris Rebert
af70ac8ae1 Tweak parser to ignore empty Less section docstrings; fixes #14878 2014-10-27 13:50:45 -07:00
XhmikosR
3908235e0f Remove baseurl as it doesn't serve any real purpose. 2014-10-27 19:35:59 +02:00
Mark Otto
9796f56fa1 title change 2014-10-27 04:52:48 -07:00
Mark Otto
b091dd5e86 rename new navbar to just navbar 2014-10-27 04:52:22 -07:00
Mark Otto
77250e1451 drop the old navbar 2014-10-27 04:52:07 -07:00
Mark Otto
674c2ff224 fix up the new navbar docs 2014-10-27 04:49:24 -07:00
Mark Otto
e3d2146350 fix rounded corners on copy buttons 2014-10-27 03:23:44 -07:00
Mark Otto
0222f2a2d0 compile the docs less as well 2014-10-27 03:23:30 -07:00
Mark Otto
c15aa36798 switch to max-width on containers 2014-10-27 03:07:34 -07:00
Mark Otto
125c3859a0 add height to new navbar examples to show behavior 2014-10-27 03:07:25 -07:00
Mark Otto
37f10fe92f scrollspy maybe? 2014-10-27 01:35:10 -07:00
Mark Otto
d896faa1b9 grunt 2014-10-27 01:35:02 -07:00
Mark Otto
ff5146dce6 nav list update 2014-10-27 01:34:55 -07:00
Mark Otto
482863005e fix home nav 2014-10-27 01:34:43 -07:00
Mark Otto
252583b661 grunt 2014-10-26 23:07:20 -07:00
Mark Otto
f07477d290 Merge branch 'master' into derp
Conflicts:
	dist/css/bootstrap-theme.css.map
	dist/css/bootstrap.css.map
	docs/assets/js/raw-files.min.js
	docs/dist/css/bootstrap-theme.css.map
	docs/dist/css/bootstrap.css.map
	less/progress-bars.less
	less/theme.less
2014-10-26 22:59:02 -07:00
Mark Otto
dcee894a8c grunt 2014-10-26 22:57:38 -07:00
Mark Otto
c672f9e079 Merge pull request #14881 from bhamodi/white-space-optimization
Removed unnecessary new lines that were inconsistent with the current formatting style.
2014-10-26 22:56:35 -07:00
Mark Otto
f26821a83a fix progress bar animated biznas 2014-10-26 22:48:12 -07:00
Mark Otto
72a92f556d no more mixin, use regular property 2014-10-26 22:34:08 -07:00
Baraa
f0fd6df63a Removed unnecessary new lines that were inconsistent with current style. 2014-10-26 22:33:55 -07:00
Mark Otto
d664ceaac8 rename that variable 2014-10-26 22:33:35 -07:00
Mark Otto
57ac8f6863 nuked that variable 2014-10-26 22:33:10 -07:00
Mark Otto
dd584e81f8 fix syntax 2014-10-26 22:32:39 -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
Mark Otto
657ff31c74 Merge branch 'need-to-activate-animated-progressbar' of github.com:twbs/bootstrap into need-to-activate-animated-progressbar
Conflicts:
	docs/_includes/components/progress-bars.html
	docs/assets/js/src/application.js
2014-10-26 14:17:14 -07:00
XhmikosR
554568a184 Merge pull request #14876 from twbs/fix-14875
bs-commonjs-generator.js: always use forward slashes in the require path.
2014-10-26 22:13:54 +02:00
Heinrich Fenkart
66e140db82 Docs: progress bars' animation now needs to be manually toggled
Refs #14409
2014-10-26 20:43:41 +01:00
Julian Thilo
d40288b0c0 Merge pull request #14880 from danieljuhl/patch-2
Added link to danish translation of docs
2014-10-26 15:45:26 +01:00
Daniel Juhl
b171451d77 Added link to danish translation of docs 2014-10-26 15:04:37 +01:00
jonschlinkert
3e9b461766 Replaces markdown.js with [remarkable](https://github.com/jonschlinkert/remarkable).
- remarkable has 100% support for [commonmark](http://jgm.github.io/CommonMark/spec.html)
  - [faster](https://github.com/jonschlinkert/remarkable/tree/master/benchmark)
  - easier to monkeypatch. this is a goal of ours, might be useful to you at some point given the custom tokenizing/parsing you're doing for documentation.
2014-10-26 06:38:10 -04:00
XhmikosR
37facee922 bs-commonjs-generator.js: always use forward slashes in the require path.
Since `path.resolve` is using backslashes on Windows, we ended up with different files. Just replace those with forward slashes.
2014-10-26 09:35:14 +02:00
XhmikosR
bab3679d10 Losslessly compress apple-touch-icon.png.
6314 -> 6140 bytes

[ci skip]
2014-10-26 08:08:33 +02:00
Mark Otto
743aaf6100 fix clipboard button and examples 2014-10-25 22:39:01 -07:00
Heinrich Fenkart
97b4364452 Docs: progress bars' animation now needs to be manually toggled
Refs #14409
2014-10-26 06:17:05 +01:00
Mark Otto
5eb08f5d8d Merge pull request #14748 from twbs/apple-touch-icon
Docs: Use a 180x180 apple-touch-icon-precomposed.png.
2014-10-25 21:02:08 -07:00
Heinrich Fenkart
007fbdb66d Remove faulty unit test from 9740d8b
This would only work with transitions but since we disable them for unit tests, this delivers unreliably results.
2014-10-26 04:56:52 +01:00
Mark Otto
af2fe1d76b new icon 2014-10-25 20:49:10 -07:00
Heinrich Fenkart
5da85f8e8b Follow-up to 9740d8b: fix small typo 2014-10-26 04:41:47 +01:00
Heinrich Fenkart
2cbb1d9374 grunt 2014-10-26 04:39:49 +01:00
Phil Hughes
9740d8bb69 Fix tooltip occasionally not hiding when using a hide delay
Fixes #14375.
Closes #14519 by merging it.
2014-10-26 04:38:18 +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
Andrew S. Brown
1b3237629a Allow multiple delegated tooltip selectors on a node
Fixes #14167.
Closes #14189 by merging it.
2014-10-26 03:51:55 +01:00
Mark Otto
0521913a99 Merge pull request #13824 from jsdf/node-requirable
Allow npm package to be resolved via node module resolution
2014-10-25 19:43:05 -07:00
Heinrich Fenkart
44cc763229 grunt 2014-10-26 03:17:19 +01:00
Heinrich Fenkart
0e991ccba2 Follow-up to e8af21c: rm unused variable in unit test 2014-10-26 03:16:05 +01:00
Tadeu Zagallo
e8af21cc9d Clear scrollspy selection above first section
Closes #13563 by merging it.
2014-10-26 03:14:08 +01:00