Merge remote-tracking branch 'upstream/2.0-wip' into add-vertical-nav-divider

1 files changed, 89 insertions, 1 deletions

diff --git a/bootstrap.css b/bootstrap.css
index 6c5e58b71..afd87d137 100644
--- a/bootstrap.css
+++ b/bootstrap.css
@@ -6,7 +6,7 @@
  * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Designed and built with all the love in the world @twitter by @mdo and @fat.
- * Date: Tue Nov 29 22:53:00 PST 2011
+ * Date: Wed Nov 30 22:05:44 PST 2011
  */
 html, body {
   margin: 0;
@@ -514,6 +514,9 @@ pre {
   white-space: pre-wrap;
   word-break: break-all;
 }
+pre.prettyprint {
+  margin-bottom: 18px;
+}
 pre code {
   padding: 0;
   background-color: transparent;
@@ -2085,6 +2088,91 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
 .tab-content > .active, .pill-content > .active {
   display: block;
 }
+.step-nav {
+  position: relative;
+  margin: 0 0 18px;
+  list-style: none;
+  line-height: 30px;
+  text-align: center;
+  background-color: #f5f5f5;
+  -webkit-border-radius: 15px;
+  -moz-border-radius: 15px;
+  border-radius: 15px;
+}
+.step-nav li {
+  display: inline;
+  color: #bfbfbf;
+}
+.step-nav .prev, .step-nav .next {
+  position: absolute;
+  top: 6px;
+}
+.step-nav .prev {
+  left: 15px;
+}
+.step-nav .next {
+  right: 15px;
+}
+.step-nav .dot {
+  display: inline-block;
+  width: 10px;
+  height: 10px;
+  margin: 0 3px;
+  text-indent: -999em;
+  background-color: #bfbfbf;
+  -webkit-border-radius: 5px;
+  -moz-border-radius: 5px;
+  border-radius: 5px;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.25);
+  -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.25);
+  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.25);
+}
+.step-nav .dot:hover, .step-nav .active .dot {
+  background-color: #404040;
+}
+.subnav {
+  position: relative;
+  background-color: #eeeeee;
+  background-image: -khtml-gradient(linear, left top, left bottom, from(#f5f5f5), to(#eeeeee));
+  background-image: -moz-linear-gradient(top, #f5f5f5, #eeeeee);
+  background-image: -ms-linear-gradient(top, #f5f5f5, #eeeeee);
+  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #f5f5f5), color-stop(100%, #eeeeee));
+  background-image: -webkit-linear-gradient(top, #f5f5f5, #eeeeee);
+  background-image: -o-linear-gradient(top, #f5f5f5, #eeeeee);
+  background-image: linear-gradient(top, #f5f5f5, #eeeeee);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f5f5f5', endColorstr='#eeeeee', GradientType=0);
+  -webkit-border-radius: 6px;
+  -moz-border-radius: 6px;
+  border-radius: 6px;
+}
+.subnav a {
+  padding: 10px 15px;
+  color: #0069d6;
+  text-shadow: 0 1px 0 #fff;
+  border-left: 1px solid #f9f9f9;
+  border-right: 1px solid #e5e5e5;
+}
+.subnav a:hover {
+  color: #00438a;
+  background-color: #eee;
+}
+.subnav li:first-child a {
+  border-left: 0;
+  -webkit-border-radius: 6px 0 0 6px;
+  -moz-border-radius: 6px 0 0 6px;
+  border-radius: 6px 0 0 6px;
+}
+.subnav li:last-child a {
+  border-right: 0;
+  -webkit-border-radius: 0 6px 6px 0;
+  -moz-border-radius: 0 6px 6px 0;
+  border-radius: 0 6px 6px 0;
+}
+.subnav ul .active > a {
+  color: #404040;
+  background-color: #eee;
+}
 .breadcrumb {
   padding: 7px 14px;
   margin: 0 0 18px;