From 3ad0cf9e9417cc86ca6d18f2d47049e9180aef99 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 17 Jul 2013 22:58:49 -0700 Subject: [PATCH 1/8] add callouts for bootstrap 2.3.2 docs and 3.0 rc1 post --- docs/_includes/nav-main.html | 7 +++++ docs/_layouts/default.html | 2 +- docs/assets/css/docs.css | 56 +++++++++++++++++------------------- docs/customize.html | 2 +- docs/index.html | 14 +++++++-- 5 files changed, 46 insertions(+), 35 deletions(-) diff --git a/docs/_includes/nav-main.html b/docs/_includes/nav-main.html index fceeb7a86..40244d3a2 100644 --- a/docs/_includes/nav-main.html +++ b/docs/_includes/nav-main.html @@ -24,6 +24,13 @@ Customize + {% if page.layout == "default" %} + + {% endif %} diff --git a/docs/_layouts/default.html b/docs/_layouts/default.html index 019d7626a..e3a440cb9 100644 --- a/docs/_layouts/default.html +++ b/docs/_layouts/default.html @@ -1,4 +1,4 @@ - + diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index aae9e0635..aba1e489f 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -13,6 +13,19 @@ body { padding-top: 50px; /* Account for fixed navbar */ } +/* Custom docs button */ +.btn-bs { + color: #b94a48; + background-color: #fff; + border-color: #e5e5e5; +} +.btn-bs:hover, +.btn-bs:active { + color: #fff; + background-color: #b94a48; + border-color: #b94a48; +} + /* Top nav and header @@ -43,6 +56,15 @@ body { border-color: #993c3a; } +/* Old docs callout */ +.bs-old-docs { + padding: 15px 20px; + color: #777; + border-bottom: 1px solid #e5e5e5; +} +.bs-old-docs strong { + color: #555; +} /* Homepage masthead @@ -63,20 +85,11 @@ body { } /* Download button */ -.bs-masthead .btn { +.bs-masthead .btn-bs { margin-top: 5px; margin-bottom: 5px; padding: 18px 24px; font-size: 21px; - color: #b94a48; /* redeclare to override the `.jumbotron a` */ - background-color: #fff; - border-color: #e5e5e5; -} -.bs-masthead .btn:hover, -.bs-masthead .btn:active { - color: #fff; /* redeclare to override the `.jumbotron a` */ - background-color: #b94a48; - border-color: #b94a48; } /* Textual links */ @@ -95,12 +108,10 @@ body { } + /* Customize and Download button -------------------------------------------------- */ -.bs-customizer { - -} .bs-customizer .toggle { float: right; } @@ -116,23 +127,8 @@ body { background-color: #fafafa; } - .bs-customize-download { - text-align:center; -} -.bs-customize-download .btn { - margin-top: 5px; - margin-bottom: 5px; - padding: 18px 24px; - font-size: 21px; - color: #b94a48; - background-color: #fff; - border-color: #b94a48; -} -.bs-customize-download .btn:hover, -.bs-customize-download .btn:active { - color: #fff; - background-color: #b94a48; + text-align: center; } @@ -146,7 +142,7 @@ body { font-size: 16px; color: #5a5a5a; text-align: center; - border-bottom: 1px solid #ddd; + border-bottom: 1px solid #e5e5e5; } .bs-header h1 { color: #b94a48; diff --git a/docs/customize.html b/docs/customize.html index 876d81dde..511e94e41 100644 --- a/docs/customize.html +++ b/docs/customize.html @@ -1155,7 +1155,7 @@ lead: Customize Bootstrap's components, LESS variables, and jQuery plugins to ge

Hooray! Your custom version of Bootstrap is now ready to be compiled. Just click the button below to finish the process.

- Customize and Download + Customize and Download

What's included?

diff --git a/docs/index.html b/docs/index.html index 49bdcb38e..f9abb75f8 100644 --- a/docs/index.html +++ b/docs/index.html @@ -3,13 +3,22 @@ layout: home title: Bootstrap --- +
+
+ + Looking for Bootstrap 2.3.2 docs? + + We've moved it to a new home while we push forward with Bootstrap 3. Read the blog post for details. +
+
+
-

Bootstrap

+

Bootstrap 3

Sleek, intuitive, and powerful mobile-first front-end framework for faster and easier web development.

- Download Bootstrap + Download Bootstrap 3.0.0.1

{% include social-buttons.html %} @@ -27,7 +36,6 @@ title: Bootstrap
  • Bootstrap Expo
    • -
  • Version 3.0.0
    • From d7d1c2a767987c8aec0745ea5f26ab319b55f5af Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 17 Jul 2013 23:22:28 -0700 Subject: [PATCH 2/8] add ads to v3 docs --- docs/_includes/ads.html | 1 + docs/_layouts/default.html | 1 + docs/assets/css/docs.css | 59 ++++++++++++++++++++++++++++++++++++-- 3 files changed, 58 insertions(+), 3 deletions(-) create mode 100644 docs/_includes/ads.html diff --git a/docs/_includes/ads.html b/docs/_includes/ads.html new file mode 100644 index 000000000..495e7ba47 --- /dev/null +++ b/docs/_includes/ads.html @@ -0,0 +1 @@ +
    \ No newline at end of file diff --git a/docs/_layouts/default.html b/docs/_layouts/default.html index 019d7626a..5d6954465 100644 --- a/docs/_layouts/default.html +++ b/docs/_layouts/default.html @@ -15,6 +15,7 @@

    {{ page.title }}

    {{ page.lead }}

    + {% include ads.html %}
    diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index aae9e0635..38a1369da 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -155,6 +155,45 @@ body { font-weight: 300; line-height: 1.5; } +.bs-header .container { + position: relative; +} + +/* Ads in page headers */ +.carbonad { + width: auto !important; + margin: 50px -30px -40px !important; + padding: 20px !important; + overflow: hidden; /* clearfix */ + height: auto !important; + font-size: 13px !important; + line-height: 16px !important; + text-align: left; + background: none !important; + border: 0 !important; + border-top: 1px solid #e5e5e5 !important; +} +.carbonad-img { + margin: 0 !important; +} +.carbonad-text, +.carbonad-tag { + float: none !important; + display: block !important; + width: auto !important; + height: auto !important; + margin-left: 145px !important; + font-family: "Helvetica Neue", Helvetica, Arial, sans-serif !important; +} +.carbonad-text { + padding-top: 0 !important; +} +.carbonad-tag { + text-align: left !important; +} +.carbonad #azcarbon > img { + display: none; /* hide what I assume are tracking images */ +} /* Padding for in-page bookmarks */ .bs-docs-section { @@ -720,6 +759,12 @@ input.focused { line-height: 1; } + .carbonad { + margin: 0 !important; + border: 1px solid #e5e5e5 !important; + border-radius: 4px; + } + /* Show the docs nav */ .bs-sidebar { display: block; @@ -756,9 +801,17 @@ input.focused { width: 213px; } - /* Icons */ - .the-icons li { - width: 12.5%; + .bs-header h1, + .bs-header p { + margin-right: 380px; + } + .carbonad { + position: absolute; + top: 0; + right: 0; + padding: 15px !important; + width: 330px !important; + min-height: 132px; } } From 3abfe029eaf75939d2ff05aad97eb40400e2876b Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 18 Jul 2013 13:35:55 -0700 Subject: [PATCH 3/8] vertically center ad --- docs/assets/css/docs.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 6a493b6af..3aaecd065 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -803,7 +803,7 @@ input.focused { } .carbonad { position: absolute; - top: 0; + top: 20px; right: 0; padding: 15px !important; width: 330px !important; From 5cb0d646865b0d92d38f695833c2ffd53323c6dd Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 18 Jul 2013 13:51:08 -0700 Subject: [PATCH 4/8] relative url --- docs/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/index.html b/docs/index.html index f9abb75f8..1c9e804ae 100644 --- a/docs/index.html +++ b/docs/index.html @@ -6,7 +6,7 @@ title: Bootstrap
    - Looking for Bootstrap 2.3.2 docs? + Looking for Bootstrap 2.3.2 docs? We've moved it to a new home while we push forward with Bootstrap 3. Read the blog post for details.
    From 63f070096bf2501657f14906e5ac68dff73121b1 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 18 Jul 2013 14:06:13 -0700 Subject: [PATCH 5/8] copy change to css page subheading --- docs/css.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/css.html b/docs/css.html index 10f2ea1dd..c0e6c5061 100644 --- a/docs/css.html +++ b/docs/css.html @@ -2,7 +2,7 @@ layout: default title: CSS slug: css -lead: "Fundamental HTML elements styled and enhanced with extensible classes." +lead: "Global CSS settings, fundamental HTML elements styled and enhanced with extensible classes, and an advanced grid system." --- From 36188d0884c51c9ef9aece3b2eaaa84ac67d0ff1 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 18 Jul 2013 14:08:40 -0700 Subject: [PATCH 6/8] change download button label --- docs/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/index.html b/docs/index.html index 1c9e804ae..b798f3013 100644 --- a/docs/index.html +++ b/docs/index.html @@ -18,7 +18,7 @@ title: Bootstrap

    Bootstrap 3

    Sleek, intuitive, and powerful mobile-first front-end framework for faster and easier web development.

    - Download Bootstrap 3.0.0.1 + Download Bootstrap 3.0.0 RC1

    {% include social-buttons.html %} From a8005b3d0b8599611e8bfc864e704b50411fcb69 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 18 Jul 2013 17:41:30 -0700 Subject: [PATCH 7/8] flatten docs dir back into root --- _config.yml | 2 +- {docs/_includes => _includes}/ads.html | 0 {docs/_includes => _includes}/footer.html | 0 {docs/_includes => _includes}/header.html | 0 {docs/_includes => _includes}/nav-components.html | 0 {docs/_includes => _includes}/nav-css.html | 0 {docs/_includes => _includes}/nav-customize.html | 0 .../nav-getting-started.html | 0 {docs/_includes => _includes}/nav-javascript.html | 0 {docs/_includes => _includes}/nav-main.html | 0 {docs/_includes => _includes}/social-buttons.html | 0 {docs/_layouts => _layouts}/default.html | 0 {docs/_layouts => _layouts}/home.html | 0 {docs/assets => assets}/css/bootstrap.css | 0 {docs/assets => assets}/css/docs.css | 0 {docs/assets => assets}/css/pygments-manni.css | 0 .../ico/apple-touch-icon-114-precomposed.png | Bin .../ico/apple-touch-icon-144-precomposed.png | Bin .../ico/apple-touch-icon-57-precomposed.png | Bin .../ico/apple-touch-icon-72-precomposed.png | Bin {docs/assets => assets}/ico/favicon.png | Bin {docs/assets => assets}/js/application.js | 0 {docs/assets => assets}/js/bootstrap.js | 0 {docs/assets => assets}/js/bootstrap.min.js | 0 {docs/assets => assets}/js/holder/holder.js | 0 {docs/assets => assets}/js/html5shiv.js | 0 {docs/assets => assets}/js/jquery.js | 0 {docs/assets => assets}/js/respond/respond.min.js | 0 docs/components.html => components.html | 0 docs/css.html => css.html | 0 docs/customize.html => customize.html | 0 docs/getting-started.html => getting-started.html | 0 docs/index.html => index.html | 0 docs/javascript.html => javascript.html | 0 34 files changed, 1 insertion(+), 1 deletion(-) rename {docs/_includes => _includes}/ads.html (100%) rename {docs/_includes => _includes}/footer.html (100%) rename {docs/_includes => _includes}/header.html (100%) rename {docs/_includes => _includes}/nav-components.html (100%) rename {docs/_includes => _includes}/nav-css.html (100%) rename {docs/_includes => _includes}/nav-customize.html (100%) rename {docs/_includes => _includes}/nav-getting-started.html (100%) rename {docs/_includes => _includes}/nav-javascript.html (100%) rename {docs/_includes => _includes}/nav-main.html (100%) rename {docs/_includes => _includes}/social-buttons.html (100%) rename {docs/_layouts => _layouts}/default.html (100%) rename {docs/_layouts => _layouts}/home.html (100%) rename {docs/assets => assets}/css/bootstrap.css (100%) rename {docs/assets => assets}/css/docs.css (100%) rename {docs/assets => assets}/css/pygments-manni.css (100%) rename {docs/assets => assets}/ico/apple-touch-icon-114-precomposed.png (100%) rename {docs/assets => assets}/ico/apple-touch-icon-144-precomposed.png (100%) rename {docs/assets => assets}/ico/apple-touch-icon-57-precomposed.png (100%) rename {docs/assets => assets}/ico/apple-touch-icon-72-precomposed.png (100%) rename {docs/assets => assets}/ico/favicon.png (100%) rename {docs/assets => assets}/js/application.js (100%) rename {docs/assets => assets}/js/bootstrap.js (100%) rename {docs/assets => assets}/js/bootstrap.min.js (100%) rename {docs/assets => assets}/js/holder/holder.js (100%) rename {docs/assets => assets}/js/html5shiv.js (100%) rename {docs/assets => assets}/js/jquery.js (100%) rename {docs/assets => assets}/js/respond/respond.min.js (100%) rename docs/components.html => components.html (100%) rename docs/css.html => css.html (100%) rename docs/customize.html => customize.html (100%) rename docs/getting-started.html => getting-started.html (100%) rename docs/index.html => index.html (100%) rename docs/javascript.html => javascript.html (100%) diff --git a/_config.yml b/_config.yml index ddef7b2b9..0ab7ee81e 100644 --- a/_config.yml +++ b/_config.yml @@ -6,6 +6,6 @@ pygments: true permalink: pretty # Server -source: ./docs destination: ./_gh_pages +exclude: [".editorconfig", ".gitignore", ".ruby-version", "bower.json", "composer.json", "CONTRIBUTING.md", "LICENSE", "Makefile", "package.json", "node_modules", "README.md"] port: 9001 diff --git a/docs/_includes/ads.html b/_includes/ads.html similarity index 100% rename from docs/_includes/ads.html rename to _includes/ads.html diff --git a/docs/_includes/footer.html b/_includes/footer.html similarity index 100% rename from docs/_includes/footer.html rename to _includes/footer.html diff --git a/docs/_includes/header.html b/_includes/header.html similarity index 100% rename from docs/_includes/header.html rename to _includes/header.html diff --git a/docs/_includes/nav-components.html b/_includes/nav-components.html similarity index 100% rename from docs/_includes/nav-components.html rename to _includes/nav-components.html diff --git a/docs/_includes/nav-css.html b/_includes/nav-css.html similarity index 100% rename from docs/_includes/nav-css.html rename to _includes/nav-css.html diff --git a/docs/_includes/nav-customize.html b/_includes/nav-customize.html similarity index 100% rename from docs/_includes/nav-customize.html rename to _includes/nav-customize.html diff --git a/docs/_includes/nav-getting-started.html b/_includes/nav-getting-started.html similarity index 100% rename from docs/_includes/nav-getting-started.html rename to _includes/nav-getting-started.html diff --git a/docs/_includes/nav-javascript.html b/_includes/nav-javascript.html similarity index 100% rename from docs/_includes/nav-javascript.html rename to _includes/nav-javascript.html diff --git a/docs/_includes/nav-main.html b/_includes/nav-main.html similarity index 100% rename from docs/_includes/nav-main.html rename to _includes/nav-main.html diff --git a/docs/_includes/social-buttons.html b/_includes/social-buttons.html similarity index 100% rename from docs/_includes/social-buttons.html rename to _includes/social-buttons.html diff --git a/docs/_layouts/default.html b/_layouts/default.html similarity index 100% rename from docs/_layouts/default.html rename to _layouts/default.html diff --git a/docs/_layouts/home.html b/_layouts/home.html similarity index 100% rename from docs/_layouts/home.html rename to _layouts/home.html diff --git a/docs/assets/css/bootstrap.css b/assets/css/bootstrap.css similarity index 100% rename from docs/assets/css/bootstrap.css rename to assets/css/bootstrap.css diff --git a/docs/assets/css/docs.css b/assets/css/docs.css similarity index 100% rename from docs/assets/css/docs.css rename to assets/css/docs.css diff --git a/docs/assets/css/pygments-manni.css b/assets/css/pygments-manni.css similarity index 100% rename from docs/assets/css/pygments-manni.css rename to assets/css/pygments-manni.css diff --git a/docs/assets/ico/apple-touch-icon-114-precomposed.png b/assets/ico/apple-touch-icon-114-precomposed.png similarity index 100% rename from docs/assets/ico/apple-touch-icon-114-precomposed.png rename to assets/ico/apple-touch-icon-114-precomposed.png diff --git a/docs/assets/ico/apple-touch-icon-144-precomposed.png b/assets/ico/apple-touch-icon-144-precomposed.png similarity index 100% rename from docs/assets/ico/apple-touch-icon-144-precomposed.png rename to assets/ico/apple-touch-icon-144-precomposed.png diff --git a/docs/assets/ico/apple-touch-icon-57-precomposed.png b/assets/ico/apple-touch-icon-57-precomposed.png similarity index 100% rename from docs/assets/ico/apple-touch-icon-57-precomposed.png rename to assets/ico/apple-touch-icon-57-precomposed.png diff --git a/docs/assets/ico/apple-touch-icon-72-precomposed.png b/assets/ico/apple-touch-icon-72-precomposed.png similarity index 100% rename from docs/assets/ico/apple-touch-icon-72-precomposed.png rename to assets/ico/apple-touch-icon-72-precomposed.png diff --git a/docs/assets/ico/favicon.png b/assets/ico/favicon.png similarity index 100% rename from docs/assets/ico/favicon.png rename to assets/ico/favicon.png diff --git a/docs/assets/js/application.js b/assets/js/application.js similarity index 100% rename from docs/assets/js/application.js rename to assets/js/application.js diff --git a/docs/assets/js/bootstrap.js b/assets/js/bootstrap.js similarity index 100% rename from docs/assets/js/bootstrap.js rename to assets/js/bootstrap.js diff --git a/docs/assets/js/bootstrap.min.js b/assets/js/bootstrap.min.js similarity index 100% rename from docs/assets/js/bootstrap.min.js rename to assets/js/bootstrap.min.js diff --git a/docs/assets/js/holder/holder.js b/assets/js/holder/holder.js similarity index 100% rename from docs/assets/js/holder/holder.js rename to assets/js/holder/holder.js diff --git a/docs/assets/js/html5shiv.js b/assets/js/html5shiv.js similarity index 100% rename from docs/assets/js/html5shiv.js rename to assets/js/html5shiv.js diff --git a/docs/assets/js/jquery.js b/assets/js/jquery.js similarity index 100% rename from docs/assets/js/jquery.js rename to assets/js/jquery.js diff --git a/docs/assets/js/respond/respond.min.js b/assets/js/respond/respond.min.js similarity index 100% rename from docs/assets/js/respond/respond.min.js rename to assets/js/respond/respond.min.js diff --git a/docs/components.html b/components.html similarity index 100% rename from docs/components.html rename to components.html diff --git a/docs/css.html b/css.html similarity index 100% rename from docs/css.html rename to css.html diff --git a/docs/customize.html b/customize.html similarity index 100% rename from docs/customize.html rename to customize.html diff --git a/docs/getting-started.html b/getting-started.html similarity index 100% rename from docs/getting-started.html rename to getting-started.html diff --git a/docs/index.html b/index.html similarity index 100% rename from docs/index.html rename to index.html diff --git a/docs/javascript.html b/javascript.html similarity index 100% rename from docs/javascript.html rename to javascript.html From 7bb8817947dd6e453dc01a5131bc964a5d74e051 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 18 Jul 2013 18:14:49 -0700 Subject: [PATCH 8/8] finish flattening repo structure; add dist folder of compiled css/js --- .gitignore | 1 - Makefile | 16 ++++++++-------- _includes/footer.html | 4 ++-- _includes/header.html | 4 ++-- assets/js/{holder => }/holder.js | 0 assets/js/{respond => }/respond.min.js | 0 {assets => dist}/css/bootstrap.css | 0 {assets => dist}/js/bootstrap.js | 0 {assets => dist}/js/bootstrap.min.js | 2 +- 9 files changed, 13 insertions(+), 14 deletions(-) rename assets/js/{holder => }/holder.js (100%) rename assets/js/{respond => }/respond.min.js (100%) rename {assets => dist}/css/bootstrap.css (100%) rename {assets => dist}/js/bootstrap.js (100%) rename {assets => dist}/js/bootstrap.min.js (99%) diff --git a/.gitignore b/.gitignore index 218ceb9f3..0d74d48fe 100644 --- a/.gitignore +++ b/.gitignore @@ -39,4 +39,3 @@ nbproject .CVS .idea node_modules -dist diff --git a/Makefile b/Makefile index 257754b50..7ae206537 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -BOOTSTRAP ?= ./docs/assets/css/bootstrap.css +BOOTSTRAP ?= ./dist/css/bootstrap.css BOOTSTRAP_LESS ?= ./less/bootstrap.less DATE=$(shell date +%I:%M%p) CHECK=\033[32m✔ Done\033[39m @@ -22,14 +22,14 @@ build: @recess --compile ${BOOTSTRAP_LESS} > ${BOOTSTRAP} @echo " ${CHECK}" @printf "Prepping documentation assets..." - @cp js/tests/vendor/jquery.js docs/assets/js/ + @cp js/tests/vendor/jquery.js assets/js/ @echo " ${CHECK}" @printf "Compiling and minifying JavaScript..." - @cat js/transition.js js/alert.js js/button.js js/carousel.js js/collapse.js js/dropdown.js js/modal.js js/tooltip.js js/popover.js js/scrollspy.js js/tab.js js/affix.js > docs/assets/js/bootstrap.js - @uglifyjs -nc docs/assets/js/bootstrap.js > docs/assets/js/bootstrap.min.tmp.js - @echo "/**\n* Bootstrap.js v3.0.0 by @fat & @mdo\n* Copyright 2012 Twitter, Inc.\n* http://www.apache.org/licenses/LICENSE-2.0.txt\n*/" > docs/assets/js/copyright.js - @cat docs/assets/js/copyright.js docs/assets/js/bootstrap.min.tmp.js > docs/assets/js/bootstrap.min.js - @rm docs/assets/js/copyright.js docs/assets/js/bootstrap.min.tmp.js + @cat js/transition.js js/alert.js js/button.js js/carousel.js js/collapse.js js/dropdown.js js/modal.js js/tooltip.js js/popover.js js/scrollspy.js js/tab.js js/affix.js > dist/js/bootstrap.js + @uglifyjs -nc dist/js/bootstrap.js > dist/js/bootstrap.min.tmp.js + @echo "/**\n* Bootstrap.js v3.0.0 by @fat & @mdo\n* Copyright 2013 Twitter, Inc.\n* http://www.apache.org/licenses/LICENSE-2.0.txt\n*/" > dist/js/copyright.js + @cat dist/js/copyright.js dist/js/bootstrap.min.tmp.js > dist/js/bootstrap.min.js + @rm dist/js/copyright.js dist/js/bootstrap.min.tmp.js @echo " ${CHECK}" @echo "${HR}" @echo "\033[36mSuccess!\n\033[39m" @@ -72,7 +72,7 @@ bootstrap/js/*.js: js/*.js mkdir -p bootstrap/js cat js/transition.js js/alert.js js/button.js js/carousel.js js/collapse.js js/dropdown.js js/modal.js js/tooltip.js js/popover.js js/scrollspy.js js/tab.js js/affix.js > bootstrap/js/bootstrap.js uglifyjs -nc bootstrap/js/bootstrap.js > bootstrap/js/bootstrap.min.tmp.js - echo "/*!\n* Bootstrap.js by @fat & @mdo\n* Copyright 2012 Twitter, Inc.\n* http://www.apache.org/licenses/LICENSE-2.0.txt\n*/" > bootstrap/js/copyright.js + echo "/*!\n* Bootstrap.js by @fat & @mdo\n* Copyright 2013 Twitter, Inc.\n* http://www.apache.org/licenses/LICENSE-2.0.txt\n*/" > bootstrap/js/copyright.js cat bootstrap/js/copyright.js bootstrap/js/bootstrap.min.tmp.js > bootstrap/js/bootstrap.min.js rm bootstrap/js/copyright.js bootstrap/js/bootstrap.min.tmp.js diff --git a/_includes/footer.html b/_includes/footer.html index fcfc7c482..7c3bb5639 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -2,10 +2,10 @@ ================================================== --> - + - + diff --git a/_includes/header.html b/_includes/header.html index af2104ebb..35c2df084 100644 --- a/_includes/header.html +++ b/_includes/header.html @@ -12,7 +12,7 @@ - + {% if page.layout != "example" %} @@ -23,7 +23,7 @@ diff --git a/assets/js/holder/holder.js b/assets/js/holder.js similarity index 100% rename from assets/js/holder/holder.js rename to assets/js/holder.js diff --git a/assets/js/respond/respond.min.js b/assets/js/respond.min.js similarity index 100% rename from assets/js/respond/respond.min.js rename to assets/js/respond.min.js diff --git a/assets/css/bootstrap.css b/dist/css/bootstrap.css similarity index 100% rename from assets/css/bootstrap.css rename to dist/css/bootstrap.css diff --git a/assets/js/bootstrap.js b/dist/js/bootstrap.js similarity index 100% rename from assets/js/bootstrap.js rename to dist/js/bootstrap.js diff --git a/assets/js/bootstrap.min.js b/dist/js/bootstrap.min.js similarity index 99% rename from assets/js/bootstrap.min.js rename to dist/js/bootstrap.min.js index efca8ac0d..a97da7572 100644 --- a/assets/js/bootstrap.min.js +++ b/dist/js/bootstrap.min.js @@ -1,6 +1,6 @@ /** * Bootstrap.js v3.0.0 by @fat & @mdo -* Copyright 2012 Twitter, Inc. +* Copyright 2013 Twitter, Inc. * http://www.apache.org/licenses/LICENSE-2.0.txt */ +function(e){"use strict";function t(){var e=document.createElement("bootstrap"),t={WebkitTransition:"webkitTransitionEnd",MozTransition:"transitionend",OTransition:"oTransitionEnd otransitionend",transition:"transitionend"};for(var n in t)if(e.style[n]!==undefined)return{end:t[n]}}e(function(){e.support.transition=t()})}(window.jQuery),+function(e){"use strict";var t='[data-dismiss="alert"]',n=function(n){e(n).on("click",t,this.close)};n.prototype.close=function(t){function s(){i.trigger("closed.bs.alert").remove()}var n=e(this),r=n.attr("data-target");r||(r=n.attr("href"),r=r&&r.replace(/.*(?=#[^\s]*$)/,""));var i=e(r);t&&t.preventDefault(),i.length||(i=n.hasClass("alert")?n:n.parent()),i.trigger(t=e.Event("close.bs.alert"));if(t.isDefaultPrevented())return;i.removeClass("in"),e.support.transition&&i.hasClass("fade")?i.on(e.support.transition.end,s):s()};var r=e.fn.alert;e.fn.alert=function(t){return this.each(function(){var r=e(this),i=r.data("bs.alert");i||r.data("bs.alert",i=new n(this)),typeof t=="string"&&i[t].call(r)})},e.fn.alert.Constructor=n,e.fn.alert.noConflict=function(){return e.fn.alert=r,this},e(document).on("click.bs.alert.data-api",t,n.prototype.close)}(window.jQuery),+function(e){"use strict";var t=function(n,r){this.$element=e(n),this.options=e.extend({},t.DEFAULTS,r)};t.DEFAULTS={loadingText:"loading..."},t.prototype.setState=function(e){var t="disabled",n=this.$element,r=n.is("input")?"val":"html",i=n.data();e+="Text",i.resetText||n.data("resetText",n[r]()),n[r](i[e]||this.options[e]),setTimeout(function(){e=="loadingText"?n.addClass(t).attr(t,t):n.removeClass(t).removeAttr(t)},0)},t.prototype.toggle=function(){var e=this.$element.closest('[data-toggle="buttons"]');if(e.length){var t=this.$element.find("input").prop("checked",!this.$element.hasClass("active"));t.prop("type")==="radio"&&e.find(".active").removeClass("active")}this.$element.toggleClass("active")};var n=e.fn.button;e.fn.button=function(n){return this.each(function(){var r=e(this),i=r.data("button"),s=typeof n=="object"&&n;i||r.data("bs.button",i=new t(this,s)),n=="toggle"?i.toggle():n&&i.setState(n)})},e.fn.button.Constructor=t,e.fn.button.noConflict=function(){return e.fn.button=n,this},e(document).on("click.bs.button.data-api","[data-toggle^=button]",function(t){var n=e(t.target);n.hasClass("btn")||(n=n.closest(".btn")),n.button("toggle"),t.preventDefault()})}(window.jQuery),+function(e){"use strict";var t=function(t,n){this.$element=e(t),this.$indicators=this.$element.find(".carousel-indicators"),this.options=n,this.paused=this.sliding=this.interval=this.$active=this.$items=null,this.options.pause=="hover"&&this.$element.on("mouseenter",e.proxy(this.pause,this)).on("mouseleave",e.proxy(this.cycle,this))};t.DEFAULTS={interval:5e3,pause:"hover"},t.prototype.cycle=function(t){return t||(this.paused=!1),this.interval&&clearInterval(this.interval),this.options.interval&&!this.paused&&(this.interval=setInterval(e.proxy(this.next,this),this.options.interval)),this},t.prototype.getActiveIndex=function(){return this.$active=this.$element.find(".item.active"),this.$items=this.$active.parent().children(),this.$items.index(this.$active)},t.prototype.to=function(t){var n=this,r=this.getActiveIndex();if(t>this.$items.length-1||t<0)return;return this.sliding?this.$element.one("slid",function(){n.to(t)}):r==t?this.pause().cycle():this.slide(t>r?"next":"prev",e(this.$items[t]))},t.prototype.pause=function(t){return t||(this.paused=!0),this.$element.find(".next, .prev").length&&e.support.transition.end&&(this.$element.trigger(e.support.transition.end),this.cycle(!0)),this.interval=clearInterval(this.interval),this},t.prototype.next=function(){if(this.sliding)return;return this.slide("next")},t.prototype.prev=function(){if(this.sliding)return;return this.slide("prev")},t.prototype.slide=function(t,n){var r=this.$element.find(".item.active"),i=n||r[t](),s=this.interval,o=t=="next"?"left":"right",u=t=="next"?"first":"last",a=this;this.sliding=!0,s&&this.pause(),i=i.length?i:this.$element.find(".item")[u]();var f=e.Event("slide.bs.carousel",{relatedTarget:i[0],direction:o});if(i.hasClass("active"))return;this.$indicators.length&&(this.$indicators.find(".active").removeClass("active"),this.$element.one("slid",function(){var t=e(a.$indicators.children()[a.getActiveIndex()]);t&&t.addClass("active")}));if(e.support.transition&&this.$element.hasClass("slide")){this.$element.trigger(f);if(f.isDefaultPrevented())return;i.addClass(t),i[0].offsetWidth,r.addClass(o),i.addClass(o),this.$element.find(".item").one(e.support.transition.end,function(){i.removeClass([t,o].join(" ")).addClass("active"),r.removeClass(["active",o].join(" ")),a.sliding=!1,setTimeout(function(){a.$element.trigger("slid")},0)})}else{this.$element.trigger(f);if(f.isDefaultPrevented())return;r.removeClass("active"),i.addClass("active"),this.sliding=!1,this.$element.trigger("slid")}return s&&this.cycle(),this};var n=e.fn.carousel;e.fn.carousel=function(n){return this.each(function(){var r=e(this),i=r.data("bs.carousel"),s=e.extend({},t.DEFAULTS,typeof n=="object"&&n),o=typeof n=="string"?n:s.slide;i||r.data("bs.carousel",i=new t(this,s)),typeof n=="number"?i.to(n):o?i[o]():s.interval&&i.pause().cycle()})},e.fn.carousel.Constructor=t,e.fn.carousel.noConflict=function(){return e.fn.carousel=n,this},e(document).on("click.bs.carousel.data-api","[data-slide], [data-slide-to]",function(t){var n=e(this),r,i=e(n.attr("data-target")||(r=n.attr("href"))&&r.replace(/.*(?=#[^\s]+$)/,"")),s=e.extend({},i.data(),n.data()),o=n.attr("data-slide-to");o&&(s.interval=!1),i.carousel(s),(o=n.attr("data-slide-to"))&&i.data("bs.carousel").to(o),t.preventDefault()}),e(window).on("load",function(){e('[data-ride="carousel"]').each(function(){var t=e(this);t.carousel(t.data())})})}(window.jQuery),+function(e){"use strict";var t=function(n,r){this.$element=e(n),this.options=e.extend({},t.DEFAULTS,r),this.transitioning=null,this.options.parent&&(this.$parent=e(this.options.parent)),this.options.toggle&&this.toggle()};t.DEFAULTS={toggle:!0},t.prototype.dimension=function(){var e=this.$element.hasClass("width");return e?"width":"height"},t.prototype.show=function(){if(this.transitioning||this.$element.hasClass("in"))return;var t=e.Event("show.bs.collapse");this.$element.trigger(t);if(t.isDefaultPrevented())return;var n=this.dimension(),r=e.camelCase(["scroll",n].join("-")),i=this.$parent&&this.$parent.find("> .accordion-group > .in");if(i&&i.length){var s=i.data("bs.collapse");if(s&&s.transitioning)return;i.collapse("hide"),s||i.data("bs.collapse",null)}this.$element[n](0),this.transition("addClass","shown.bs.collapse"),e.support.transition&&this.$element[n](this.$element[0][r])},t.prototype.hide=function(){if(this.transitioning||!this.$element.hasClass("in"))return;var t=e.Event("hide.bs.collapse");this.$element.trigger(t);if(t.isDefaultPrevented())return;var n=this.dimension();this.reset(this.$element[n]()),this.transition("removeClass","shown.bs.hidden"),this.$element[n](0)},t.prototype.reset=function(e){var t=this.dimension();return this.$element.removeClass("collapse")[t](e||"auto")[0].offsetWidth,this.$element[e!=null?"addClass":"removeClass"]("collapse"),this},t.prototype.transition=function(t,n){var r=this,i=function(){n=="shown.bs.collapse"&&r.reset(),r.transitioning=0,r.$element.trigger(n)};this.transitioning=1,this.$element[t]("in"),e.support.transition&&this.$element.hasClass("collapse")?this.$element.one(e.support.transition.end,i):i()},t.prototype.toggle=function(){this[this.$element.hasClass("in")?"hide":"show"]()};var n=e.fn.collapse;e.fn.collapse=function(n){return this.each(function(){var r=e(this),i=r.data("bs.collapse"),s=e.extend({},t.DEFAULTS,r.data(),typeof n=="object"&&n);i||r.data("bs.collapse",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.collapse.Constructor=t,e.fn.collapse.noConflict=function(){return e.fn.collapse=n,this},e(document).on("click.bs.collapse.data-api","[data-toggle=collapse]",function(t){var n=e(this),r,i=n.attr("data-target")||t.preventDefault()||(r=n.attr("href"))&&r.replace(/.*(?=#[^\s]+$)/,""),s=e(i),o=s.data("bs.collapse"),u=o?"toggle":n.data(),a=n.attr("data-parent"),f=a&&e(a);if(!o||!o.transitioning)f&&f.find("[data-toggle=collapse][data-parent="+a+"]").not(n).addClass("collapsed"),n[s.hasClass("in")?"addClass":"removeClass"]("collapsed");s.collapse(u)})}(window.jQuery),+function(e){"use strict";function i(){e(t).remove(),e(n).each(function(t){var n=s(e(this));if(!n.hasClass("open"))return;n.trigger(t=e.Event("hide.bs.dropdown"));if(t.isDefaultPrevented())return;n.removeClass("open").trigger("hidden.bs.dropdown")})}function s(t){var n=t.attr("data-target");n||(n=t.attr("href"),n=n&&/#/.test(n)&&n.replace(/.*(?=#[^\s]*$)/,""));var r=n&&e(n);return r&&r.length?r:t.parent()}var t=".dropdown-backdrop",n="[data-toggle=dropdown]",r=function(t){var n=e(t).on("click.bs.dropdown",this.toggle)};r.prototype.toggle=function(t){var n=e(this);if(n.is(".disabled, :disabled"))return;var r=s(n),o=r.hasClass("open");i();if(!o){"ontouchstart"in document.documentElement&&e('
    ').insertBefore(e(this)).on("click",i),r.trigger(t=e.Event("show.bs.dropdown"));if(t.isDefaultPrevented())return;r.toggleClass("open").trigger("shown.bs.dropdown")}return n.focus(),!1},r.prototype.keydown=function(t){if(!/(38|40|27)/.test(t.keyCode))return;var r=e(this);t.preventDefault(),t.stopPropagation();if(r.is(".disabled, :disabled"))return;var i=s(r),o=i.hasClass("open");if(!o||o&&t.keyCode==27)return t.which==27&&i.find(n).focus(),r.click();var u=e("[role=menu] li:not(.divider):visible a",i);if(!u.length)return;var a=u.index(u.filter(":focus"));t.keyCode==38&&a>0&&a--,t.keyCode==40&&a').appendTo(document.body),this.$element.on("click",e.proxy(function(e){if(e.target!==e.currentTarget)return;this.options.backdrop=="static"?this.$element[0].focus.call(this.$element[0]):this.hide.call(this)},this)),i&&this.$backdrop[0].offsetWidth,this.$backdrop.addClass("in");if(!t)return;i?this.$backdrop.one(e.support.transition.end,t):t()}else!this.isShown&&this.$backdrop?(this.$backdrop.removeClass("in"),e.support.transition&&this.$element.hasClass("fade")?this.$backdrop.one(e.support.transition.end,t):t()):t&&t()};var n=e.fn.modal;e.fn.modal=function(n){return this.each(function(){var r=e(this),i=r.data("bs.modal"),s=e.extend({},t.DEFAULTS,r.data(),typeof n=="object"&&n);i||r.data("bs.modal",i=new t(this,s)),typeof n=="string"?i[n]():s.show&&i.show()})},e.fn.modal.Constructor=t,e.fn.modal.noConflict=function(){return e.fn.modal=n,this},e(document).on("click.bs.modal.data-api",'[data-toggle="modal"]',function(t){var n=e(this),r=n.attr("href"),i=e(n.attr("data-target")||r&&r.replace(/.*(?=#[^\s]+$)/,"")),s=i.data("modal")?"toggle":e.extend({remote:!/#/.test(r)&&r},i.data(),n.data());t.preventDefault(),i.modal(s).one("hide",function(){n.is(":visible")&&n.focus()})});var r=e(document.body).on("bs.modal.shown",".modal",function(){r.addClass("modal-open")}).on("bs.modal.hidden",".modal",function(){r.removeClass("modal-open")})}(window.jQuery),+function(e){"use strict";var t=function(e,t){this.type=this.options=this.enabled=this.timeout=this.hoverState=this.$element=null,this.init("tooltip",e,t)};t.DEFAULTS={animation:!0,placement:"top",selector:!1,template:'
    ',trigger:"hover focus",title:"",delay:0,html:!1,container:!1},t.prototype.init=function(t,n,r){this.enabled=!0,this.type=t,this.$element=e(n),this.options=this.getOptions(r);var i=this.options.trigger.split(" ");for(var s=i.length;s--;){var o=i[s];if(o=="click")this.$element.on("click."+this.type,this.options.selector,e.proxy(this.toggle,this));else if(o!="manual"){var u=o=="hover"?"mouseenter":"focus",a=o=="hover"?"mouseleave":"blur";this.$element.on(u+"."+this.type,this.options.selector,e.proxy(this.enter,this)),this.$element.on(a+"."+this.type,this.options.selector,e.proxy(this.leave,this))}}this.options.selector?this._options=e.extend({},this.options,{trigger:"manual",selector:""}):this.fixTitle()},t.prototype.getDefaults=function(){return t.DEFAULTS},t.prototype.getOptions=function(t){return t=e.extend({},this.getDefaults(),this.$element.data(),t),t.delay&&typeof t.delay=="number"&&(t.delay={show:t.delay,hide:t.delay}),t},t.prototype.enter=function(t){var n=this.getDefaults(),r={};this._options&&e.each(this._options,function(e,t){n[e]!=t&&(r[e]=t)});var i=t instanceof this.constructor?t:e(t.currentTarget)[this.type](r).data("bs."+this.type);if(!i.options.delay||!i.options.delay.show)return i.show();clearTimeout(this.timeout),i.hoverState="in",this.timeout=setTimeout(function(){i.hoverState=="in"&&i.show()},i.options.delay.show)},t.prototype.leave=function(t){var n=t instanceof this.constructor?t:e(t.currentTarget)[this.type](this._options).data("bs."+this.type);clearTimeout(this.timeout);if(!n.options.delay||!n.options.delay.hide)return n.hide();n.hoverState="out",this.timeout=setTimeout(function(){n.hoverState=="out"&&n.hide()},n.options.delay.hide)},t.prototype.show=function(){var t=e.Event("show.bs."+this.type);if(this.hasContent()&&this.enabled){this.$element.trigger(t);if(t.isDefaultPrevented())return;var n=this.tip();this.setContent(),this.options.animation&&n.addClass("fade");var r=typeof this.options.placement=="function"?this.options.placement.call(this,n[0],this.$element[0]):this.options.placement;n.detach().css({top:0,left:0,display:"block"}).addClass(r),this.options.container?n.appendTo(this.options.container):n.insertAfter(this.$element);var i,s=this.getPosition(),o=n[0].offsetWidth,u=n[0].offsetHeight;switch(r){case"bottom":i={top:s.top+s.height,left:s.left+s.width/2-o/2};break;case"top":i={top:s.top-u,left:s.left+s.width/2-o/2};break;case"left":i={top:s.top+s.height/2-u/2,left:s.left-o};break;case"right":i={top:s.top+s.height/2-u/2,left:s.left+s.width}}this.applyPlacement(i,r),this.$element.trigger("shown.bs."+this.type)}},t.prototype.applyPlacement=function(e,t){var n,r=this.tip(),i=r[0].offsetWidth,s=r[0].offsetHeight;r.offset(e).addClass("in");var o=r[0].offsetWidth,u=r[0].offsetHeight;t=="top"&&u!=s&&(n=!0,e.top=e.top+s-u);if(t=="bottom"||t=="top"){var a=0;e.left<0&&(a=e.left*-2,e.left=0,r.offset(e),o=r[0].offsetWidth,u=r[0].offsetHeight),this.replaceArrow(a-i+o,o,"left")}else this.replaceArrow(u-s,u,"top");n&&r.offset(e)},t.prototype.replaceArrow=function(e,t,n){this.arrow().css(n,e?50*(1-e/t)+"%":"")},t.prototype.setContent=function(){var e=this.tip(),t=this.getTitle();e.find(".tooltip-inner")[this.options.html?"html":"text"](t),e.removeClass("fade in top bottom left right")},t.prototype.hide=function(){function i(){var t=setTimeout(function(){n.off(e.support.transition.end).detach()},500);n.one(e.support.transition.end,function(){clearTimeout(t),n.detach()})}var t=this,n=this.tip(),r=e.Event("hide.bs."+this.type);this.$element.trigger(r);if(r.isDefaultPrevented())return;return n.removeClass("in"),e.support.transition&&this.$tip.hasClass("fade")?i():n.detach(),this.$element.trigger("hidden.bs."+this.type),this},t.prototype.fixTitle=function(){var e=this.$element;(e.attr("title")||typeof e.attr("data-original-title")!="string")&&e.attr("data-original-title",e.attr("title")||"").attr("title","")},t.prototype.hasContent=function(){return this.getTitle()},t.prototype.getPosition=function(){var t=this.$element[0];return e.extend({},typeof t.getBoundingClientRect=="function"?t.getBoundingClientRect():{width:t.offsetWidth,height:t.offsetHeight},this.$element.offset())},t.prototype.getTitle=function(){var e,t=this.$element,n=this.options;return e=t.attr("data-original-title")||(typeof n.title=="function"?n.title.call(t[0]):n.title),e},t.prototype.tip=function(){return this.$tip=this.$tip||e(this.options.template)},t.prototype.arrow=function(){return this.$arrow=this.$arrow||this.tip().find(".tooltip-arrow")},t.prototype.validate=function(){this.$element[0].parentNode||(this.hide(),this.$element=null,this.options=null)},t.prototype.enable=function(){this.enabled=!0},t.prototype.disable=function(){this.enabled=!1},t.prototype.toggleEnabled=function(){this.enabled=!this.enabled},t.prototype.toggle=function(t){var n=t?e(t.currentTarget)[this.type](this._options).data("bs."+this.type):this;n.tip().hasClass("in")?n.leave(n):n.enter(n)},t.prototype.destroy=function(){this.hide().$element.off("."+this.type).removeData("bs."+this.type)};var n=e.fn.tooltip;e.fn.tooltip=function(n){return this.each(function(){var r=e(this),i=r.data("bs.tooltip"),s=typeof n=="object"&&n;i||r.data("bs.tooltip",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.tooltip.Constructor=t,e.fn.tooltip.noConflict=function(){return e.fn.tooltip=n,this}}(window.jQuery),+function(e){"use strict";var t=function(e,t){this.init("popover",e,t)};t.DEFAULTS=e.extend({},e.fn.tooltip.Constructor.DEFAULTS,{placement:"right",trigger:"click",content:"",template:'

    '}),t.prototype=e.extend({},e.fn.tooltip.Constructor.prototype),t.prototype.constructor=t,t.prototype.getDefaults=function(){return t.DEFAULTS},t.prototype.setContent=function(){var e=this.tip(),t=this.getTitle(),n=this.getContent();e.find(".popover-title")[this.options.html?"html":"text"](t),e.find(".popover-content")[this.options.html?"html":"text"](n),e.removeClass("fade top bottom left right in"),e.find(".popover-title:empty").hide()},t.prototype.hasContent=function(){return this.getTitle()||this.getContent()},t.prototype.getContent=function(){var e=this.$element,t=this.options;return e.attr("data-content")||(typeof t.content=="function"?t.content.call(e[0]):t.content)},t.prototype.tip=function(){return this.$tip||(this.$tip=e(this.options.template)),this.$tip},t.prototype.destroy=function(){this.hide().$element.off("."+this.type).removeData(this.type)};var n=e.fn.popover;e.fn.popover=function(n){return this.each(function(){var r=e(this),i=r.data("bs.popover"),s=typeof n=="object"&&n;i||r.data("bs.popover",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.popover.Constructor=t,e.fn.popover.noConflict=function(){return e.fn.popover=n,this}}(window.jQuery),+function(e){"use strict";function t(n,r){var i,s=e.proxy(this.process,this),o=e(n).is("body")?e(window):e(n);this.$body=e("body"),this.$scrollElement=o.on("scroll.bs.scroll-spy.data-api",s),this.options=e.extend({},t.DEFAULTS,r),this.selector=(this.options.target||(i=e(n).attr("href"))&&i.replace(/.*(?=#[^\s]+$)/,"")||"")+" .nav li > a",this.offsets=e([]),this.targets=e([]),this.activeTarget=null,this.refresh(),this.process()}t.DEFAULTS={offset:10},t.prototype.refresh=function(){this.offsets=e([]),this.targets=e([]);var t=this,n=this.$body.find(this.selector).map(function(){var n=e(this),r=n.data("target")||n.attr("href"),i=/^#\w/.test(r)&&e(r);return i&&i.length&&[[i.position().top+(!e.isWindow(t.$scrollElement.get(0))&&t.$scrollElement.scrollTop()),r]]||null}).sort(function(e,t){return e[0]-t[0]}).each(function(){t.offsets.push(this[0]),t.targets.push(this[1])})},t.prototype.process=function(){var e=this.$scrollElement.scrollTop()+this.options.offset,t=this.$scrollElement[0].scrollHeight||this.$body[0].scrollHeight,n=t-this.$scrollElement.height(),r=this.offsets,i=this.targets,s=this.activeTarget,o;if(e>=n)return s!=(o=i.last()[0])&&this.activate(o);for(o=r.length;o--;)s!=i[o]&&e>=r[o]&&(!r[o+1]||e<=r[o+1])&&this.activate(i[o])},t.prototype.activate=function(t){this.activeTarget=t,e(this.selector).parents(".active").removeClass("active");var n=this.selector+'[data-target="'+t+'"],'+this.selector+'[href="'+t+'"]',r=e(n).parents("li").addClass("active");r.parent(".dropdown-menu").length&&(r=r.closest("li.dropdown").addClass("active")),r.trigger("activate")};var n=e.fn.scrollspy;e.fn.scrollspy=function(n){return this.each(function(){var r=e(this),i=r.data("bs.scrollspy"),s=typeof n=="object"&&n;i||r.data("bs.scrollspy",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.scrollspy.Constructor=t,e.fn.scrollspy.noConflict=function(){return e.fn.scrollspy=n,this},e(window).on("load",function(){e('[data-spy="scroll"]').each(function(){var t=e(this);t.scrollspy(t.data())})})}(window.jQuery),+function(e){"use strict";var t=function(t){this.element=e(t)};t.prototype.show=function(){var t=this.element,n=t.closest("ul:not(.dropdown-menu)"),r=t.attr("data-target");r||(r=t.attr("href"),r=r&&r.replace(/.*(?=#[^\s]*$)/,""));if(t.parent("li").hasClass("active"))return;var i=n.find(".active:last a")[0],s=e.Event("show.bs.tab",{relatedTarget:i});t.trigger(s);if(s.isDefaultPrevented())return;var o=e(r);this.activate(t.parent("li"),n),this.activate(o,o.parent(),function(){t.trigger({type:"shown.bs.tab",relatedTarget:i})})},t.prototype.activate=function(t,n,r){function o(){i.removeClass("active").find("> .dropdown-menu > .active").removeClass("active"),t.addClass("active"),s?(t[0].offsetWidth,t.addClass("in")):t.removeClass("fade"),t.parent(".dropdown-menu")&&t.closest("li.dropdown").addClass("active"),r&&r()}var i=n.find("> .active"),s=r&&e.support.transition&&i.hasClass("fade");s?i.one(e.support.transition.end,o):o(),i.removeClass("in")};var n=e.fn.tab;e.fn.tab=function(n){return this.each(function(){var r=e(this),i=r.data("bs.tab");i||r.data("bs.tab",i=new t(this)),typeof n=="string"&&i[n]()})},e.fn.tab.Constructor=t,e.fn.tab.noConflict=function(){return e.fn.tab=n,this},e(document).on("click.bs.tab.data-api",'[data-toggle="tab"], [data-toggle="pill"]',function(t){t.preventDefault(),e(this).tab("show")})}(window.jQuery),+function(e){"use strict";var t=function(n,r){this.options=e.extend({},t.DEFAULTS,r),this.$window=e(window).on("scroll.bs.affix.data-api",e.proxy(this.checkPosition,this)).on("click.bs.affix.data-api",e.proxy(this.checkPositionWithEventLoop,this)),this.$element=e(n),this.affixed=this.unpin=null,this.checkPosition()};t.DEFAULTS={offset:0},t.prototype.checkPositionWithEventLoop=function(){setTimeout(e.proxy(this.checkPosition,this),1)},t.prototype.checkPosition=function(){if(!this.$element.is(":visible"))return;var t=e(document).height(),n=this.$window.scrollTop(),r=this.$element.offset(),i=this.options.offset,s=i.top,o=i.bottom,u="affix affix-top affix-bottom";typeof i!="object"&&(o=s=i),typeof s=="function"&&(s=i.top()),typeof o=="function"&&(o=i.bottom());var a=this.unpin!=null&&n+this.unpin<=r.top?!1:o!=null&&r.top+this.$element.height()>=t-o?"bottom":s!=null&&n<=s?"top":!1;if(this.affixed===a)return;this.affixed=a,this.unpin=a=="bottom"?r.top-n:null,this.$element.removeClass(u).addClass("affix"+(a?"-"+a:""))};var n=e.fn.affix;e.fn.affix=function(n){return this.each(function(){var r=e(this),i=r.data("bs.affix"),s=typeof n=="object"&&n;i||r.data("bs.affix",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.affix.Constructor=t,e.fn.affix.noConflict=function(){return e.fn.affix=n,this},e(window).on("load",function(){e('[data-spy="affix"]').each(function(){var t=e(this),n=t.data();n.offset=n.offset||{},n.offsetBottom&&(n.offset.bottom=n.offsetBottom),n.offsetTop&&(n.offset.top=n.offsetTop),t.affix(n)})})}(window.jQuery); \ No newline at end of file