diff --git a/_config.yml b/_config.yml index 2b0af20540..6132562339 100644 --- a/_config.yml +++ b/_config.yml @@ -1,11 +1,28 @@ # Dependencies -markdown: rdiscount -pygments: true +markdown: rdiscount +pygments: true # Permalinks -permalink: pretty +permalink: pretty # Server -destination: ./_gh_pages -exclude: [".editorconfig", ".gitignore", ".ruby-version", "bower.json", "composer.json", "CONTRIBUTING.md", "LICENSE", "Makefile", "package.json", "node_modules", "README.md", "less"] -port: 9001 +destination: ./_gh_pages +exclude: [".editorconfig", ".gitignore", ".ruby-version", "bower.json", "composer.json", "CONTRIBUTING.md", "LICENSE", "Makefile", "package.json", "node_modules", "README.md", "less"] +port: 9001 + +# Custom vars +repo: https://github.com/twbs/bootstrap +download: https://github.com/twbs/bootstrap/archive/v3.0.0-rc1.zip +download_dist: https://github.com/twbs/bootstrap/archive/v3.0.0-rc1-dist.zip + +examples: http://examples.getbootstrap.com +examples_repo: https://github.com/twbs/bootstrap-examples + +glyphicons: http://glyphicons.getbootstrap.com +glyphicons_repo: https://github.com/twbs/bootstrap-glyphicons + +blog: http://blog.getbootstrap.com +expo: http://expo.getbootstrap.com + +cdn_css: //netdna.bootstrapcdn.com/bootstrap/3.0.0-rc1/css/bootstrap.min.css +cdn_js: //netdna.bootstrapcdn.com/bootstrap/3.0.0-rc1/js/bootstrap.min.js diff --git a/_layouts/customize.html b/_layouts/customize.html index a2affb0de4..5fd92549ee 100644 --- a/_layouts/customize.html +++ b/_layouts/customize.html @@ -26,7 +26,7 @@
-

Until RC2, the Bootstrap 3 customizer will be disabled. In the mean time, snag the compiled CSS and JavaScript. Hang tight!

+

Until RC2, the Bootstrap 3 customizer will be disabled. In the mean time, snag the compiled CSS and JavaScript. Hang tight!

@@ -38,11 +38,11 @@

Designed and built with all the love in the world by @mdo and @fat.

Code licensed under Apache License v2.0, documentation under CC BY 3.0.

diff --git a/_layouts/default.html b/_layouts/default.html index 2169c44aa9..fc6003260c 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -51,9 +51,7 @@ - - Back to top - + Back to top @@ -63,11 +61,11 @@

Designed and built with all the love in the world by @mdo and @fat.

Code licensed under Apache License v2.0, documentation under CC BY 3.0.

diff --git a/_layouts/home.html b/_layouts/home.html index 13da28f0bd..5885337668 100644 --- a/_layouts/home.html +++ b/_layouts/home.html @@ -21,16 +21,16 @@ diff --git a/assets/css/docs.css b/assets/css/docs.css index 91245973ca..e4bbc7c363 100644 --- a/assets/css/docs.css +++ b/assets/css/docs.css @@ -175,6 +175,10 @@ body { position: relative; } +.bs-docs-section + .bs-docs-section { + margin-top: 80px; +} + /* Ads in page headers */ .carbonad { width: auto !important; @@ -211,11 +215,6 @@ body { display: none; /* hide what I assume are tracking images */ } -/* Padding for in-page bookmarks */ -.bs-docs-section { - padding-top: 30px; -} - /* Docs sidebar @@ -230,23 +229,24 @@ body { .bs-sidenav { margin-top: 30px; margin-bottom: 30px; - padding-top: 5px; - padding-bottom: 5px; + padding-top: 10px; + padding-bottom: 10px; text-shadow: 0 1px 0 #fff; - background-color: #f5f5f5; + background-color: #f2f0f5; border-radius: 5px; } /* All levels of nav */ .bs-sidebar .nav > li > a { display: block; - color: #666; + color: #716b7a; padding: 5px 20px; } .bs-sidebar .nav > li > a:hover, .bs-sidebar .nav > li > a:focus { text-decoration: none; - border-right: 1px solid #d5d5d5; + background-color: #e5e3e9; + border-right: 1px solid #dbd8e0; } .bs-sidebar .nav > .active > a, .bs-sidebar .nav > .active:hover > a, diff --git a/assets/js/application.js b/assets/js/application.js index dfef03d350..8adb5dccba 100644 --- a/assets/js/application.js +++ b/assets/js/application.js @@ -67,11 +67,8 @@ }) // popover demo - $("a[data-toggle=popover]") + $("[data-toggle=popover]") .popover() - .click(function(e) { - e.preventDefault() - }) // button state demo $('#fat-btn') diff --git a/components.html b/components.html index d6e25cfc1c..b78390b2f6 100644 --- a/components.html +++ b/components.html @@ -8,9 +8,9 @@ lead: "Dozens of reusable components built to provide iconography, dropdowns, na -