From edb733ebc7db2d76bdac2611cbd83c5ae36f4fee Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 8 May 2013 21:56:08 -0700 Subject: Super massive docs overhaul * Bring back the navbar up top * Pull the docs content back into separate pages because a 6.6k line docs file is just crazy * Recenter the page content and bring back affixed side nav (needs work) --- docs/assets/css/docs.css | 83 ++++++++++++++++++++++++------------------------ 1 file changed, 41 insertions(+), 42 deletions(-) (limited to 'docs/assets/css/docs.css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index aca8df213..328ede78d 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -13,6 +13,17 @@ body { /* We add the padding to the body for >768px only */ } +/* Top nav and header */ +.bs-docs-nav { + background-color: #fff; + border-bottom: 1px solid #ddd; +} +.bs-docs-nav .navbar-brand { + color: #b94a48; +} + + + hr { margin-top: 30px; margin-bottom: 30px; @@ -22,20 +33,13 @@ hr { margin-top: 15px; margin-bottom: 5px; } - +/* .bs-docs-container, .bs-home-container { padding-left: 15px; padding-right: 15px; } -.bs-docs-container { - max-width: 860px; -} -.bs-docs-container .row { - margin-left: -15px; - margin-right: -15px; -} - +*/ /* Side notes for calling out things */ .bs-docs-sidenote { margin: 20px 0; @@ -59,27 +63,28 @@ hr { -------------------------------------------------- */ /* Padding for in-page bookmarks */ -section, +/*section,*/ .bs-docs-section { padding-top: 30px; } /* Few stylistic typography tweaks */ -section > .page-header, +/*section > .page-header, section > .lead { color: #5a5a5a; } section > ul li { margin-bottom: 5px; -} +}*/ /* Jumbotrons -------------------------------------------------- */ -.bs-docs-section-header { - padding-top: 60px; +.bs-docs-header { + margin-bottom: 20px; + padding-top: 30px; color: #b94a48; border-bottom: 5px solid #b94a48; } @@ -149,22 +154,15 @@ section > ul li { /* Sidenav -------------------------------------------------- */ -.bs-docs-sidebar { - display: none; - position: fixed; - top: 0; - left: 0; - bottom: 0; - width: 240px; - overflow-y: scroll; - text-shadow: 0 1px 0 #fff; - background-color: #f5f5f5; - box-shadow: inset -1px 0 0 #e5e5e5; -} - /* Nav: first level */ .bs-docs-sidebar > .nav { - margin: 0 0 25px 0; + margin-top: 20px; + margin-bottom: 20px; + padding-top: 15px; + padding-bottom: 15px; + text-shadow: 0 1px 0 #fff; + background-color: #f5f5f5; + border-radius: 5px; } .bs-docs-sidebar .nav > li > a { display: block; @@ -229,6 +227,17 @@ section > ul li { border-color: #333; } +/* Increase spacing between page nav and other pages */ +.bs-docs-sidenav .nav-divider { + margin-top: 25px; + margin-bottom: 25px; +} + +.bs-docs-sidebar.affix { + top: 50px; + width: 270px; +} + /* Bootstrap code examples @@ -666,6 +675,9 @@ input.focused { /* Tablets and up */ @media screen and (min-width: 768px) { + body { + padding-top: 50px; + } /* Back to top link */ .bs-docs-top { @@ -687,17 +699,11 @@ input.focused { bottom: 15px; } - .bs-docs-section-header h1 { + .bs-docs-header h1 { font-size: 80px; - font-size: 8rem; line-height: 1; } - /* Account for fixed navbar (which is static to start) */ - .bs-docs-docs { - padding-left: 260px; - } - /* Undo custom padding */ .bs-docs-container { padding-left: 0; @@ -738,10 +744,6 @@ input.focused { /* Tablets/desktops and up */ @media screen and (min-width: 992px) { - .bs-docs-docs { - padding-left: 280px; - } - /* Icons */ .the-icons li { width: 12.5%; @@ -751,8 +753,5 @@ input.focused { /* Large desktops and up */ @media screen and (min-width: 1200px) { - .bs-docs-docs { - padding-left: 300px; - } } -- cgit v1.2.3 From feeaaa6febea765433351d1313d39ad74e452ad4 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 8 May 2013 22:13:56 -0700 Subject: refactor homepage jumbotron masthead doodad --- docs/assets/css/docs.css | 102 +++++++++++++++++++++-------------------------- 1 file changed, 46 insertions(+), 56 deletions(-) (limited to 'docs/assets/css/docs.css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 328ede78d..55cc07d45 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -29,10 +29,13 @@ hr { margin-bottom: 30px; } + + .bs-docs-dl-options h4 { margin-top: 15px; margin-bottom: 5px; } + /* .bs-docs-container, .bs-home-container { @@ -40,6 +43,7 @@ hr { padding-right: 15px; } */ + /* Side notes for calling out things */ .bs-docs-sidenote { margin: 20px 0; @@ -59,50 +63,23 @@ hr { } -/* Sections --------------------------------------------------- */ - -/* Padding for in-page bookmarks */ -/*section,*/ -.bs-docs-section { - padding-top: 30px; -} - -/* Few stylistic typography tweaks */ -/*section > .page-header, -section > .lead { - color: #5a5a5a; -} -section > ul li { - margin-bottom: 5px; -}*/ - - -/* Jumbotrons +/* Homepage masthead -------------------------------------------------- */ -.bs-docs-header { - margin-bottom: 20px; - padding-top: 30px; - color: #b94a48; - border-bottom: 5px solid #b94a48; -} - -/* Base class */ -.bs-docs-jumbotron { +.bs-masthead { position: relative; margin-bottom: 20px; padding: 30px 15px; text-align: center; } -.bs-docs-jumbotron h1 { +.bs-masthead h1 { font-size: 50px; line-height: 1; } /* Download button */ -.bs-docs-jumbotron .btn { +.bs-masthead .btn { margin-top: 5px; margin-bottom: 5px; padding: 18px 24px; @@ -111,42 +88,42 @@ section > ul li { background-color: #fff; border-color: #e5e5e5; } -.bs-docs-jumbotron .btn:hover, -.bs-docs-jumbotron .btn:active { +.bs-masthead .btn:hover, +.bs-masthead .btn:active { color: #fff; /* redeclare to override the `.jumbotron a` */ background-color: #b94a48; border-color: #b94a48; } -/* Textual links in masthead */ -.masthead-links { +/* Textual links */ +.bs-masthead-links { margin: 20px 0; list-style: none; } -.masthead-links li { +.bs-masthead-links li { display: inline; color: #999; } -.masthead-links li + li { +.bs-masthead-links li + li { margin-left: 20px; } -/* Special grid styles +/* Docs pages and sections -------------------------------------------------- */ -.show-grid { - margin-bottom: 15px; -} -.show-grid .col { - padding-top: 10px; - padding-bottom: 10px; - background-color: #eee; - border: 1px solid #ddd; +/* Page headers */ +.bs-docs-header { + margin-bottom: 20px; + padding-top: 30px; + color: #b94a48; + border-bottom: 5px solid #b94a48; } -.show-grid .col:hover { - background-color: #ddd; + +/* Padding for in-page bookmarks */ +.bs-docs-section { + padding-top: 30px; } @@ -240,6 +217,24 @@ section > ul li { +/* Special grid styles +-------------------------------------------------- */ + +.show-grid { + margin-bottom: 15px; +} +.show-grid .col { + padding-top: 10px; + padding-bottom: 10px; + background-color: #eee; + border: 1px solid #ddd; +} +.show-grid .col:hover { + background-color: #ddd; +} + + + /* Bootstrap code examples -------------------------------------------------- */ @@ -716,23 +711,18 @@ input.focused { } /* Tweak display of docs jumbotrons */ - .masthead { + .bs-masthead { padding-top: 100px; padding-bottom: 100px; } - .masthead h1 { + .bs-masthead h1 { font-size: 100px; } - .masthead p { + .bs-masthead p { margin-left: 15%; margin-right: 15%; font-size: 30px; } - .subhead { - padding-top: 60px; - padding-bottom: 60px; - text-align: left; - } .bs-navbar-top-example .navbar-fixed-top, .bs-navbar-bottom-example .navbar-fixed-bottom { -- cgit v1.2.3 From 241d3423630f5a1ab4fcb379ec72248421a25874 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 8 May 2013 22:24:07 -0700 Subject: red navbar for docs --- docs/assets/css/docs.css | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) (limited to 'docs/assets/css/docs.css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 55cc07d45..da0ec0370 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -15,13 +15,22 @@ body { /* Top nav and header */ .bs-docs-nav { - background-color: #fff; - border-bottom: 1px solid #ddd; + background-color: #b94a48; } -.bs-docs-nav .navbar-brand { - color: #b94a48; +.bs-docs-nav .navbar-brand, +.bs-docs-nav .navbar-nav > li > a { + color: #fff; +} +.bs-docs-nav .navbar-nav > .active > a { + background-color: #993c3a; +} +.bs-docs-nav .navbar-toggle{ + border-color: #b94a48; +} +.bs-docs-nav .navbar-toggle:hover { + background-color: #993c3a; + border-color: #993c3a; } - hr { -- cgit v1.2.3 From fa4d4e8d88eb8e3e2bb2daba9de3880e93fa5756 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 8 May 2013 22:29:53 -0700 Subject: new docs page headers --- docs/assets/css/docs.css | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) (limited to 'docs/assets/css/docs.css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index da0ec0370..0f639395f 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -10,7 +10,7 @@ body { position: relative; /* For scrollyspy */ - /* We add the padding to the body for >768px only */ + padding-top: 50px; } /* Top nav and header */ @@ -124,10 +124,18 @@ hr { /* Page headers */ .bs-docs-header { - margin-bottom: 20px; - padding-top: 30px; + padding: 0 15px 15px; + margin-bottom: 30px; + font-size: 16px; + color: #5a5a5a; + border-bottom: 1px solid #ddd; +} +.bs-docs-header h1 { color: #b94a48; - border-bottom: 5px solid #b94a48; +} +.bs-docs-header p { + font-weight: 300; + line-height: 1.5; } /* Padding for in-page bookmarks */ @@ -679,9 +687,6 @@ input.focused { /* Tablets and up */ @media screen and (min-width: 768px) { - body { - padding-top: 50px; - } /* Back to top link */ .bs-docs-top { @@ -703,8 +708,12 @@ input.focused { bottom: 15px; } + .bs-docs-header { + padding: 30px 0 40px; + font-size: 21px; + } .bs-docs-header h1 { - font-size: 80px; + font-size: 60px; line-height: 1; } -- cgit v1.2.3 From f09b07dc2a2cb110d5d129ea8c1aac6cbbb09c0d Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 8 May 2013 22:31:49 -0700 Subject: more navbar and header tweaks --- docs/assets/css/docs.css | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'docs/assets/css/docs.css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 0f639395f..50cda6360 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -21,10 +21,11 @@ body { .bs-docs-nav .navbar-nav > li > a { color: #fff; } -.bs-docs-nav .navbar-nav > .active > a { +.bs-docs-nav .navbar-nav > .active > a, +.bs-docs-nav .navbar-nav > .active > a:hover { background-color: #993c3a; } -.bs-docs-nav .navbar-toggle{ +.bs-docs-nav .navbar-toggle { border-color: #b94a48; } .bs-docs-nav .navbar-toggle:hover { @@ -124,10 +125,11 @@ hr { /* Page headers */ .bs-docs-header { - padding: 0 15px 15px; + padding: 30px 30px 40px; margin-bottom: 30px; font-size: 16px; color: #5a5a5a; + text-align: center; border-bottom: 1px solid #ddd; } .bs-docs-header h1 { @@ -709,8 +711,8 @@ input.focused { } .bs-docs-header { - padding: 30px 0 40px; font-size: 21px; + text-align: left; } .bs-docs-header h1 { font-size: 60px; -- cgit v1.2.3 From d7acf4e82d2e5ba5775b18870fb01ac22264e764 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 8 May 2013 22:42:42 -0700 Subject: more work on the sidenav, including small css refactor and new classes --- docs/assets/css/docs.css | 97 ++++++++++++++++++++---------------------------- 1 file changed, 40 insertions(+), 57 deletions(-) (limited to 'docs/assets/css/docs.css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 50cda6360..97c998b03 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -126,7 +126,6 @@ hr { /* Page headers */ .bs-docs-header { padding: 30px 30px 40px; - margin-bottom: 30px; font-size: 16px; color: #5a5a5a; text-align: center; @@ -147,32 +146,39 @@ hr { -/* Sidenav +/* Docs sidebar -------------------------------------------------- */ -/* Nav: first level */ -.bs-docs-sidebar > .nav { - margin-top: 20px; - margin-bottom: 20px; +/* By default it's not affixed in mobile views, so undo that */ +.bs-sidebar.affix { + position: static; +} + +/* First level of nav */ +.bs-sidenav { + margin-top: 30px; + margin-bottom: 30px; padding-top: 15px; padding-bottom: 15px; text-shadow: 0 1px 0 #fff; background-color: #f5f5f5; border-radius: 5px; } -.bs-docs-sidebar .nav > li > a { + +/* All levels of nav */ +.bs-sidebar .nav > li > a { display: block; color: #666; - padding: 4px 25px; + padding: 4px 20px; } -.bs-docs-sidebar .nav > li > a:hover, -.bs-docs-sidebar .nav > li > a:focus { +.bs-sidebar .nav > li > a:hover, +.bs-sidebar .nav > li > a:focus { text-decoration: none; border-right: 1px solid #d5d5d5; } -.bs-docs-sidebar .nav > .active > a, -.bs-docs-sidebar .nav > .active:hover > a, -.bs-docs-sidebar .nav > .active:focus > a { +.bs-sidebar .nav > .active > a, +.bs-sidebar .nav > .active:hover > a, +.bs-sidebar .nav > .active:focus > a { font-weight: 500; color: #b94a48; background-color: transparent; @@ -180,60 +186,20 @@ hr { } /* Nav: second level (shown on .active) */ -.bs-docs-sidebar .nav .nav { +.bs-sidebar .nav .nav { display: none; margin-bottom: 5px; } -.bs-docs-sidebar .nav > .active > ul { +.bs-sidebar .nav > .active > ul { display: block; } -.bs-docs-sidebar .nav .nav > li > a { +.bs-sidebar .nav .nav > li > a { padding-top: 2px; padding-bottom: 2px; padding-left: 40px; font-size: 90%; } -.bs-docs-sidenav-heading { - margin: 0 0 25px; -} -.bs-docs-sidenav-heading a { - display: block; - padding: 15px 25px; - color: #b94a48; - border-bottom: 1px solid #e5e5e5; - box-shadow: 0 1px 0 #fff; -} -.bs-docs-sidenav-heading a:hover { - color: #a3403e; - text-decoration: none; -} - -/* Section headings for groups of links */ -.bs-docs-sidenav > li > .nav-header { - margin-top: 20px; - margin-bottom: 5px; - font-size: 14px; - font-weight: 500; - color: #333; -} -.bs-docs-sidenav > .active > .nav-header, -.bs-docs-sidenav > .active > .nav-header:hover { - color: #333; - border-color: #333; -} - -/* Increase spacing between page nav and other pages */ -.bs-docs-sidenav .nav-divider { - margin-top: 25px; - margin-bottom: 25px; -} - -.bs-docs-sidebar.affix { - top: 50px; - width: 270px; -} - /* Special grid styles @@ -690,6 +656,13 @@ input.focused { /* Tablets and up */ @media screen and (min-width: 768px) { + /* Reaffix the fixed sidebar */ + .bs-sidebar.affix { + position: fixed; /* Undo the static from mobile-first approach */ + top: 50px; + width: 160px; + } + /* Back to top link */ .bs-docs-top { float: left; @@ -726,7 +699,7 @@ input.focused { } /* Show the docs nav */ - .bs-docs-sidebar { + .bs-sidebar { display: block; } @@ -754,6 +727,11 @@ input.focused { /* Tablets/desktops and up */ @media screen and (min-width: 992px) { + /* Widen the fixed sidebar */ + .bs-sidebar.affix { + width: 213px; + } + /* Icons */ .the-icons li { width: 12.5%; @@ -764,4 +742,9 @@ input.focused { /* Large desktops and up */ @media screen and (min-width: 1200px) { + /* Widen the fixed sidebar again */ + .bs-sidebar.affix { + width: 270px; + } + } -- cgit v1.2.3 From 67b7a2fc34431a5db19a906328d772e5fc1af814 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 8 May 2013 22:50:41 -0700 Subject: docs css reorg --- docs/assets/css/docs.css | 83 ++++++++++++++++++++---------------------------- 1 file changed, 34 insertions(+), 49 deletions(-) (limited to 'docs/assets/css/docs.css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 97c998b03..50c600c12 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -10,10 +10,14 @@ body { position: relative; /* For scrollyspy */ - padding-top: 50px; + padding-top: 50px; /* Account for fixed navbar */ } -/* Top nav and header */ + + +/* Top nav and header +-------------------------------------------------- */ + .bs-docs-nav { background-color: #b94a48; } @@ -34,45 +38,6 @@ body { } -hr { - margin-top: 30px; - margin-bottom: 30px; -} - - - -.bs-docs-dl-options h4 { - margin-top: 15px; - margin-bottom: 5px; -} - -/* -.bs-docs-container, -.bs-home-container { - padding-left: 15px; - padding-right: 15px; -} -*/ - -/* Side notes for calling out things */ -.bs-docs-sidenote { - margin: 20px 0; - padding: 15px 30px 15px 15px; - background-color: #fcf2f2; - border-left: 5px solid #df7c7b; -} -.bs-docs-sidenote h4 { - margin-top: 0; -} -.bs-docs-sidenote p:last-child { - margin-bottom: 0; -} -.bs-docs-sidenote code, -.bs-docs-sidenote .highlight { - background-color: #fff; -} - - /* Homepage masthead -------------------------------------------------- */ @@ -202,6 +167,28 @@ hr { +/* Side notes for calling out things +-------------------------------------------------- */ + +.bs-docs-sidenote { + margin: 20px 0; + padding: 15px 30px 15px 15px; + background-color: #fcf2f2; + border-left: 5px solid #df7c7b; +} +.bs-docs-sidenote h4 { + margin-top: 0; +} +.bs-docs-sidenote p:last-child { + margin-bottom: 0; +} +.bs-docs-sidenote code, +.bs-docs-sidenote .highlight { + background-color: #fff; +} + + + /* Special grid styles -------------------------------------------------- */ @@ -407,6 +394,7 @@ hr { } + /* Example templates -------------------------------------------------- */ @@ -629,17 +617,14 @@ input.focused { color: #bebec5; } - - -/* Docs gallery --------------------------------------------------- */ - -.bs-docs-gallery .thumbnail { - max-width: 400px; - margin: 0 auto 20px; +/* Better spacing on download options in getting started */ +.bs-docs-dl-options h4 { + margin-top: 15px; + margin-bottom: 5px; } + /* Responsive variations -------------------------------------------------- */ -- cgit v1.2.3 From e5e5f6616c036bde1fd142c6721e1c5066c11d64 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 8 May 2013 22:51:44 -0700 Subject: .bs-docs-header to .bs-header --- docs/assets/css/docs.css | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'docs/assets/css/docs.css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 50c600c12..ebe87be88 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -89,17 +89,17 @@ body { -------------------------------------------------- */ /* Page headers */ -.bs-docs-header { +.bs-header { padding: 30px 30px 40px; font-size: 16px; color: #5a5a5a; text-align: center; border-bottom: 1px solid #ddd; } -.bs-docs-header h1 { +.bs-header h1 { color: #b94a48; } -.bs-docs-header p { +.bs-header p { font-weight: 300; line-height: 1.5; } @@ -668,11 +668,11 @@ input.focused { bottom: 15px; } - .bs-docs-header { + .bs-header { font-size: 21px; text-align: left; } - .bs-docs-header h1 { + .bs-header h1 { font-size: 60px; line-height: 1; } -- cgit v1.2.3 From 3c3e56ca50571c1efb6632fe39367de246cb3db6 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 8 May 2013 22:52:48 -0700 Subject: .bs-docs-top to .bs-top --- docs/assets/css/docs.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'docs/assets/css/docs.css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index ebe87be88..030abcc86 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -649,7 +649,7 @@ input.focused { } /* Back to top link */ - .bs-docs-top { + .bs-top { float: left; padding: 7px 15px; font-weight: 500; @@ -657,12 +657,12 @@ input.focused { background-color: #eee; border-radius: 4px; } - .bs-docs-top:hover { + .bs-top:hover { color: #fff; text-decoration: none; background-color: #999; } - .bs-docs-top.affix { + .bs-top.affix { position: fixed; right: 15px; bottom: 15px; -- cgit v1.2.3 From 705063c73a9274333a9c5981aeb9cdfb9d443a02 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 8 May 2013 22:54:25 -0700 Subject: .bs-docs-social-* to .bs-social-* --- docs/assets/css/docs.css | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'docs/assets/css/docs.css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 030abcc86..2195c7cb6 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -544,27 +544,26 @@ body { } /* Social proof buttons from GitHub & Twitter */ -.bs-docs-social { +.bs-social { margin-top: 80px; margin-bottom: 20px; } -/* Quick links on Home */ -.bs-docs-social-buttons { +.bs-social-buttons { display: inline-block; margin: 0; list-style: none; } -.bs-docs-social-buttons li { +.bs-social-buttons li { display: inline-block; line-height: 1; } -.bs-docs-social-buttons li + li { +.bs-social-buttons li + li { margin-left: 15px; } -.bs-docs-social-buttons .twitter-follow-button { +.bs-social-buttons .twitter-follow-button { width: 225px !important; } -.bs-docs-social-buttons .twitter-share-button { +.bs-social-buttons .twitter-share-button { width: 98px !important; } -- cgit v1.2.3 From ac28ad81d0b1761c07607c89c0d1dfc6c7caf721 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 8 May 2013 22:55:17 -0700 Subject: .bs-docs-footer to .bs-footer; nuke .bs-docs-container css; remove .bs-docs-container from footer --- docs/assets/css/docs.css | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'docs/assets/css/docs.css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 2195c7cb6..020fba853 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -522,13 +522,13 @@ body { /* Footer -------------------------------------------------- */ -.bs-docs-footer { +.bs-footer { padding-top: 30px; padding-bottom: 30px; margin-top: 100px; border-top: 1px solid #e5e5e5; } -.bs-docs-footer p { +.bs-footer p { margin-bottom: 0; color: #777; } @@ -676,12 +676,6 @@ input.focused { line-height: 1; } - /* Undo custom padding */ - .bs-docs-container { - padding-left: 0; - padding-right: 0; - } - /* Show the docs nav */ .bs-sidebar { display: block; -- cgit v1.2.3 From 09c3a4b3bcb2d7bb6a786854abd0bc17a12c6d39 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 8 May 2013 22:56:29 -0700 Subject: .bs-docs-example to .bs-example --- docs/assets/css/docs.css | 86 ++++++++++++++++++++++++------------------------ 1 file changed, 43 insertions(+), 43 deletions(-) (limited to 'docs/assets/css/docs.css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 020fba853..c0692a4ea 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -211,7 +211,7 @@ body { -------------------------------------------------- */ /* Base class */ -.bs-docs-example { +.bs-example { position: relative; padding: 39px 14px 14px; margin-bottom: -1px; @@ -220,7 +220,7 @@ body { border-top-right-radius: 4px; } /* Echo out a label for the example */ -.bs-docs-example:after { +.bs-example:after { content: "Example"; position: absolute; top: -1px; @@ -236,56 +236,56 @@ body { } /* Tweak display of the examples */ -.bs-docs-example + .prettyprint, -.bs-docs-example + .highlight { +.bs-example + .prettyprint, +.bs-example + .highlight { margin-top: 0; border-top-left-radius: 0; border-top-right-radius: 0; } /* Tweak content of examples for optimum awesome */ -.bs-docs-example > p:last-child, -.bs-docs-example > ul:last-child, -.bs-docs-example > ol:last-child, -.bs-docs-example > blockquote:last-child, -.bs-docs-example > input:last-child, -.bs-docs-example > select:last-child, -.bs-docs-example > textarea:last-child, -.bs-docs-example > .table:last-child, -.bs-docs-example > .jumbotron:last-child, -.bs-docs-example > .alert:last-child, -.bs-docs-example > .panel:last-child, -.bs-docs-example > .list-group:last-child, -.bs-docs-example > .well:last-child { +.bs-example > p:last-child, +.bs-example > ul:last-child, +.bs-example > ol:last-child, +.bs-example > blockquote:last-child, +.bs-example > input:last-child, +.bs-example > select:last-child, +.bs-example > textarea:last-child, +.bs-example > .table:last-child, +.bs-example > .jumbotron:last-child, +.bs-example > .alert:last-child, +.bs-example > .panel:last-child, +.bs-example > .list-group:last-child, +.bs-example > .well:last-child { margin-bottom: 0; } /* Typography */ -.bs-docs-example-type .table td { +.bs-example-type .table td { color: #999; vertical-align: middle; border-color: ; } -.bs-docs-example-type .table td, -.bs-docs-example-type .table th { +.bs-example-type .table td, +.bs-example-type .table th { padding: 15px 0; border-color: #eee; } -.bs-docs-example-type .table tr:first-child td, -.bs-docs-example-type .table tr:first-child th { +.bs-example-type .table tr:first-child td, +.bs-example-type .table tr:first-child th { border-top: 0; } -.bs-docs-example-type h1, -.bs-docs-example-type h2, -.bs-docs-example-type h3, -.bs-docs-example-type h4, -.bs-docs-example-type h5, -.bs-docs-example-type h6 { +.bs-example-type h1, +.bs-example-type h2, +.bs-example-type h3, +.bs-example-type h4, +.bs-example-type h5, +.bs-example-type h6 { margin: 0; } /* List groups */ -.bs-docs-example > .list-group { +.bs-example > .list-group { max-width: 400px; } @@ -331,10 +331,10 @@ body { } /* Example modals */ -.bs-docs-example-modal { +.bs-example-modal { background-color: #f5f5f5; } -.bs-docs-example-modal .modal { +.bs-example-modal .modal { position: relative; top: auto; right: auto; @@ -343,29 +343,29 @@ body { z-index: 1; display: block; } -.bs-docs-example-modal .modal-dialog { +.bs-example-modal .modal-dialog { left: auto; margin-left: auto; margin-right: auto; } /* Example dropdowns */ -.bs-docs-example > .dropdown > .dropdown-menu, -.bs-docs-example-submenu > .pull-left > .dropup > .dropdown-menu, -.bs-docs-example-submenu > .pull-left > .dropdown > .dropdown-menu { +.bs-example > .dropdown > .dropdown-menu, +.bs-example-submenu > .pull-left > .dropup > .dropdown-menu, +.bs-example-submenu > .pull-left > .dropdown > .dropdown-menu { position: static; display: block; margin-bottom: 5px; } -.bs-docs-example-submenu { +.bs-example-submenu { min-height: 230px; } -.bs-docs-example-submenu > .pull-left + .pull-left { +.bs-example-submenu > .pull-left + .pull-left { margin-left: 20px; } /* Example tabbable tabs */ -.bs-docs-example-tabs .nav-tabs { +.bs-example-tabs .nav-tabs { margin-bottom: 15px; } @@ -381,11 +381,11 @@ body { } /* Popovers */ -.bs-docs-example-popover { +.bs-example-popover { padding-bottom: 24px; background-color: #f9f9f9; } -.bs-docs-example-popover .popover { +.bs-example-popover .popover { position: relative; display: block; float: left; @@ -398,10 +398,10 @@ body { /* Example templates -------------------------------------------------- */ -.bs-docs-examples h4 { +.bs-examples h4 { margin-bottom: 5px; } -.bs-docs-examples p { +.bs-examples p { margin-bottom: 20px; } @@ -629,7 +629,7 @@ input.focused { /* Hide code snippets on mobile devices */ @media screen and (max-width: 480px) { - .bs-docs-example { + .bs-example { border-radius: 4px; } .highlight { -- cgit v1.2.3 From 526dfb7735c8bce460b4960ec196f236fcd9d137 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 8 May 2013 22:57:42 -0700 Subject: .bs-docs-tooltip-examples to .bs-example-tooltips --- docs/assets/css/docs.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'docs/assets/css/docs.css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index c0692a4ea..03b2ce29c 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -370,12 +370,12 @@ body { } /* Tooltips */ -.bs-docs-tooltip-examples { +.bs-example-tooltips { text-align: center; margin: 0 0 10px; list-style: none; } -.bs-docs-tooltip-examples li { +.bs-example-tooltips li { display: inline; padding: 0 10px; } -- cgit v1.2.3 From 766be659c15d0fef1c83767504b3aac96af19c1c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 8 May 2013 22:58:54 -0700 Subject: .bs-docs-sidenote to .bs-callout --- docs/assets/css/docs.css | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'docs/assets/css/docs.css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 03b2ce29c..16645011f 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -170,20 +170,20 @@ body { /* Side notes for calling out things -------------------------------------------------- */ -.bs-docs-sidenote { +.bs-callout { margin: 20px 0; padding: 15px 30px 15px 15px; background-color: #fcf2f2; border-left: 5px solid #df7c7b; } -.bs-docs-sidenote h4 { +.bs-callout h4 { margin-top: 0; } -.bs-docs-sidenote p:last-child { +.bs-callout p:last-child { margin-bottom: 0; } -.bs-docs-sidenote code, -.bs-docs-sidenote .highlight { +.bs-callout code, +.bs-callout .highlight { background-color: #fff; } -- cgit v1.2.3 From 7b6352d2cf6f04b46918b1cc8bad50ff92fdbe07 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 9 May 2013 16:41:35 -0700 Subject: Fix up navbar forms by using inline form as a mixin; fix docs for those --- docs/assets/css/docs.css | 1 + 1 file changed, 1 insertion(+) (limited to 'docs/assets/css/docs.css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 16645011f..fcbf723eb 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -252,6 +252,7 @@ body { .bs-example > select:last-child, .bs-example > textarea:last-child, .bs-example > .table:last-child, +.bs-example > .navbar:last-child .bs-example > .jumbotron:last-child, .bs-example > .alert:last-child, .bs-example > .panel:last-child, -- cgit v1.2.3 From 6fba68eb8b036fad1bc4f33484889cccf2480bff Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 9 May 2013 17:20:46 -0700 Subject: Unitless line-height * Instead of 20px as @line-height-base, use 1.5 * Update typographic scale for headings to use unitless as well--required some twerking of decimals a bit and some rounding * Introduce new @line-height-computed value, which takes base font-size and multiplies it by 1.5, for use in padding and margin on components --- docs/assets/css/docs.css | 1 + 1 file changed, 1 insertion(+) (limited to 'docs/assets/css/docs.css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index fcbf723eb..bfbb60d48 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -599,6 +599,7 @@ input.focused { } .highlight pre { padding: 0; + margin-top: 0; margin-bottom: 0; background-color: transparent; border: 0; -- cgit v1.2.3 From e34abd02cc6d0a7d226dd0dc5a5dea59d53757de Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 9 May 2013 17:36:02 -0700 Subject: redo docs footer a bit --- docs/assets/css/docs.css | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'docs/assets/css/docs.css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index bfbb60d48..92ea49d9c 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -52,6 +52,9 @@ body { font-size: 50px; line-height: 1; } +.bs-masthead .bs-social { + margin-top: 80px; +} /* Download button */ .bs-masthead .btn { @@ -524,9 +527,10 @@ body { -------------------------------------------------- */ .bs-footer { - padding-top: 30px; + padding-top: 40px; padding-bottom: 30px; margin-top: 100px; + text-align: center; border-top: 1px solid #e5e5e5; } .bs-footer p { @@ -546,7 +550,6 @@ body { /* Social proof buttons from GitHub & Twitter */ .bs-social { - margin-top: 80px; margin-bottom: 20px; } .bs-social-buttons { -- cgit v1.2.3 From 758cb9d186e3fd9fbc94162d15a5ee0dfb1f9ef9 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 10 May 2013 10:29:54 -0700 Subject: twerk nested nav links --- docs/assets/css/docs.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/assets/css/docs.css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 92ea49d9c..3a93a01cf 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -164,7 +164,7 @@ body { .bs-sidebar .nav .nav > li > a { padding-top: 2px; padding-bottom: 2px; - padding-left: 40px; + padding-left: 30px; font-size: 90%; } -- cgit v1.2.3 From 45f62f9589c50175161b627d0f5b6f34ee8592aa Mon Sep 17 00:00:00 2001 From: Robert Burns Date: Tue, 14 May 2013 08:33:49 -0400 Subject: Cleanup form-inline examples in docs --- docs/assets/css/docs.css | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'docs/assets/css/docs.css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 3a93a01cf..b08437a0e 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -288,6 +288,11 @@ body { margin: 0; } +.bs-example.form-inline input:not([type=checkbox]):not([type=radio]), +.bs-example.form-inline select { + width: 180px; +} + /* List groups */ .bs-example > .list-group { max-width: 400px; -- cgit v1.2.3 From e56c809492b605f2bae242b67ff18fef426e7b7a Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 14 May 2013 22:08:32 -0700 Subject: refined navbar styles in docs --- docs/assets/css/docs.css | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'docs/assets/css/docs.css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 3a93a01cf..36f7cbd45 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -21,12 +21,18 @@ body { .bs-docs-nav { background-color: #b94a48; } -.bs-docs-nav .navbar-brand, +.bs-docs-nav .navbar-brand { + color: #fff; +} .bs-docs-nav .navbar-nav > li > a { + color: #dfc9c8; +} +.bs-docs-nav .navbar-nav > li > a:hover { color: #fff; } .bs-docs-nav .navbar-nav > .active > a, .bs-docs-nav .navbar-nav > .active > a:hover { + color: #fff; background-color: #993c3a; } .bs-docs-nav .navbar-toggle { -- cgit v1.2.3 From 28a081cb20d4e9544967e7c6d5ab31ff4ad68862 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 14 May 2013 23:21:30 -0700 Subject: Overhaul form control and button sizing, and some type styles * New padding approach with separate horizontal and vertical padding variables * Improved sizing in large and small buttons and form controls * Dropped the `.btn-mini` (since we have no `.input-mini` to match, and holy fuck those were small buttons) * Dropped the `.pagination-mini` as well because once again, to hell with such small components * Changed `@line-height-headings` to `@headings-line-height` * Removed the `@headings-font-family` because it was honestly kind of useless --- docs/assets/css/docs.css | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'docs/assets/css/docs.css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 36f7cbd45..7f2526f21 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -294,6 +294,11 @@ body { margin: 0; } +/* Forms */ +.bs-example-control-sizing input[type="text"] + input[type="text"] { + margin-top: 10px; +} + /* List groups */ .bs-example > .list-group { max-width: 400px; -- cgit v1.2.3 From 6307dc40d738653d2fdf8c2316e27586fa8e975f Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 15 May 2013 10:01:09 -0700 Subject: Fixes #7898: ensure button type Sets `type="button"` on all buttons in the docs --- docs/assets/css/docs.css | 3 +++ 1 file changed, 3 insertions(+) (limited to 'docs/assets/css/docs.css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index c2446d0fe..3cc4d97ec 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -269,6 +269,9 @@ body { .bs-example > .well:last-child { margin-bottom: 0; } +.bs-example > .close { + float: none; +} /* Typography */ .bs-example-type .table td { -- cgit v1.2.3 From e5d6a40a7781daea884dc4472e5eb3f1705a8498 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 16 May 2013 19:13:58 -0700 Subject: Redo the responsive utilities stuff * Update docs language * Enforce display: block; on all utilities for now * Fix up docs CSS for the tests --- docs/assets/css/docs.css | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'docs/assets/css/docs.css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 3cc4d97ec..fd40cdafb 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -510,16 +510,14 @@ body { position: relative; float: left; width: 25%; - height: 43px; + padding: 15px 10px; font-size: 14px; font-weight: bold; - line-height: 43px; + line-height: 1.1; color: #999; text-align: center; border: 1px solid #ddd; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; + border-radius: 4px; } .responsive-utilities-test li + li { margin-left: 10px; @@ -530,9 +528,8 @@ body { left: -1px; right: -1px; bottom: -1px; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; + padding: 15px 10px; + border-radius: 4px; } .responsive-utilities-test span { color: #468847; @@ -646,6 +643,10 @@ input.focused { margin-bottom: 5px; } +/* Hide the top link initially */ +.bs-top { + display: none; +} /* Responsive variations @@ -673,6 +674,7 @@ input.focused { /* Back to top link */ .bs-top { + display: block; /* Unhide */ float: left; padding: 7px 15px; font-weight: 500; -- cgit v1.2.3 From af0b9cb41a5d86726c622529c5b8f8a43cd18e45 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 16 May 2013 20:07:41 -0700 Subject: Simple responsive utilities test css --- docs/assets/css/docs.css | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) (limited to 'docs/assets/css/docs.css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index fd40cdafb..e389eaf6e 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -510,28 +510,25 @@ body { position: relative; float: left; width: 25%; - padding: 15px 10px; - font-size: 14px; - font-weight: bold; - line-height: 1.1; - color: #999; - text-align: center; - border: 1px solid #ddd; - border-radius: 4px; } .responsive-utilities-test li + li { margin-left: 10px; } .responsive-utilities-test span { - position: absolute; - top: -1px; - left: -1px; - right: -1px; - bottom: -1px; padding: 15px 10px; + font-size: 14px; + font-weight: bold; + line-height: 1.1; + text-align: center; border-radius: 4px; } -.responsive-utilities-test span { +.responsive-utilities-test.visible-on [class*="hidden"], +.responsive-utilities-test.hidden-on [class*="visible"] { + color: #999; + border: 1px solid #ddd; +} +.responsive-utilities-test.visible-on [class*="visible"], +.responsive-utilities-test.hidden-on [class*="hidden"] { color: #468847; background-color: #dff0d8; border: 1px solid #d6e9c6; -- cgit v1.2.3 From 5f7352a6fe5f7a7eef4dce64184f55d1fec2676b Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 16 May 2013 22:11:31 -0700 Subject: Better grid template; link color change in docs navbar --- docs/assets/css/docs.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/assets/css/docs.css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index e389eaf6e..9221cac1b 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -25,7 +25,7 @@ body { color: #fff; } .bs-docs-nav .navbar-nav > li > a { - color: #dfc9c8; + color: #e6cac8; } .bs-docs-nav .navbar-nav > li > a:hover { color: #fff; -- cgit v1.2.3 From 52a348aa3f5e06e6429f386002f653dac7a35a99 Mon Sep 17 00:00:00 2001 From: Julian Thilo Date: Thu, 23 May 2013 02:30:58 +0200 Subject: Bring the customizer up to speed I reworked the customizer to match the new docs layout and include all newly added variables, etc. Would be glad to keep an eye on Customize and update it as v3 changes. Help blocks in my new version need some more work, too, so this is just a basis. --- docs/assets/css/docs.css | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'docs/assets/css/docs.css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 9221cac1b..ddab6ba6a 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -94,6 +94,29 @@ body { +/* Customize and Download button +-------------------------------------------------- */ + +.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; +} + + + /* Docs pages and sections -------------------------------------------------- */ -- cgit v1.2.3 From acc0875259593d3206a07ac24bf877d0c8c0c8b9 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 22 May 2013 23:34:28 -0700 Subject: fix up customizer js and classes; turn buttons into real buttons --- docs/assets/css/docs.css | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'docs/assets/css/docs.css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index ddab6ba6a..6f7254e82 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -97,6 +97,17 @@ body { /* Customize and Download button -------------------------------------------------- */ +.bs-customizer { + +} +.bs-customizer .toggle { + float: right; +} +.bs-customizer label { + margin-top: 10px; +} + + .bs-customize-download { text-align:center; } -- cgit v1.2.3 From 3160bd872ee02567ae369ad1d940207523cd5a44 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 23 May 2013 21:34:32 -0700 Subject: rearrange customizer content --- docs/assets/css/docs.css | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'docs/assets/css/docs.css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 6f7254e82..305247251 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -105,6 +105,14 @@ body { } .bs-customizer label { margin-top: 10px; + font-weight: 500; + color: #555; +} +.bs-customizer h4 { + margin-top: 15px; +} +.bs-customizer input[type="text"] { + background-color: #fafafa; } -- cgit v1.2.3