diff options
| author | Mark Otto <[email protected]> | 2012-01-25 11:27:29 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-01-25 11:27:29 -0800 |
| commit | e24bd40b4a38b190caad2da9b90c683167c76004 (patch) | |
| tree | c7305cf363c71186eb40173f433306b1ac2fc7a6 /docs | |
| parent | b8511568637dfa4decb3f0475436a3dfa637a57d (diff) | |
| parent | 25519bacd56ee2507cdde727d85458e5e5ef7949 (diff) | |
| download | bootstrap-e24bd40b4a38b190caad2da9b90c683167c76004.tar.xz bootstrap-e24bd40b4a38b190caad2da9b90c683167c76004.zip | |
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Conflicts:
bootstrap.css
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/base-css.html | 2 | ||||
| -rw-r--r-- | docs/components.html | 2 | ||||
| -rw-r--r-- | docs/download.html | 2 | ||||
| -rw-r--r-- | docs/examples.html | 2 | ||||
| -rw-r--r-- | docs/index.html | 2 | ||||
| -rw-r--r-- | docs/javascript.html | 2 | ||||
| -rw-r--r-- | docs/less.html | 2 | ||||
| -rw-r--r-- | docs/scaffolding.html | 2 | ||||
| -rw-r--r-- | docs/templates/layout.mustache | 2 | ||||
| -rw-r--r-- | docs/upgrading.html | 2 |
10 files changed, 10 insertions, 10 deletions
diff --git a/docs/base-css.html b/docs/base-css.html index 057c98b85..a8a87da42 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -25,7 +25,7 @@ <link rel="apple-touch-icon" sizes="114x114" href="images/apple-touch-icon-114x114.png"> </head> - <body> + <body data-spy="scroll" data-target=".subnav" data-offset="50"> <!-- Navbar ================================================== --> diff --git a/docs/components.html b/docs/components.html index a7a447084..56c5280db 100644 --- a/docs/components.html +++ b/docs/components.html @@ -25,7 +25,7 @@ <link rel="apple-touch-icon" sizes="114x114" href="images/apple-touch-icon-114x114.png"> </head> - <body> + <body data-spy="scroll" data-target=".subnav" data-offset="50"> <!-- Navbar ================================================== --> diff --git a/docs/download.html b/docs/download.html index cdc129049..e873b5e74 100644 --- a/docs/download.html +++ b/docs/download.html @@ -25,7 +25,7 @@ <link rel="apple-touch-icon" sizes="114x114" href="images/apple-touch-icon-114x114.png"> </head> - <body> + <body data-spy="scroll" data-target=".subnav" data-offset="50"> <!-- Navbar ================================================== --> diff --git a/docs/examples.html b/docs/examples.html index 04ca7fd68..bc52bea55 100644 --- a/docs/examples.html +++ b/docs/examples.html @@ -25,7 +25,7 @@ <link rel="apple-touch-icon" sizes="114x114" href="images/apple-touch-icon-114x114.png"> </head> - <body> + <body data-spy="scroll" data-target=".subnav" data-offset="50"> <!-- Navbar ================================================== --> diff --git a/docs/index.html b/docs/index.html index 2a6078cbe..0835c4647 100644 --- a/docs/index.html +++ b/docs/index.html @@ -25,7 +25,7 @@ <link rel="apple-touch-icon" sizes="114x114" href="images/apple-touch-icon-114x114.png"> </head> - <body> + <body data-spy="scroll" data-target=".subnav" data-offset="50"> <!-- Navbar ================================================== --> diff --git a/docs/javascript.html b/docs/javascript.html index 9d6b2812d..eb291a1a3 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -25,7 +25,7 @@ <link rel="apple-touch-icon" sizes="114x114" href="images/apple-touch-icon-114x114.png"> </head> - <body> + <body data-spy="scroll" data-target=".subnav" data-offset="50"> <!-- Navbar ================================================== --> diff --git a/docs/less.html b/docs/less.html index f920a80a8..c77ba9706 100644 --- a/docs/less.html +++ b/docs/less.html @@ -25,7 +25,7 @@ <link rel="apple-touch-icon" sizes="114x114" href="images/apple-touch-icon-114x114.png"> </head> - <body> + <body data-spy="scroll" data-target=".subnav" data-offset="50"> <!-- Navbar ================================================== --> diff --git a/docs/scaffolding.html b/docs/scaffolding.html index 77aeea5a3..8245f860c 100644 --- a/docs/scaffolding.html +++ b/docs/scaffolding.html @@ -25,7 +25,7 @@ <link rel="apple-touch-icon" sizes="114x114" href="images/apple-touch-icon-114x114.png"> </head> - <body> + <body data-spy="scroll" data-target=".subnav" data-offset="50"> <!-- Navbar ================================================== --> diff --git a/docs/templates/layout.mustache b/docs/templates/layout.mustache index 3435e3579..addcb224f 100644 --- a/docs/templates/layout.mustache +++ b/docs/templates/layout.mustache @@ -25,7 +25,7 @@ <link rel="apple-touch-icon" sizes="114x114" href="images/apple-touch-icon-114x114.png"> </head> - <body> + <body data-spy="scroll" data-target=".subnav" data-offset="50"> <!-- Navbar ================================================== --> diff --git a/docs/upgrading.html b/docs/upgrading.html index c7e6c815f..fb1fbfcfe 100644 --- a/docs/upgrading.html +++ b/docs/upgrading.html @@ -25,7 +25,7 @@ <link rel="apple-touch-icon" sizes="114x114" href="images/apple-touch-icon-114x114.png"> </head> - <body> + <body data-spy="scroll" data-target=".subnav" data-offset="50"> <!-- Navbar ================================================== --> |