Merge branch 'bs3_rc1' into 3.0.0-wip

.gitignore

@@ -39,4 +39,3 @@ nbproject
 .CVS
 .idea
 node_modules
-dist

Makefile

-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
 

_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

_includes/ads.html

+<div id="carbonads-container"><div class="carbonad"><div id="azcarbon"></div><script type="text/javascript">var z = document.createElement("script"); z.type = "text/javascript"; z.async = true; z.src = "http://engine.carbonads.com/z/32341/azcarbon_2_1_0_HORIZ"; var s = document.getElementsByTagName("script")[0]; s.parentNode.insertBefore(z, s);</script></div></div>
\ No newline at end of file

docs/_includes/footer.html → _includes/footer.html

@@ -2,10 +2,10 @@
 ================================================== -->
 <!-- Placed at the end of the document so the pages load faster -->
 <script src="/assets/js/jquery.js"></script>
-<script src="/assets/js/bootstrap.js"></script>
+<script src="/dist/js/bootstrap.js"></script>
 
 <script type="text/javascript" src="http://platform.twitter.com/widgets.js"></script>
-<script src="/assets/js/holder/holder.js"></script>
+<script src="/assets/js/holder.js"></script>
 
 <script src="/assets/js/application.js"></script>
 

docs/_includes/header.html → _includes/header.html

@@ -12,7 +12,7 @@
 </title>
 
 <!-- Bootstrap core CSS -->
-<link href="/assets/css/bootstrap.css" rel="stylesheet">
+<link href="/dist/css/bootstrap.css" rel="stylesheet">
 
 {% if page.layout != "example" %}
 <!-- Documentation extras -->
@@ -23,7 +23,7 @@
 <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
 <!--[if lt IE 9]>
   <script src="/assets/js/html5shiv.js"></script>
-  <script src="/assets/js/respond/respond.min.js"></script>
+  <script src="/assets/js/respond.min.js"></script>
 <![endif]-->
 
 <!-- Favicons -->

docs/_includes/nav-main.html → _includes/nav-main.html

@@ -24,6 +24,13 @@
           <a href="/customize">Customize</a>
         </li>
       </ul>
+      {% if page.layout == "default" %}
+      <ul class="nav navbar-nav pull-right">
+        <li>
+          <a href="http://getbootstrap.com/2.3.2/">Looking for Bootstrap 2.3.2?</a>
+        </li>
+      </ul>
+      {% endif %}
     </div>
   </div>
 </div>

docs/_layouts/default.html → _layouts/default.html

-<!DOCTYPE html>
+ <!DOCTYPE html>
 <html lang="en">
   <head>
     <!-- Meta, title, CSS, favicons, etc. -->
@@ -15,6 +15,7 @@
       <div class="container">
         <h1>{{ page.title }}</h1>
         <p>{{ page.lead }}</p>
+        {% include ads.html %}
       </div>
     </div>
 

docs/assets/css/docs.css → 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;
@@ -155,6 +151,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 +755,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 +797,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: 20px;
+    right: 0;
+    padding: 15px !important;
+    width: 330px !important;
+    min-height: 132px;
   }
 
 }