From ff6dd0cf56c1b50b7fa7cba35aab4d13cb251f05 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 7 Jun 2012 14:01:03 -0700 Subject: nav and content tweaks --- docs/assets/css/docs.css | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 1e02c299e..88d93e461 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -158,6 +158,7 @@ hr.soften { line-height: 1; } .jumbotron p { + max-width: 780px; margin-bottom: 20px; font-weight: 300; } @@ -772,13 +773,6 @@ form.bs-docs-example { border: 1px solid #d6e9c6; } -/* Grid examples -------------------------- */ -.bs-docs-grid { - width: 940px; - margin-left: -80px; -} - /* Responsive Docs @@ -988,14 +982,13 @@ form.bs-docs-example { /* LARGE DESKTOP SCREENS */ @media (min-width: 1210px) { + .bs-docs-container { + max-width: 970px; + } + /* Update subnav container */ .subnav-fixed .nav { width: 1168px; /* 2px less to account for left/right borders being removed when in fixed mode */ } - .bs-docs-grid { - width: 1170px; - margin-left: -195px; - } - } -- cgit v1.2.3 From c1c7528dd9f0617cb65bc5fac7aa6b2cfc2eb822 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 7 Jun 2012 21:48:03 -0700 Subject: drop the side nav, restore topbar --- docs/assets/css/docs.css | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 88d93e461..fd0a71edb 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; -- cgit v1.2.3 From bba0b34c36ae54e923cf89fe17914e715aaa9746 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 7 Jun 2012 22:10:36 -0700 Subject: restore top navs entirely --- docs/assets/css/docs.css | 38 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 36 insertions(+), 2 deletions(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index fd0a71edb..640dc5cfb 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -39,6 +39,31 @@ li { +/* Tweak navbar brand link to be super sleek +-------------------------------------------------- */ + +.navbar, +.subnav { + font-size: 13px; +} +.navbar-fixed-top .brand { + padding-right: 0; + padding-left: 0; + margin-left: 20px; + float: right; + font-weight: bold; + color: #000; + text-shadow: 0 1px 0 rgba(255,255,255,.1), 0 0 30px rgba(255,255,255,.125); + -webkit-transition: all .2s linear; + -moz-transition: all .2s linear; + transition: all .2s linear; +} +.navbar-fixed-top .brand:hover { + text-decoration: none; +} + + + /* Left nav -------------------------------------------------- */ @@ -150,6 +175,7 @@ hr.soften { ------------------------- */ .jumbotron { position: relative; + text-align: center; } .jumbotron h1 { margin-bottom: 10px; @@ -159,7 +185,6 @@ hr.soften { line-height: 1; } .jumbotron p { - max-width: 780px; margin-bottom: 20px; font-weight: 300; } @@ -179,7 +204,8 @@ hr.soften { /* Masthead (docs home) ------------------------- */ .masthead { - margin-bottom: 60px; + margin-top: 20px; + margin-bottom: 80px; } .masthead h1, .masthead p { @@ -226,11 +252,14 @@ hr.soften { ------------------------- */ /* supporting docs pages */ .subhead { + text-align: left; } .subhead h1 { font-size: 60px; } .subhead .lead { + max-width: 780px; + margin-bottom: 30px; line-height: 25px; } @@ -340,6 +369,7 @@ hr.soften { margin: 36px 0 27px; font-size: 40px; font-weight: 300; + text-align: center; } .marketing h2, .marketing h3 { @@ -366,6 +396,7 @@ hr.soften { font-weight: 300; line-height: 24px; color: #999; + text-align: center; } @@ -600,6 +631,9 @@ h2 + .row { } /* Example sites showcase */ +.example-sites { + margin-left: 20px; +} .example-sites img { max-width: 100%; margin: 0 auto; -- cgit v1.2.3 From 269ce715f1a722a10d0a4a9229bcca8da3aa682a Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 7 Jun 2012 22:24:47 -0700 Subject: overhaul js docs top sections, update subhead --- docs/assets/css/docs.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 640dc5cfb..b5e4cc33c 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -258,9 +258,10 @@ hr.soften { font-size: 60px; } .subhead .lead { - max-width: 780px; margin-bottom: 30px; line-height: 25px; + font-size: 30px; + line-height: 40px; } /* Subnav */ -- cgit v1.2.3 From 550e375af08a5b6ad401c043f8c0d2f3b1d3b6c2 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 8 Jun 2012 16:35:04 -0700 Subject: restore scrollspy to body --- docs/assets/css/docs.css | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index b5e4cc33c..bbf8e339a 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -455,8 +455,12 @@ hr.soften { -moz-box-shadow: 0 1px 2px rgba(0,0,0,.075); box-shadow: 0 1px 2px rgba(0,0,0,.075); } +.mini-layout, +.mini-layout .mini-layout-body, +.mini-layout.fluid .mini-layout-sidebar { + height: 300px; +} .mini-layout { - height: 240px; margin-bottom: 20px; padding: 9px; } @@ -469,7 +473,6 @@ hr.soften { background-color: #dceaf4; margin: 0 auto; width: 70%; - height: 240px; } .mini-layout.fluid .mini-layout-sidebar, .mini-layout.fluid .mini-layout-header, @@ -479,7 +482,6 @@ hr.soften { .mini-layout.fluid .mini-layout-sidebar { background-color: #bbd8e9; width: 20%; - height: 240px; } .mini-layout.fluid .mini-layout-body { width: 77.5%; -- cgit v1.2.3 From aff3694f28946a0640f15dc07591dbfb332fcbaf Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 9 Jun 2012 12:58:55 -0700 Subject: remove mention of prettify from docs, fix docs subnav width when fixed --- docs/assets/css/docs.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index bbf8e339a..18b7f5c9f 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -346,7 +346,7 @@ hr.soften { filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); /* IE6-9 */ } .subnav-fixed .nav { - width: 938px; + max-width: 780px; margin: 0 auto; padding: 0 1px; } @@ -918,7 +918,7 @@ form.bs-docs-example { /* Jumbotron buttons */ .jumbotron .btn { margin-bottom: 10px; - } +av } /* Subnav */ .subnav { @@ -1026,7 +1026,7 @@ form.bs-docs-example { /* Update subnav container */ .subnav-fixed .nav { - width: 1168px; /* 2px less to account for left/right borders being removed when in fixed mode */ + max-width: 970px; /* 2px less to account for left/right borders being removed when in fixed mode */ } } -- cgit v1.2.3 From c65006601e65cbfa23611f55c0af314fc762d84d Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 9 Jun 2012 19:15:46 -0700 Subject: overhaul forms docs to simplify presentation of everything, reduce text, and increase visibility of examples --- docs/assets/css/docs.css | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'docs/assets/css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 18b7f5c9f..4c7a7ddab 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -37,6 +37,12 @@ li { line-height: 25px; } +/* Code in headings */ +h3 code { + font-size: 14px; + font-weight: normal; +} + /* Tweak navbar brand link to be super sleek -- cgit v1.2.3 From f2e39233f54a733df54d5d998abd79233e0f143f Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 10 Jun 2012 15:12:02 -0700 Subject: rewrite alerts and progress bars sections --- docs/assets/css/bootstrap.css | 4 ---- docs/assets/css/docs.css | 5 ++++- 2 files changed, 4 insertions(+), 5 deletions(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index fe957d19f..9803e2a6a 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -3169,10 +3169,6 @@ input[type="submit"].btn.btn-mini { border-radius: 4px; } -.alert-heading { - color: inherit; -} - .alert .close { position: relative; top: -2px; diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 4c7a7ddab..4d65f6b04 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -739,7 +739,10 @@ form.well { .bs-docs-example p:last-child { margin-bottom: 0; } -.bs-docs-example .table { +.bs-docs-example .table, +.bs-docs-example .progress, +.bs-docs-example .well, +.bs-docs-example .alert { margin-bottom: 5px; } form.bs-docs-example { -- cgit v1.2.3 From 3985379ccabcdcf9f96432ba37be2dd38ed117bc Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 10 Jun 2012 15:14:21 -0700 Subject: rearrange hero unit section --- docs/assets/css/docs.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 4d65f6b04..fc9df07e2 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -742,7 +742,8 @@ form.well { .bs-docs-example .table, .bs-docs-example .progress, .bs-docs-example .well, -.bs-docs-example .alert { +.bs-docs-example .alert, +.bs-docs-example .hero-unit { margin-bottom: 5px; } form.bs-docs-example { -- cgit v1.2.3 From 0c817bf5e2ab635777c17e00caed829e6939f34f Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 10 Jun 2012 16:46:46 -0700 Subject: redo pagination and breadcrumbs --- docs/assets/css/docs.css | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index fc9df07e2..83533ea78 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -743,9 +743,13 @@ form.well { .bs-docs-example .progress, .bs-docs-example .well, .bs-docs-example .alert, -.bs-docs-example .hero-unit { +.bs-docs-example .hero-unit, +.bs-docs-example .pagination { margin-bottom: 5px; } +.bs-docs-example .pagination { + margin-top: 0; +} form.bs-docs-example { padding-bottom: 19px; } -- cgit v1.2.3 From 017b7cb804106a14d1a7b6f6b02109dddd4926a2 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 10 Jun 2012 20:39:00 -0700 Subject: rewrite the navbar section --- docs/assets/css/docs.css | 33 ++++++++++++++++++++++++++++++--- 1 file changed, 30 insertions(+), 3 deletions(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 83533ea78..889e3008d 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -52,7 +52,7 @@ h3 code { .subnav { font-size: 13px; } -.navbar-fixed-top .brand { +body > .navbar-fixed-top .brand { padding-right: 0; padding-left: 0; margin-left: 20px; @@ -64,7 +64,7 @@ h3 code { -moz-transition: all .2s linear; transition: all .2s linear; } -.navbar-fixed-top .brand:hover { +body > .navbar-fixed-top .brand:hover { text-decoration: none; } @@ -744,12 +744,39 @@ form.well { .bs-docs-example .well, .bs-docs-example .alert, .bs-docs-example .hero-unit, -.bs-docs-example .pagination { +.bs-docs-example .pagination, +.bs-docs-example .navbar { margin-bottom: 5px; } .bs-docs-example .pagination { margin-top: 0; } +.bs-navbar-top-example, +.bs-navbar-bottom-example { + z-index: 1; + padding: 0; + height: 90px; +} +.bs-navbar-top-example { + -webkit-border-radius: 0 0 4px 4px; + -moz-border-radius: 0 0 4px 4px; + border-radius: 0 0 4px 4px; +} +.bs-navbar-top-example:after { + top: auto; + bottom: -1px; + -webkit-border-radius: 0 4px 0 4px; + -moz-border-radius: 0 4px 0 4px; + border-radius: 0 4px 0 4px; +} +.bs-navbar-bottom-example { + -webkit-border-radius: 4px 4px 0 0; + -moz-border-radius: 4px 4px 0 0; + border-radius: 4px 4px 0 0; +} +.bs-navbar-bottom-example .navbar { + margin-bottom: 0; +} form.bs-docs-example { padding-bottom: 19px; } -- cgit v1.2.3 From a0cd886c56708bbd8d6896ee81b04579f86fb0aa Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 10 Jun 2012 21:24:13 -0700 Subject: rewrite the rest of the nav section --- docs/assets/css/docs.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 889e3008d..d6791ff07 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -745,7 +745,8 @@ form.well { .bs-docs-example .alert, .bs-docs-example .hero-unit, .bs-docs-example .pagination, -.bs-docs-example .navbar { +.bs-docs-example .navbar, +.bs-docs-example .nav { margin-bottom: 5px; } .bs-docs-example .pagination { -- cgit v1.2.3