From c1c7528dd9f0617cb65bc5fac7aa6b2cfc2eb822 Mon Sep 17 00:00:00 2001 From: Mark Otto <markotto@twitter.com> Date: Thu, 7 Jun 2012 21:48:03 -0700 Subject: [PATCH] drop the side nav, restore topbar --- docs/assets/css/docs.css | 7 +++--- docs/base-css.html | 44 ++++++++++++++++++++++++++++++++++ docs/components.html | 44 ++++++++++++++++++++++++++++++++++ docs/download.html | 44 ++++++++++++++++++++++++++++++++++ docs/examples.html | 44 ++++++++++++++++++++++++++++++++++ docs/index.html | 44 ++++++++++++++++++++++++++++++++++ docs/javascript.html | 44 ++++++++++++++++++++++++++++++++++ docs/less.html | 44 ++++++++++++++++++++++++++++++++++ docs/scaffolding.html | 44 ++++++++++++++++++++++++++++++++++ docs/templates/layout.mustache | 44 ++++++++++++++++++++++++++++++++++ docs/upgrading.html | 44 ++++++++++++++++++++++++++++++++++ 11 files changed, 444 insertions(+), 3 deletions(-) diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 88d93e4611..fd0a71edb9 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -12,18 +12,18 @@ body { position: relative; - padding-top: 40px; + padding-top: 100px; font-size: 14px; background-color: #fff; background-image: url(../img/grid-20px.png); background-repeat: repeat-x; - background-position: 0 0; + background-position: 0 40px; } /* Custom container for the narrow docs */ .bs-docs-container { max-width: 780px; - margin: 0 0 0 240px; + margin: 0 auto; } /* Increase docs base type size and line-heights */ @@ -43,6 +43,7 @@ li { -------------------------------------------------- */ .bs-docs-nav { + display: none; position: fixed; top: 0; left: 0; diff --git a/docs/base-css.html b/docs/base-css.html index 7ed6c68ac2..56756b81ff 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -29,6 +29,50 @@ <body> + <!-- Navbar + ================================================== --> + <div class="navbar navbar-fixed-top"> + <div class="navbar-inner"> + <div class="container"> + <button type="button"class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"> + <span class="icon-bar"></span> + <span class="icon-bar"></span> + <span class="icon-bar"></span> + </button> + <a class="brand" href="./index.html">Bootstrap</a> + <div class="nav-collapse collapse"> + <ul class="nav"> + <li class=""> + <a href="./index.html">Overview</a> + </li> + <li class=""> + <a href="./scaffolding.html">Scaffolding</a> + </li> + <li class="active"> + <a href="./base-css.html">Base CSS</a> + </li> + <li class=""> + <a href="./components.html">Components</a> + </li> + <li class=""> + <a href="./javascript.html">Javascript plugins</a> + </li> + <li class=""> + <a href="./less.html">Using LESS</a> + </li> + <li class="divider-vertical"></li> + <li class=""> + <a href="./download.html">Customize</a> + </li> + <li class=""> + <a href="./examples.html">Examples</a> + </li> + </ul> + </div> + </div> + </div> + </div> + <div class="bs-docs-nav"> <h3 class="bs-docs-logo"><a href="./index.html">Bootstrap</a></h3> <ul class="bs-nav"> diff --git a/docs/components.html b/docs/components.html index 63cfac9ae6..8716963bdf 100644 --- a/docs/components.html +++ b/docs/components.html @@ -29,6 +29,50 @@ <body> + <!-- Navbar + ================================================== --> + <div class="navbar navbar-fixed-top"> + <div class="navbar-inner"> + <div class="container"> + <button type="button"class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"> + <span class="icon-bar"></span> + <span class="icon-bar"></span> + <span class="icon-bar"></span> + </button> + <a class="brand" href="./index.html">Bootstrap</a> + <div class="nav-collapse collapse"> + <ul class="nav"> + <li class=""> + <a href="./index.html">Overview</a> + </li> + <li class=""> + <a href="./scaffolding.html">Scaffolding</a> + </li> + <li class=""> + <a href="./base-css.html">Base CSS</a> + </li> + <li class="active"> + <a href="./components.html">Components</a> + </li> + <li class=""> + <a href="./javascript.html">Javascript plugins</a> + </li> + <li class=""> + <a href="./less.html">Using LESS</a> + </li> + <li class="divider-vertical"></li> + <li class=""> + <a href="./download.html">Customize</a> + </li> + <li class=""> + <a href="./examples.html">Examples</a> + </li> + </ul> + </div> + </div> + </div> + </div> + <div class="bs-docs-nav"> <h3 class="bs-docs-logo"><a href="./index.html">Bootstrap</a></h3> <ul class="bs-nav"> diff --git a/docs/download.html b/docs/download.html index 20e8605591..ebba8fa8f8 100644 --- a/docs/download.html +++ b/docs/download.html @@ -29,6 +29,50 @@ <body> + <!-- Navbar + ================================================== --> + <div class="navbar navbar-fixed-top"> + <div class="navbar-inner"> + <div class="container"> + <button type="button"class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"> + <span class="icon-bar"></span> + <span class="icon-bar"></span> + <span class="icon-bar"></span> + </button> + <a class="brand" href="./index.html">Bootstrap</a> + <div class="nav-collapse collapse"> + <ul class="nav"> + <li class=""> + <a href="./index.html">Overview</a> + </li> + <li class=""> + <a href="./scaffolding.html">Scaffolding</a> + </li> + <li class=""> + <a href="./base-css.html">Base CSS</a> + </li> + <li class=""> + <a href="./components.html">Components</a> + </li> + <li class=""> + <a href="./javascript.html">Javascript plugins</a> + </li> + <li class=""> + <a href="./less.html">Using LESS</a> + </li> + <li class="divider-vertical"></li> + <li class="active"> + <a href="./download.html">Customize</a> + </li> + <li class=""> + <a href="./examples.html">Examples</a> + </li> + </ul> + </div> + </div> + </div> + </div> + <div class="bs-docs-nav"> <h3 class="bs-docs-logo"><a href="./index.html">Bootstrap</a></h3> <ul class="bs-nav"> diff --git a/docs/examples.html b/docs/examples.html index 374b69ef62..06844c6cdc 100644 --- a/docs/examples.html +++ b/docs/examples.html @@ -29,6 +29,50 @@ <body> + <!-- Navbar + ================================================== --> + <div class="navbar navbar-fixed-top"> + <div class="navbar-inner"> + <div class="container"> + <button type="button"class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"> + <span class="icon-bar"></span> + <span class="icon-bar"></span> + <span class="icon-bar"></span> + </button> + <a class="brand" href="./index.html">Bootstrap</a> + <div class="nav-collapse collapse"> + <ul class="nav"> + <li class=""> + <a href="./index.html">Overview</a> + </li> + <li class=""> + <a href="./scaffolding.html">Scaffolding</a> + </li> + <li class=""> + <a href="./base-css.html">Base CSS</a> + </li> + <li class=""> + <a href="./components.html">Components</a> + </li> + <li class=""> + <a href="./javascript.html">Javascript plugins</a> + </li> + <li class=""> + <a href="./less.html">Using LESS</a> + </li> + <li class="divider-vertical"></li> + <li class=""> + <a href="./download.html">Customize</a> + </li> + <li class="active"> + <a href="./examples.html">Examples</a> + </li> + </ul> + </div> + </div> + </div> + </div> + <div class="bs-docs-nav"> <h3 class="bs-docs-logo"><a href="./index.html">Bootstrap</a></h3> <ul class="bs-nav"> diff --git a/docs/index.html b/docs/index.html index ccba2ee61b..9f36d3bc9f 100644 --- a/docs/index.html +++ b/docs/index.html @@ -29,6 +29,50 @@ <body> + <!-- Navbar + ================================================== --> + <div class="navbar navbar-fixed-top"> + <div class="navbar-inner"> + <div class="container"> + <button type="button"class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"> + <span class="icon-bar"></span> + <span class="icon-bar"></span> + <span class="icon-bar"></span> + </button> + <a class="brand" href="./index.html">Bootstrap</a> + <div class="nav-collapse collapse"> + <ul class="nav"> + <li class="active"> + <a href="./index.html">Overview</a> + </li> + <li class=""> + <a href="./scaffolding.html">Scaffolding</a> + </li> + <li class=""> + <a href="./base-css.html">Base CSS</a> + </li> + <li class=""> + <a href="./components.html">Components</a> + </li> + <li class=""> + <a href="./javascript.html">Javascript plugins</a> + </li> + <li class=""> + <a href="./less.html">Using LESS</a> + </li> + <li class="divider-vertical"></li> + <li class=""> + <a href="./download.html">Customize</a> + </li> + <li class=""> + <a href="./examples.html">Examples</a> + </li> + </ul> + </div> + </div> + </div> + </div> + <div class="bs-docs-nav"> <h3 class="bs-docs-logo"><a href="./index.html">Bootstrap</a></h3> <ul class="bs-nav"> diff --git a/docs/javascript.html b/docs/javascript.html index d21ca2d616..991ce7b2b0 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -29,6 +29,50 @@ <body> + <!-- Navbar + ================================================== --> + <div class="navbar navbar-fixed-top"> + <div class="navbar-inner"> + <div class="container"> + <button type="button"class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"> + <span class="icon-bar"></span> + <span class="icon-bar"></span> + <span class="icon-bar"></span> + </button> + <a class="brand" href="./index.html">Bootstrap</a> + <div class="nav-collapse collapse"> + <ul class="nav"> + <li class=""> + <a href="./index.html">Overview</a> + </li> + <li class=""> + <a href="./scaffolding.html">Scaffolding</a> + </li> + <li class=""> + <a href="./base-css.html">Base CSS</a> + </li> + <li class=""> + <a href="./components.html">Components</a> + </li> + <li class="active"> + <a href="./javascript.html">Javascript plugins</a> + </li> + <li class=""> + <a href="./less.html">Using LESS</a> + </li> + <li class="divider-vertical"></li> + <li class=""> + <a href="./download.html">Customize</a> + </li> + <li class=""> + <a href="./examples.html">Examples</a> + </li> + </ul> + </div> + </div> + </div> + </div> + <div class="bs-docs-nav"> <h3 class="bs-docs-logo"><a href="./index.html">Bootstrap</a></h3> <ul class="bs-nav"> diff --git a/docs/less.html b/docs/less.html index c383660d20..775b02afe3 100644 --- a/docs/less.html +++ b/docs/less.html @@ -29,6 +29,50 @@ <body> + <!-- Navbar + ================================================== --> + <div class="navbar navbar-fixed-top"> + <div class="navbar-inner"> + <div class="container"> + <button type="button"class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"> + <span class="icon-bar"></span> + <span class="icon-bar"></span> + <span class="icon-bar"></span> + </button> + <a class="brand" href="./index.html">Bootstrap</a> + <div class="nav-collapse collapse"> + <ul class="nav"> + <li class=""> + <a href="./index.html">Overview</a> + </li> + <li class=""> + <a href="./scaffolding.html">Scaffolding</a> + </li> + <li class=""> + <a href="./base-css.html">Base CSS</a> + </li> + <li class=""> + <a href="./components.html">Components</a> + </li> + <li class=""> + <a href="./javascript.html">Javascript plugins</a> + </li> + <li class="active"> + <a href="./less.html">Using LESS</a> + </li> + <li class="divider-vertical"></li> + <li class=""> + <a href="./download.html">Customize</a> + </li> + <li class=""> + <a href="./examples.html">Examples</a> + </li> + </ul> + </div> + </div> + </div> + </div> + <div class="bs-docs-nav"> <h3 class="bs-docs-logo"><a href="./index.html">Bootstrap</a></h3> <ul class="bs-nav"> diff --git a/docs/scaffolding.html b/docs/scaffolding.html index bb2b5b03d8..257cbc5648 100644 --- a/docs/scaffolding.html +++ b/docs/scaffolding.html @@ -29,6 +29,50 @@ <body> + <!-- Navbar + ================================================== --> + <div class="navbar navbar-fixed-top"> + <div class="navbar-inner"> + <div class="container"> + <button type="button"class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"> + <span class="icon-bar"></span> + <span class="icon-bar"></span> + <span class="icon-bar"></span> + </button> + <a class="brand" href="./index.html">Bootstrap</a> + <div class="nav-collapse collapse"> + <ul class="nav"> + <li class=""> + <a href="./index.html">Overview</a> + </li> + <li class="active"> + <a href="./scaffolding.html">Scaffolding</a> + </li> + <li class=""> + <a href="./base-css.html">Base CSS</a> + </li> + <li class=""> + <a href="./components.html">Components</a> + </li> + <li class=""> + <a href="./javascript.html">Javascript plugins</a> + </li> + <li class=""> + <a href="./less.html">Using LESS</a> + </li> + <li class="divider-vertical"></li> + <li class=""> + <a href="./download.html">Customize</a> + </li> + <li class=""> + <a href="./examples.html">Examples</a> + </li> + </ul> + </div> + </div> + </div> + </div> + <div class="bs-docs-nav"> <h3 class="bs-docs-logo"><a href="./index.html">Bootstrap</a></h3> <ul class="bs-nav"> diff --git a/docs/templates/layout.mustache b/docs/templates/layout.mustache index 3c0d2b4ca3..779e106636 100644 --- a/docs/templates/layout.mustache +++ b/docs/templates/layout.mustache @@ -41,6 +41,50 @@ <body> + <!-- Navbar + ================================================== --> + <div class="navbar navbar-fixed-top"> + <div class="navbar-inner"> + <div class="container"> + <button type="button"class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"> + <span class="icon-bar"></span> + <span class="icon-bar"></span> + <span class="icon-bar"></span> + </button> + <a class="brand" href="./index.html">Bootstrap</a> + <div class="nav-collapse collapse"> + <ul class="nav"> + <li class="{{index}}"> + <a href="./index.html">{{_i}}Overview{{/i}}</a> + </li> + <li class="{{scaffolding}}"> + <a href="./scaffolding.html">{{_i}}Scaffolding{{/i}}</a> + </li> + <li class="{{base-css}}"> + <a href="./base-css.html">{{_i}}Base CSS{{/i}}</a> + </li> + <li class="{{components}}"> + <a href="./components.html">{{_i}}Components{{/i}}</a> + </li> + <li class="{{javascript}}"> + <a href="./javascript.html">{{_i}}Javascript plugins{{/i}}</a> + </li> + <li class="{{less}}"> + <a href="./less.html">{{_i}}Using LESS{{/i}}</a> + </li> + <li class="divider-vertical"></li> + <li class="{{download}}"> + <a href="./download.html">{{_i}}Customize{{/i}}</a> + </li> + <li class="{{examples}}"> + <a href="./examples.html">{{_i}}Examples{{/i}}</a> + </li> + </ul> + </div> + </div> + </div> + </div> + <div class="bs-docs-nav"> <h3 class="bs-docs-logo"><a href="./index.html">{{_i}}Bootstrap{{/i}}</a></h3> <ul class="bs-nav"> diff --git a/docs/upgrading.html b/docs/upgrading.html index 9611ffc41d..eccb685a48 100644 --- a/docs/upgrading.html +++ b/docs/upgrading.html @@ -29,6 +29,50 @@ <body> + <!-- Navbar + ================================================== --> + <div class="navbar navbar-fixed-top"> + <div class="navbar-inner"> + <div class="container"> + <button type="button"class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"> + <span class="icon-bar"></span> + <span class="icon-bar"></span> + <span class="icon-bar"></span> + </button> + <a class="brand" href="./index.html">Bootstrap</a> + <div class="nav-collapse collapse"> + <ul class="nav"> + <li class=""> + <a href="./index.html">Overview</a> + </li> + <li class=""> + <a href="./scaffolding.html">Scaffolding</a> + </li> + <li class=""> + <a href="./base-css.html">Base CSS</a> + </li> + <li class=""> + <a href="./components.html">Components</a> + </li> + <li class=""> + <a href="./javascript.html">Javascript plugins</a> + </li> + <li class=""> + <a href="./less.html">Using LESS</a> + </li> + <li class="divider-vertical"></li> + <li class=""> + <a href="./download.html">Customize</a> + </li> + <li class=""> + <a href="./examples.html">Examples</a> + </li> + </ul> + </div> + </div> + </div> + </div> + <div class="bs-docs-nav"> <h3 class="bs-docs-logo"><a href="./index.html">Bootstrap</a></h3> <ul class="bs-nav"> -- GitLab