Jesse Mandel
f5ab82c7eb
Added NuGet install instructions to docs
...
Closes #17214 .
2015-09-08 16:44:21 -07:00
Mark Otto
5d5398afdb
Merge pull request #17389 from Gupocca/link-fixing
...
Fix several erroneous links in docs.
2015-09-01 20:06:00 -07:00
Gupocca
34932d71b4
Fix several erroneous links in docs.
...
Related to #17314 .
2015-08-29 10:59:04 -07:00
XhmikosR
8328344212
Use https when possible.
...
[ci skip]
2015-08-29 18:50:20 +03:00
XhmikosR
3e66427127
Less to Sass typos.
...
[ci skip]
2015-08-27 08:14:39 +03:00
XhmikosR
13e33e329c
Remove the obsolete JSHint references.
2015-08-27 08:11:11 +03:00
Chris Rebert
168cba1701
Explicitly document existing de facto policy of supporting ESR Firefox
...
Refs #17237
[skip sauce]
2015-08-24 14:32:58 -07:00
Mark Otto
d65486270c
Merge pull request #17059 from kkirsche/patch-7
...
State Edge support instead of IE 11 as latest
2015-08-22 18:47:36 -07:00
Chris Rebert
911e58ed63
introduction.md: Fix typo: "started template"
2015-08-20 18:21:35 -07:00
Heinrich Fenkart
3c17c9e90c
Docs: link to tooling setup on download page
2015-08-21 02:38:36 +02:00
Heinrich Fenkart
66be25917a
Docs: various fixes
...
Mostly links.
Fixes #17056 .
2015-08-21 02:15:17 +02:00
Heinrich Fenkart
3895bfa388
Docs: Fix "read more about x-ua" link
...
Fixes #17096
2015-08-21 01:28:41 +02:00
Heinrich Fenkart
a5bed79459
Fix link to wall of browser bugs; closes #17107
2015-08-21 00:45:09 +02:00
Manoj Kumar
6b1cf58d58
Add more compatibility info and caniuse links to Flexbox docs
...
Closes #17091
2015-08-19 20:33:07 -07:00
Kevin Kirsche
b6e0481c32
State Edge support instead of IE 11 as latest
...
Fix #17055
2015-08-19 17:23:50 -04:00
swaincreates
1e8d186f33
change flexbix to flexbox in docs/getting-started/flexbox.md
2015-08-19 13:30:18 -04:00
Mark Otto
624723f4c3
links, disable downloads, alert package manager downloads
2015-08-18 23:51:59 -07:00
Mark Otto
d2f4c35061
rewrite some button group docs
2015-08-18 20:25:18 -07:00
Mark Otto
4cb324afab
add redirects for all top level docs sections
2015-08-17 20:34:11 -07:00
Mark Otto
c064eef67b
Massive cleanup
...
- Simpler main nav on all pages
- Back to purple masthead on homepage instead of dark graphite
- Active link styles on the main nav
- Cleaned up sidebar nav
- New docs layout name
- Homepage copy edits
- Updated bright purple docs color
2015-08-14 22:45:55 -07:00
Thomas McDonald
dd0fa97856
clarify ie8-
2015-08-12 22:03:32 -07:00
Mark Otto
04b5e3010b
missing todo
2015-08-10 11:18:40 -07:00
Mark Otto
b1d9df0043
stub out a best practices page
2015-08-10 11:18:06 -07:00
Mark Otto
39a8402b65
rip community as separate page, move to intro and restore table of contents on intro
2015-08-10 11:11:35 -07:00
Mark Otto
7c87b75499
remove two pages that are now elsewhere
2015-08-10 11:03:03 -07:00
Mark Otto
b58e4dc3cd
remove that snippet
2015-08-10 11:02:54 -07:00
Mark Otto
131fec0f5b
mention globals in intro page
2015-08-10 11:02:39 -07:00
Mark Otto
e839b093a0
move compilting to build-tools, rewrite some grunt stuff, add local docs with jekyll section based on readme's more detailed walkthrough
2015-08-10 10:29:35 -07:00
Mark Otto
510522039b
tweak options, renamed from customize
2015-08-10 10:05:38 -07:00
Mark Otto
317c667d1c
rewrite browser and device support
2015-08-09 23:12:09 -07:00
Mark Otto
ce22176624
rewrite downloads page
2015-08-09 22:49:03 -07:00
Mark Otto
91d236664d
new getting started intro overview doodad
2015-08-09 22:48:33 -07:00
Mark Otto
e592a23eb7
docs twerks
2015-08-08 14:57:12 -07:00
Mark Otto
66305c5b02
correct url
2015-08-08 14:22:46 -07:00
Mark Otto
7936455907
tweak that, link to downloads
2015-08-08 14:22:31 -07:00
Mark Otto
ee747f4adf
tweak getting started quickstart docs
2015-08-08 14:20:38 -07:00
Mark Otto
fed0d8a2d4
restore page headers, use partial and page frontmatter to organize it
2015-08-05 17:47:45 -07:00
Mark Otto
1ddc3f5e21
Merge branch 'master' into v4m
2015-08-04 22:29:45 -07:00
Mark Otto
169d2a4a78
Merge branch 'master' into v4
2015-06-18 23:56:43 -07:00
Mark Otto
e615ae053c
overhaul nav and shit again
...
- drop the index pages save for examples
- comment out the extend section for now
- fix up spacing fix on team list
2015-06-13 14:05:25 -07:00
Mark Otto
5acefab4cf
spec out variables customize docs
2015-06-09 16:28:09 -07:00
Mark Otto
960cbe6162
some download changes
2015-06-09 16:09:33 -07:00
Mark Otto
cb8304e4c4
clarify ie8- support
2015-05-30 15:30:44 -07:00
Mark Otto
163dd5296e
move flexbox to getting started
2015-05-29 13:53:22 -07:00
Mark Otto
b455ed8def
add markdown toc stuff
2015-05-29 01:58:52 -07:00
Mark Otto
fbfba7b212
Move getting started's quick start to the getting started index
2015-04-18 18:15:58 -07:00
Mark Otto
89db64d4f7
stub out that customize page
2015-04-18 18:12:18 -07:00
Mark Otto
7e86bfd9ac
change nav to use index files for each section; stub out index views for everything
2015-04-18 12:28:50 -07:00
Mark Otto
466d36e541
Redo all our callouts with the custom callout plugin
...
- Replaces manual use of .bd-callout with {% callout [type] %}
- Rearranged some callouts for proximity to others
- Turned long lists of callouts--like those on tooltips, plugings, etc--into a list because holy shit that's overwhelming
2015-04-16 16:56:40 -07:00
Mark Otto
c84cf4f7f5
rename classes from .bs-docs and .bs to .bd
2015-04-16 14:07:20 -07:00
Mark Otto
7cf23a1846
page nav and title
2015-04-04 23:31:41 -07:00
Mark Otto
b606d4d11f
Move transitions and overview to a javascript page in the getting started section
2015-03-30 20:53:32 -07:00
Mark Otto
58082cd83e
Merge branch 'master' into v4
...
Conflicts:
.gitignore
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/js/bootstrap.js
dist/js/bootstrap.min.js
docs/_includes/components/navbar.html
docs/_includes/components/progress-bars.html
docs/_includes/css/grid.html
docs/_includes/css/overview.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/disabling-responsiveness.html
docs/_includes/getting-started/download.html
docs/_includes/getting-started/examples.html
docs/_includes/getting-started/license.html
docs/_includes/getting-started/third-party-support.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/js/transitions.html
docs/_includes/nav/javascript.html
docs/_includes/nav/main.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/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/js/bootstrap.js
docs/dist/js/bootstrap.min.js
docs/migration.html
js/affix.js
js/alert.js
js/button.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/tests/visual/modal.html
js/tooltip.js
less/component-animations.less
less/jumbotron.less
less/mixins/background-variant.less
less/mixins/buttons.less
less/mixins/responsive-visibility.less
less/mixins/text-emphasis.less
less/navbar.less
less/navs.less
less/scaffolding.less
less/tooltip.less
less/utilities.less
less/variables.less
package.json
scss/_buttons.scss
scss/_forms.scss
scss/_modal.scss
2015-03-29 00:08:54 -07:00
Mark Otto
7253bd38f7
simplify grunt compiling docs
2015-03-11 19:02:32 +00:00
Mark Otto
e70d83dc5d
comment out download options for now
2015-03-09 15:40:32 +00:00
Mark Otto
6944e418eb
docs redesign a bit
2015-03-09 14:07:46 +00: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
Chris Rebert
f265fed3eb
account for mq4-hover-shim's renaming & org move
2015-02-04 21:15:01 -08:00
Chris Rebert
175714d246
add docs for mq4-hover-hover-shim integration
2015-01-22 11:39:57 -08:00
Chris Rebert
a1126ef655
Reorg @viewport now that we don't need to worry about non-responsive layouts
2015-01-21 13:05:14 -08:00
Chris Rebert
9238337cbb
Merge branch 'master' into v4
2015-01-21 13:00:12 -08:00
Mark Otto
33e32bffc8
new headers, ad placements, intro paragraphs on several pages, etc
2015-01-19 20:03:08 -08:00
Mark Otto
325748ff68
Merge branch 'master' into v4
...
Conflicts:
_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
dist/js/bootstrap.min.js
docs/_includes/components/thumbnails.html
docs/_includes/css/forms.html
docs/_includes/css/grid.html
docs/_includes/customizer-variables.html
docs/_includes/footer.html
docs/_includes/getting-started/download.html
docs/_includes/getting-started/template.html
docs/_includes/js/overview.html
docs/_includes/js/popovers.html
docs/_includes/js/tooltips.html
docs/assets/css/docs.min.css
docs/assets/js/customize.min.js
docs/assets/js/raw-files.min.js
docs/assets/js/src/customizer.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
docs/dist/js/bootstrap.js
docs/dist/js/bootstrap.min.js
docs/examples/navbar-fixed-top/index.html
docs/examples/navbar-static-top/index.html
docs/examples/non-responsive/index.html
docs/examples/theme/index.html
grunt/configBridge.json
less/alerts.less
less/badges.less
less/jumbotron.less
less/panels.less
less/tables.less
less/theme.less
less/variables.less
package.json
scss/_button-group.scss
scss/_buttons.scss
scss/_forms.scss
2015-01-19 14:48:12 -08:00
Chris Rebert
ef453fa6ce
Use improved box sizing reset
...
Based on http://css-tricks.com/inheriting-box-sizing-probably-slightly-better-best-practice/
This allows us to significantly simplify the relevant part of the docs.
2015-01-05 15:20:46 -08:00
Chris Rebert
6cb417616c
Merge pull request #26 from twbs/autoprefixer-bump-mac-safari
...
bump min OS X Safari in Autoprefixer config to v7.1
2015-01-05 11:20:30 -08:00
Mark Otto
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
Chris Rebert
626f30fd6b
remove lingering references to Less in the docs
2014-12-30 16:14:32 -08:00
Chris Rebert
9b4296b565
rm note about Safari<7.1 / iOS<8.0 percent rounding bug
2014-12-30 12:49:46 -08:00
Chris Rebert
2e815e891b
Fix @mdo's grammar
2014-12-30 12:45:24 -08:00
Gleb Mazovetskiy
c0c16edc41
Update styles for Ruby Sass compat
2014-12-24 22:22:15 +02:00
Gleb Mazovetskiy
0d96695f5e
Docs: Use another Sass compiler
2014-12-24 22:21:39 +02:00
Mark Otto
e63a0acd3b
fix some getting started links
2014-12-23 13:25:59 -08:00
Mark Otto
bd453652b8
docs tweak /cc @glebm
2014-12-11 14:36:19 -08:00
Mark Otto
fd03025b09
Merge pull request #16 from twbs/android-lollipop
...
Officially support the Android Browser on Android v5.0+
2014-12-11 13:53:58 -08:00
Chris Rebert
6ae16b0a49
Officially support the Android Browser on Android v5.0+
2014-12-11 10:48:32 -08:00
Mark Otto
58fee94f8d
stub out descriptions and titles for potential custom builds
2014-12-10 14:12:20 -08:00
Mark Otto
7bc020cce0
sass, not less
2014-12-04 15:25:24 -08:00
Mark Otto
af30e237c7
rearrange examples
2014-12-01 16:12:15 -08:00
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
Mark Otto
b53ad74d47
clean up navbar examples
2014-11-29 15:07:13 -08:00
Mark Otto
c901287394
remove more mentions of theme
2014-11-29 15:01:44 -08:00
Mark Otto
55148d32cb
no more theme
2014-11-29 15:00:45 -08:00
Mark Otto
6a810551d0
hide sections of homepage and quick start
2014-11-25 17:40:08 -08:00
Mark Otto
2ef6e02c01
alphabetize the ordering
2014-11-25 17:09:23 -08:00
Mark Otto
2a3680e187
drop the theme example
2014-11-21 15:27:52 -08:00
Mark Otto
2ef7b50a1f
remove disable responsive docs section
2014-11-21 15:27:08 -08:00
Mark Otto
3151f50267
don't link to now removed non-responsive example
2014-11-21 15:26:19 -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
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
9f2aeafe85
Merge branch 'master' into derp
...
Conflicts:
Gruntfile.js
dist/css/bootstrap-theme.css.map
dist/css/bootstrap.css
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
dist/fonts/glyphicons-halflings-regular.svg
docs/_includes/components/badges.html
docs/_includes/components/input-groups.html
docs/_includes/components/pagination.html
docs/_includes/css/forms.html
docs/_includes/footer.html
docs/_includes/getting-started/browser-device-support.html
docs/_includes/getting-started/grunt.html
docs/_includes/home-nav.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/popovers.html
docs/_includes/js/tooltips.html
docs/_includes/nav/getting-started.html
docs/_includes/nav/javascript.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/browser-bugs.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
docs/dist/fonts/glyphicons-halflings-regular.svg
fonts/glyphicons-halflings-regular.svg
less/_button-group.less
less/_jumbotron.less
less/_variables.less
less/mixins/vendor-prefixes.less
less/panels.less
less/thumbnails.less
package.json
2014-09-17 15:21:31 -07:00
Mark Otto
0181d3c643
move license and translations to about section
2014-08-05 17:19:12 -07:00
Mark Otto
5c9bcb72fb
link the new navbar examples
2014-07-14 09:05:27 -07:00
Mark Otto
346bb975b3
markdown for 3rd party
2014-07-12 02:06:18 -07:00
Mark Otto
0d84bc1979
markdown for template
2014-07-12 02:06:13 -07:00
Mark Otto
95bd06cca6
markdown for disable responsive
2014-07-12 02:06:05 -07:00
Mark Otto
7c0c51c9d6
move remaining getting started files to new folder
2014-07-12 01:52:44 -07:00
Mark Otto
c2527e4870
Redo license FAQs in markdown
2014-07-12 00:54:37 -07:00
Mark Otto
c20e130a92
Redo community section in markdown
2014-07-12 00:54:29 -07:00
Mark Otto
b5441d8650
Redo browser/device support in markdown
2014-07-12 00:45:11 -07:00
Mark Otto
2346b17d05
Redo translations in markdown
2014-07-11 23:55:59 -07:00
