diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 6b71176f89..926ae3913e 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -15,6 +15,7 @@ body { } .bs-docs-container { + max-width: 860px; padding-left: 15px; padding-right: 15px; } @@ -49,32 +50,23 @@ section > ul li { /* Navbar -------------------------------------------------- */ -/*.bs-docs-navbar { - background-color: #fff; - border-bottom: 1px solid #ccc; - border-bottom: 1px solid rgba(0,0,0,.1); +.bs-docs-navbar { + background-color: #333; } -.bs-docs-navbar .nav > .active > a, -.bs-docs-navbar .nav > .active > a:hover { - font-weight: 500; - background-color: transparent; -} -*/ - .bs-docs-navbar .navbar-brand { padding: 15px; - font-size: 32px; + font-size: 30px; margin-left: 0; } .bs-docs-navbar .nav { - border-top: 1px solid #111; - border-bottom: 1px solid #333; + border-top: 1px solid #222; + border-bottom: 1px solid #444; } .bs-docs-navbar .nav > li > a { width: 60px; text-align: center; - border-top: 1px solid #333; - border-bottom: 1px solid #111; + border-top: 1px solid #444; + border-bottom: 1px solid #222; } .bs-docs-navbar .glyphicon { display: block; @@ -202,6 +194,53 @@ section > ul li { /* Sidenav -------------------------------------------------- */ +.bs-docs-sidebar { + position: fixed; + top: 0; + left: 60px; + bottom: 0; + width: 240px; + background-color: #f5f5f5; + border-right: 1px solid #e5e5e5; +} +.bs-docs-sidenav > li > a { + color: #555; + padding: 8px 20px; +} +.bs-docs-sidenav > .active > a, +.bs-docs-sidenav > .active:hover > a, +.bs-docs-sidenav > .active:focus > a { + color: #fff; + background-color: #428bca; +} + +.bs-docs-sidenav-heading { + margin: 0; + padding: 15px 20px; + color: #999; + border-bottom: 1px solid #e5e5e5; + box-shadow: 0 1px 0 #fff; +} + +.bs-docs-navbar:after, +.bs-docs-sidebar:after { + position: absolute; + top: -20px; + right: 0; + bottom: -20px; + left: -10px; + z-index: 10; + display: block; + content: " "; + box-shadow: inset -5px 0 25px rgba(0,0,0,.05); +} +.bs-docs-navbar .container, +.bs-docs-sidenav { + position: relative; + z-index: 15; +} + + /* Base styles are not affixable given mobile-first */ .bs-docs-sidenav { margin: 0; @@ -209,13 +248,13 @@ section > ul li { -moz-box-sizing: border-box; box-sizing: border-box; } -.bs-docs-sidenav.affix { +/*.bs-docs-sidenav.affix { position: static; top: 0; -} +}*/ /* Chevrons within each link */ -.bs-docs-sidenav .glyphicon-chevron-right { +/*.bs-docs-sidenav .glyphicon-chevron-right { float: right; margin-top: 1px; margin-right: -6px; @@ -230,7 +269,7 @@ section > ul li { color: #fff; opacity: 1; } - +*/ /* Bootstrap code examples @@ -638,7 +677,7 @@ input.focused { body { /*padding-top: 50px;*/ /* Default height of navbar */ padding-top: 0; - padding-left: 60px; + padding-left: 300px; } /* Undo custom padding */ @@ -690,13 +729,13 @@ input.focused { } .bs-docs-sidenav { - width: 220px; + width: 240px; } } /* Large desktops and up */ @media screen and (min-width: 1200px) { - .bs-docs-sidenav { - width: 260px; +/* .bs-docs-sidenav { + width: 240px; } -} +*/} diff --git a/docs/assets/js/application.js b/docs/assets/js/application.js index 18e9e84cd7..2a0d3a6c6e 100644 --- a/docs/assets/js/application.js +++ b/docs/assets/js/application.js @@ -14,14 +14,14 @@ }) // side bar - setTimeout(function () { - $('.bs-docs-sidenav').affix({ - offset: { - top: function () { return $window.width() <= 980 ? 290 : 210 } - , bottom: 270 - } - }) - }, 100) + // setTimeout(function () { + // $('.bs-docs-sidenav').affix({ + // offset: { + // top: function () { return $window.width() <= 980 ? 290 : 210 } + // , bottom: 270 + // } + // }) + // }, 100) // make code pretty window.prettyPrint && prettyPrint() diff --git a/docs/components.html b/docs/components.html index 06cbe37206..b42fad00bf 100644 --- a/docs/components.html +++ b/docs/components.html @@ -4,44 +4,31 @@ title: Components --- - -
-
-

Components

-

Dozens of reusable components built to provide navigation, alerts, popovers, and more.

-
-
+
+
Components
+ +
+
- -
-
- -
-
- - -
-
-
diff --git a/docs/css.html b/docs/css.html index f3ab7a00ae..1c317d2cd7 100644 --- a/docs/css.html +++ b/docs/css.html @@ -3,39 +3,25 @@ layout: default title: CSS --- - -
-
-

CSS

-

Fundamental HTML elements styled and enhanced with extensible classes.

-
-
+
+
CSS
+ +
- -
-
- -
-
- - -
@@ -2420,9 +2406,4 @@ For example, <section> should be wrapped as inline.
- - -
-
-
diff --git a/docs/customize.html b/docs/customize.html index f4e01b3406..61a789b1a5 100644 --- a/docs/customize.html +++ b/docs/customize.html @@ -3,33 +3,18 @@ layout: default title: Customize and download --- - - -
-
-

Customize and download

-

Download Bootstrap or customize variables, components, JavaScript plugins, and more.

-
-
- +
+
Customize and download
+ +
- -
-
- -
-
- -
@@ -41,7 +26,7 @@ title: Customize and download
-
+

Scaffolding

@@ -57,7 +42,7 @@ title: Customize and download
-
+

Components

@@ -78,7 +63,7 @@ title: Customize and download
-
+

Miscellaneous

@@ -102,7 +87,7 @@ title: Customize and download
-
+
-
+
-
+

Heads up!

All checked plugins will be compiled into a single file, bootstrap.js. All plugins require the latest version of jQuery to be included.

@@ -174,183 +159,183 @@ title: Customize and download
-
+

Scaffolding

- + - +

Links

- + - +

Grid system

- + - + - + - + - + - + - +
-
+

Typography

- + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - +

Tables

- + - + - + - +

Forms

- + - + - + - + - + - + - + - +
-
+

Form states & alerts

- + - + - + - + - + - + - + - +

Navbar

- + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - +

Dropdowns

- + - + - + - + - +
@@ -370,8 +355,4 @@ title: Customize and download - -
-
-
diff --git a/docs/getting-started.html b/docs/getting-started.html index 5717bfbaa5..a2b3ba5144 100644 --- a/docs/getting-started.html +++ b/docs/getting-started.html @@ -4,35 +4,20 @@ title: Getting started description: Overview of the project, its contents, and how to get started with a simple template. --- - -
-
-

Getting started

-

Overview of the project, its contents, and how to get started with a simple template.

-
-
- +
+
Getting started
+ +
- -
-
- -
-
- - -
@@ -282,10 +267,4 @@ description: Overview of the project, its contents, and how to get started with Customize Bootstrap
- - - -
-
-
diff --git a/docs/javascript.html b/docs/javascript.html index e64908672b..f5388461b0 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -3,41 +3,28 @@ layout: default title: JavaScript plugins --- - -
-
-

JavaScript

-

Bring Bootstrap's components to life—now with 13 custom jQuery plugins. -

-
+
+
JavaScript plugins
+ +
- -
-
- -
-
- -
@@ -1857,8 +1844,4 @@ $('[data-spy="affix"]').each(function () {
- -
-
-