From f919f6f94f3e8405d7653a5f16f8b3d587c47f4c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 29 Sep 2011 01:40:27 -0700 Subject: huge update to forms, docs for the new forms, added a new link for js example to tabs/pills, add some new mixins --- docs/assets/css/docs.css | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'docs/assets') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index fb727a900..a17fd5692 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -310,8 +310,16 @@ img.large-bird { opacity: .1; } + /* Pretty Print -------------------------------------------------- */ pre.prettyprint { overflow: hidden; -} \ No newline at end of file +} + + +/* Wells +-------------------------------------------------- */ +.well form { + margin-bottom: 0; +} -- cgit v1.2.3 From 9e9109469e5c86c4232cc744639b286bcd9ef0ba Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 16 Oct 2011 03:00:58 -0700 Subject: biiiiiig update coming for responsiveness --- docs/assets/css/docs.css | 71 ++++++++++++++++++++++++++++++++---------------- 1 file changed, 48 insertions(+), 23 deletions(-) (limited to 'docs/assets') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index a17fd5692..52714d199 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -8,8 +8,9 @@ /* Body and structure -------------------------------------------------- */ body { - background-color: #fff; position: relative; + padding-top: 40px; + background-color: #fff; } section { padding-top: 60px; @@ -21,22 +22,29 @@ section > .row { /* Jumbotrons -------------------------------------------------- */ +.jumbotron, +.jumbotron .inner { + -webkit-border-radius: 0 0 6px 6px; + -moz-border-radius: 0 0 6px 6px; + border-radius: 0 0 6px 6px; +} .jumbotron { - min-width: 940px; - padding-top: 40px; + margin-bottom: 40px; + -webkit-box-shadow: inset 0 -1px 0 rgba(0,0,0,.15), 0 1px 3px rgba(0,0,0,.25); + -moz-box-shadow: inset 0 -1px 0 rgba(0,0,0,.15), 0 1px 3px rgba(0,0,0,.25); + box-shadow: inset 0 -1px 0 rgba(0,0,0,.15), 0 1px 3px rgba(0,0,0,.25); } .jumbotron .inner { background: transparent url(../img/grid-18px.png) top center; - padding: 45px 0; - -webkit-box-shadow: inset 0 10px 30px rgba(0,0,0,.3); - -moz-box-shadow: inset 0 10px 30px rgba(0,0,0,.3); -/* box-shadow: inset 0 10px 30px rgba(0,0,0,.3); -*/} + padding: 36px 60px; + -webkit-box-shadow: inset 0 -15px 30px rgba(0,0,0,.1); + -moz-box-shadow: inset 0 -15px 30px rgba(0,0,0,.1); + box-shadow: inset 0 -15px 30px rgba(0,0,0,.1); +} .jumbotron h1, .jumbotron p { margin-bottom: 9px; color: #fff; - text-align: center; text-shadow: 0 1px 1px rgba(0,0,0,.3); } .jumbotron h1 { @@ -46,6 +54,7 @@ section > .row { } .jumbotron p { font-weight: 300; + margin-right: 25%; } .jumbotron .lead { font-size: 20px; @@ -60,14 +69,14 @@ section > .row { ------------------------- */ /* main docs page */ .masthead { - background-color: #049cd9; + background-color: #004d9f; background-repeat: no-repeat; - background-image: -webkit-gradient(linear, left top, left bottom, from(#004D9F), to(#049cd9)); - background-image: -webkit-linear-gradient(#004D9F, #049cd9); - background-image: -moz-linear-gradient(#004D9F, #049cd9); - background-image: -o-linear-gradient(top, #004D9F, #049cd9); - background-image: -khtml-gradient(linear, left top, left bottom, from(#004D9F), to(#049cd9)); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#004D9F', endColorstr='#049cd9', GradientType=0); /* IE8 and down */ + background-image: -webkit-gradient(linear, left top, left bottom, from(#048ccd), to(#004d9f)); + background-image: -webkit-linear-gradient(#048ccd, #004d9f); + background-image: -moz-linear-gradient(#048ccd, #004d9f); + background-image: -o-linear-gradient(top, #048ccd, #004d9f); + background-image: -khtml-gradient(linear, left top, left bottom, from(#048ccd), to(#004d9f)); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#048ccd', endColorstr='#004d9f', GradientType=0); /* IE8 and down */ } /* supporting docs pages */ .subhead { @@ -98,15 +107,9 @@ section > .row { /* Footer -------------------------------------------------- */ .footer { - background-color: #eee; - min-width: 940px; padding: 30px 0; - text-shadow: 0 1px 0 #fff; border-top: 1px solid #e5e5e5; - -webkit-box-shadow: inset 0 5px 15px rgba(0,0,0,.025); - -moz-box-shadow: inset 0 5px 15px rgba(0,0,0,.025); -/* box-shadow: inset 0 5px 15px rgba(0,0,0,.025); -*/} +} .footer p { color: #555; } @@ -323,3 +326,25 @@ pre.prettyprint { .well form { margin-bottom: 0; } + + +/* Responsive Docs +-------------------------------------------------- */ + +/* Tablet to Medium Desktop +------------------------- */ + +@media (min-width: 768px) and (max-width: 900px) { + + .footer, + .jumbotron { + min-width: 748px; + } + .jumbotron .inner h1, + .jumbotron .inner p { + margin-left: 40px; + margin-right: 40px; + } + +} + -- cgit v1.2.3 From 6f44a90edbfc897082dd69630983391bf6e57ba7 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 16 Oct 2011 11:35:24 -0700 Subject: tweak line-height of h2 and h3 to not be gihugeous, updated responsive to improve tablet grid and phone styles --- docs/assets/css/docs.css | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) (limited to 'docs/assets') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 52714d199..fb7482edc 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -231,7 +231,7 @@ section > .row { .mini-layout .mini-layout-body { background-color: #dceaf4; margin: 0 auto; - width: 240px; + width: 70%; height: 240px; } .mini-layout.fluid .mini-layout-sidebar, @@ -241,11 +241,11 @@ section > .row { } .mini-layout.fluid .mini-layout-sidebar { background-color: #bbd8e9; - width: 90px; + width: 20%; height: 240px; } .mini-layout.fluid .mini-layout-body { - width: 300px; + width: 60%; margin-left: 10px; } @@ -328,23 +328,22 @@ pre.prettyprint { } +.browser-support { + max-width: 100%; +} + /* Responsive Docs -------------------------------------------------- */ - -/* Tablet to Medium Desktop -------------------------- */ +@media (max-width: 480px) { + .large-bird { + display: none; + } +} @media (min-width: 768px) and (max-width: 900px) { - .footer, .jumbotron { min-width: 748px; } - .jumbotron .inner h1, - .jumbotron .inner p { - margin-left: 40px; - margin-right: 40px; - } - } -- cgit v1.2.3 From 2a82b38cff142ec86a6e1dc4f9366205260d262d Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 16 Oct 2011 18:01:05 -0700 Subject: tweak the h2s again for better spacing, adjust docs, remove white bg if possible on file input, few other tweaks --- docs/assets/css/docs.css | 99 +++++++++++++++++++++++++++++------------------- 1 file changed, 61 insertions(+), 38 deletions(-) (limited to 'docs/assets') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index fb7482edc..01b6f3cd7 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -9,7 +9,7 @@ -------------------------------------------------- */ body { position: relative; - padding-top: 40px; + padding-top: 100px; background-color: #fff; } section { @@ -19,65 +19,88 @@ section > .row { margin-bottom: 10px; } +/* Tweak topbar brand link to be super sleek +-------------------------------------------------- */ +.navbar .brand { + float: right; + font-weight: bold; + color: #000; + text-shadow: 0 1px 0 rgba(255,255,255,.1); +} +.navbar .brand:hover { + text-decoration: none; +} /* Jumbotrons -------------------------------------------------- */ -.jumbotron, -.jumbotron .inner { - -webkit-border-radius: 0 0 6px 6px; - -moz-border-radius: 0 0 6px 6px; - border-radius: 0 0 6px 6px; -} .jumbotron { - margin-bottom: 40px; - -webkit-box-shadow: inset 0 -1px 0 rgba(0,0,0,.15), 0 1px 3px rgba(0,0,0,.25); - -moz-box-shadow: inset 0 -1px 0 rgba(0,0,0,.15), 0 1px 3px rgba(0,0,0,.25); - box-shadow: inset 0 -1px 0 rgba(0,0,0,.15), 0 1px 3px rgba(0,0,0,.25); -} -.jumbotron .inner { - background: transparent url(../img/grid-18px.png) top center; - padding: 36px 60px; - -webkit-box-shadow: inset 0 -15px 30px rgba(0,0,0,.1); - -moz-box-shadow: inset 0 -15px 30px rgba(0,0,0,.1); - box-shadow: inset 0 -15px 30px rgba(0,0,0,.1); + position: relative; + padding-bottom: 58px; + margin-bottom: 50px; + border-bottom: 2px solid #eee; } .jumbotron h1, .jumbotron p { - margin-bottom: 9px; - color: #fff; - text-shadow: 0 1px 1px rgba(0,0,0,.3); + margin-bottom: 10px; + text-shadow: 0 1px 0 #fff; } .jumbotron h1 { - font-size: 54px; + font-size: 90px; line-height: 1; - text-shadow: 0 1px 2px rgba(0,0,0,.5); + margin-right: 40%; + letter-spacing: -1px; } .jumbotron p { font-weight: 300; - margin-right: 25%; + margin-right: 32%; } .jumbotron .lead { - font-size: 20px; - line-height: 27px; + margin-bottom: 20px; + font-size: 25px; + line-height: 35px; } .jumbotron p a { - color: #fff; font-weight: bold; } +.jumbotron .btn { + font-size: 20px; + padding: 12px 24px; + -webkit-border-radius: 6px; + -moz-border-radius: 6px; + border-radius: 6px; +} +.benefits { + width: 250px; + position: absolute; + right: 0; + bottom: 60px; +} +.benefits ul { + list-style: none; + margin: 0; +} +.benefits li { + font-size: 16px; + font-weight: 300; + line-height: 40px; + color: #555; +} +.benefits li + li { + border-top: 1px solid #f5f5f5; +} +.benefits h4 { + color: #555; +} +.benefits span { + position: relative; + top: -2px; + padding-right: 5px; + color: #999; +} + /* Specific jumbotrons ------------------------- */ -/* main docs page */ -.masthead { - background-color: #004d9f; - background-repeat: no-repeat; - background-image: -webkit-gradient(linear, left top, left bottom, from(#048ccd), to(#004d9f)); - background-image: -webkit-linear-gradient(#048ccd, #004d9f); - background-image: -moz-linear-gradient(#048ccd, #004d9f); - background-image: -o-linear-gradient(top, #048ccd, #004d9f); - background-image: -khtml-gradient(linear, left top, left bottom, from(#048ccd), to(#004d9f)); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#048ccd', endColorstr='#004d9f', GradientType=0); /* IE8 and down */ -} /* supporting docs pages */ .subhead { background-color: #767d80; -- cgit v1.2.3 From 1888511d676ced8f30743cc5b540f02257314bde Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 16 Oct 2011 18:45:11 -0700 Subject: updated docs to include quick links and twitter buttons, added updated blueprint pattern to background --- docs/assets/css/docs.css | 51 +++++++++++++++++++++++++++-------- docs/assets/img/grid-18px-masked.png | Bin 0 -> 1621 bytes 2 files changed, 40 insertions(+), 11 deletions(-) create mode 100644 docs/assets/img/grid-18px-masked.png (limited to 'docs/assets') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 01b6f3cd7..ee0b9c8a3 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -9,8 +9,10 @@ -------------------------------------------------- */ body { position: relative; - padding-top: 100px; + padding-top: 90px; background-color: #fff; + background-image: url(../img/grid-18px-masked.png); + background-repeat: repeat-x; } section { padding-top: 60px; @@ -35,9 +37,6 @@ section > .row { -------------------------------------------------- */ .jumbotron { position: relative; - padding-bottom: 58px; - margin-bottom: 50px; - border-bottom: 2px solid #eee; } .jumbotron h1, .jumbotron p { @@ -57,23 +56,22 @@ section > .row { .jumbotron .lead { margin-bottom: 20px; font-size: 25px; - line-height: 35px; -} -.jumbotron p a { - font-weight: bold; + line-height: 36px; } .jumbotron .btn { font-size: 20px; - padding: 12px 24px; + padding: 14px 24px; -webkit-border-radius: 6px; -moz-border-radius: 6px; border-radius: 6px; } + +/* Benefits list in masthead */ .benefits { width: 250px; position: absolute; right: 0; - bottom: 60px; + bottom: 0; } .benefits ul { list-style: none; @@ -82,7 +80,7 @@ section > .row { .benefits li { font-size: 16px; font-weight: 300; - line-height: 40px; + line-height: 35px; color: #555; } .benefits li + li { @@ -127,6 +125,37 @@ section > .row { } +/* Quick links +-------------------------------------------------- */ +.quick-links { + padding: 5px 20px; + margin: 60px 0; + list-style: none; + text-align: center; + background-color: #eee; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; +} +.quick-links li { + display: inline; + margin: 0 5px; + line-height: 30px; +} +.quick-links .divider { + color: #999; +} +.quick-links strong { + font-weight: normal; + color: #999; +} +.quick-links .tweet-btn, +.quick-links .follow-btn { + position: relative; + top: 5px; +} + + /* Footer -------------------------------------------------- */ .footer { diff --git a/docs/assets/img/grid-18px-masked.png b/docs/assets/img/grid-18px-masked.png new file mode 100644 index 000000000..e531d5bc4 Binary files /dev/null and b/docs/assets/img/grid-18px-masked.png differ -- cgit v1.2.3 From c62a0239bd30a12e9f0d8c1e45f5818460e9df90 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 16 Oct 2011 19:12:33 -0700 Subject: update to responsive to fix new masthead --- docs/assets/css/docs.css | 109 ++++++++++++++--------------------------------- 1 file changed, 32 insertions(+), 77 deletions(-) (limited to 'docs/assets') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index ee0b9c8a3..7d36946db 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -37,34 +37,34 @@ section > .row { -------------------------------------------------- */ .jumbotron { position: relative; -} -.jumbotron h1, -.jumbotron p { - margin-bottom: 10px; text-shadow: 0 1px 0 #fff; } .jumbotron h1 { - font-size: 90px; - line-height: 1; margin-right: 40%; + margin-bottom: 10px; + font-size: 90px; letter-spacing: -1px; + line-height: 1; } .jumbotron p { - font-weight: 300; margin-right: 32%; -} -.jumbotron .lead { margin-bottom: 20px; font-size: 25px; + font-weight: 300; line-height: 36px; } .jumbotron .btn { font-size: 20px; padding: 14px 24px; + margin-right: 5px; -webkit-border-radius: 6px; -moz-border-radius: 6px; border-radius: 6px; } +.jumbotron .download-info { + font-size: 16px; + color: #999; +} /* Benefits list in masthead */ .benefits { @@ -133,9 +133,9 @@ section > .row { list-style: none; text-align: center; background-color: #eee; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; } .quick-links li { display: inline; @@ -167,71 +167,6 @@ section > .row { } -/* Quickstart section for getting le code --------------------------------------------------- */ -.quickstart { - background-color: #f5f5f5; - background-repeat: repeat-x; - background-image: -khtml-gradient(linear, left top, left bottom, from(#f9f9f9), to(#f5f5f5)); - background-image: -moz-linear-gradient(#f9f9f9, #f5f5f5); - background-image: -ms-linear-gradient(#f9f9f9, #f5f5f5); - background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #f9f9f9), color-stop(100%, #f5f5f5)); - background-image: -webkit-linear-gradient(#f9f9f9, #f5f5f5); - background-image: -o-linear-gradient(#f9f9f9, #f5f5f5); - -ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr='#f9f9f9', endColorstr='#f5f5f5', GradientType=0)"; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f9f9f9', endColorstr='#f5f5f5', GradientType=0); - background-image: linear-gradient(#f9f9f9, #f5f5f5); - border-top: 1px solid #fff; - border-bottom: 1px solid #eee; -} -.quickstart .container { - margin-bottom: 0; -} -.quickstart .row { - margin: 0 -20px; - -webkit-box-shadow: 1px 0 0 #f9f9f9; - -moz-box-shadow: 1px 0 0 #f9f9f9; - box-shadow: 1px 0 0 #f9f9f9; -} -.quickstart [class*="span"] { - width: 285px; - height: 117px; - margin-left: 0; - padding: 17px 20px 26px; - border-left: 1px solid #eee; - -webkit-box-shadow: inset 1px 0 0 #f9f9f9; - -moz-box-shadow: inset 1px 0 0 #f9f9f9; - box-shadow: inset 1px 0 0 #f9f9f9; -} -.quickstart [class*="span"]:last-child { - border-right: 1px solid #eee; - width: 286px; -} -.quickstart h6, -.quickstart p { - line-height: 18px; - text-align: center; - margin-bottom: 9px; - color: #333; -} -.quickstart .current-version, -.quickstart .current-version a { - color: #999; -} -.quickstart h6 { - color: #999; -} -.quickstart textarea { - display: block; - width: 275px; - height: auto; - margin: 0 0 9px; - line-height: 21px; - white-space: nowrap; - overflow: hidden; -} - - /* Special grid styles -------------------------------------------------- */ .show-grid { @@ -387,9 +322,29 @@ pre.prettyprint { /* Responsive Docs -------------------------------------------------- */ @media (max-width: 480px) { + + body > .navbar-fixed .nav { + display: none; + } + .large-bird { display: none; } + + .jumbotron h1 { + font-size: 36px; + margin-right: 0; + } + .jumbotron p { + margin-right: 0; + font-size: 18px; + line-height: 24px; + } + .jumbotron .benefits { + position: relative; + width: auto; + margin: 36px 0; + } } @media (min-width: 768px) and (max-width: 900px) { -- cgit v1.2.3 From e7d2218b2043742f21c368d074d97a4bde275730 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 16 Oct 2011 23:04:31 -0700 Subject: few tweaks to responsive stuff, updated docs for grid system (still needs copy editing) --- docs/assets/css/docs.css | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'docs/assets') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 7d36946db..300eb38f5 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -17,19 +17,16 @@ body { section { padding-top: 60px; } -section > .row { - margin-bottom: 10px; -} /* Tweak topbar brand link to be super sleek -------------------------------------------------- */ -.navbar .brand { +body > .navbar-fixed .brand { float: right; font-weight: bold; color: #000; text-shadow: 0 1px 0 rgba(255,255,255,.1); } -.navbar .brand:hover { +body > .navbar-fixed .brand:hover { text-decoration: none; } @@ -136,6 +133,9 @@ section > .row { -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; + -webkit-box-shadow: inset 0 1px 0 rgba(0,0,0,.03); + -moz-box-shadow: inset 0 1px 0 rgba(0,0,0,.03); + box-shadow: inset 0 1px 0 rgba(0,0,0,.03); } .quick-links li { display: inline; @@ -171,10 +171,10 @@ section > .row { -------------------------------------------------- */ .show-grid { margin-top: 10px; - margin-bottom: 10px; + margin-bottom: 20px; } .show-grid [class*="span"] { - background: #eee; + background-color: #eee; text-align: center; -webkit-border-radius: 3px; -moz-border-radius: 3px; -- cgit v1.2.3 From 6d2e39950d98dafbb82e94f00b3c99b82d0ba1c1 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 17 Oct 2011 00:03:52 -0700 Subject: updated js docs page to new 12 column layout, fix subhead jumbotron styles to match new front page --- docs/assets/css/docs.css | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) (limited to 'docs/assets') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 300eb38f5..2af7764e6 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -98,28 +98,16 @@ body > .navbar-fixed .brand:hover { ------------------------- */ /* supporting docs pages */ .subhead { - background-color: #767d80; - background-repeat: no-repeat; - background-image: -webkit-gradient(linear, left top, left bottom, from(#565d60), to(#767d80)); - background-image: -webkit-linear-gradient(#565d60, #767d80); - background-image: -moz-linear-gradient(#565d60, #767d80); - background-image: -o-linear-gradient(top, #565d60, #767d80); - background-image: -khtml-gradient(linear, left top, left bottom, from(#565d60), to(#767d80)); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#565d60', endColorstr='#767d80', GradientType=0); /* IE8 and down */ -} -.subhead .inner { - padding: 36px 0 27px; + padding-bottom: 18px; + border-bottom: 3px solid #eee; } .subhead h1, .subhead p { - text-align: left; + margin-right: 0; } .subhead h1 { font-size: 40px; } -.subhead p a { - font-weight: normal; -} /* Quick links -- cgit v1.2.3 From 27cbe7f63a13fad987dc2547ef5b6f526ceb268c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 17 Oct 2011 14:17:29 -0700 Subject: add abbr styles, overhaul type docs section to remove lots of verbose text and put emphasis on tables and more scannable content --- docs/assets/css/docs.css | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'docs/assets') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 2af7764e6..bbf71ab77 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -307,6 +307,11 @@ pre.prettyprint { max-width: 100%; } +/* Make tables spaced out a bit more */ +h2 + table { + margin-top: 10px; +} + /* Responsive Docs -------------------------------------------------- */ @media (max-width: 480px) { -- cgit v1.2.3 From 369b9720c6090985c678076eebb59c080c0ed27c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 17 Oct 2011 23:45:35 -0700 Subject: adding responsive stuff to docs to stub that out, updated type to make ul and ol margins match p tags --- docs/assets/css/docs.css | 17 ++++++++++++++++- docs/assets/img/responsive-illustrations.png | Bin 0 -> 2249 bytes 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 docs/assets/img/responsive-illustrations.png (limited to 'docs/assets') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index bbf71ab77..2d0b87fe2 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -309,7 +309,7 @@ pre.prettyprint { /* Make tables spaced out a bit more */ h2 + table { - margin-top: 10px; + margin-top: 5px; } /* Responsive Docs @@ -347,3 +347,18 @@ h2 + table { } } + + +.supported-devices { + margin-bottom: 9px; + color: #777; +} +.supported-devices strong { + display: block; + font-size: 14px; + line-height: 18px; +} +.supported-devices small { + font-size: 12px; +} + diff --git a/docs/assets/img/responsive-illustrations.png b/docs/assets/img/responsive-illustrations.png new file mode 100644 index 000000000..c980da77a Binary files /dev/null and b/docs/assets/img/responsive-illustrations.png differ -- cgit v1.2.3 From a5d2450e88693de5e96d9a9f3f4e82853723f764 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 18 Oct 2011 08:11:18 -0700 Subject: refinement to the responsive section --- docs/assets/css/docs.css | 16 ---------------- 1 file changed, 16 deletions(-) (limited to 'docs/assets') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 2d0b87fe2..c1c43b1d8 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -346,19 +346,3 @@ h2 + table { min-width: 748px; } } - - - -.supported-devices { - margin-bottom: 9px; - color: #777; -} -.supported-devices strong { - display: block; - font-size: 14px; - line-height: 18px; -} -.supported-devices small { - font-size: 12px; -} - -- cgit v1.2.3 From 8545fe97877dc275df40ab98d408f21ce9a362cf Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Wed, 19 Oct 2011 21:56:06 -0700 Subject: greatly simply js plugins - remove js api where reasonable --- docs/assets/js/application.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/assets') diff --git a/docs/assets/js/application.js b/docs/assets/js/application.js index 16a20e068..74024caa1 100644 --- a/docs/assets/js/application.js +++ b/docs/assets/js/application.js @@ -1,4 +1,4 @@ -$(document).ready(function(){ +$(function(){ // table sort example // ================== -- cgit v1.2.3 From d4675bf4ef8019fc80e3b6816d3597c07cde81df Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 22 Oct 2011 15:49:42 -0700 Subject: updating the docs to include more responsive fixes, adding rows to the responsive changes as well to undo negative margin --- docs/assets/css/docs.css | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'docs/assets') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index c1c43b1d8..b618c44b8 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -340,9 +340,17 @@ h2 + table { } } -@media (min-width: 768px) and (max-width: 900px) { - .footer, - .jumbotron { - min-width: 748px; +@media (min-width: 768px) and (max-width: 940px) { + + /* Scale down the jumbotron content */ + .jumbotron h1 { + font-size: 72px; + } + + /* Provide enough space on right-hand side for benefits list */ + .jumbotron h1, + .jumbotron p { + margin-right: 40%; } } + -- cgit v1.2.3 From b4c0d2a6b2fe1bc92c3635cda71b63ee08a05be4 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 22 Oct 2011 22:49:37 -0700 Subject: tweaks to the responsive layout to improve type --- docs/assets/css/docs.css | 30 +++++++++++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-) (limited to 'docs/assets') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index b618c44b8..0a31ac998 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -21,6 +21,8 @@ section { /* Tweak topbar brand link to be super sleek -------------------------------------------------- */ body > .navbar-fixed .brand { + padding-right: 0; + padding-left: 0; float: right; font-weight: bold; color: #000; @@ -316,16 +318,24 @@ h2 + table { -------------------------------------------------- */ @media (max-width: 480px) { + /* Hide the nav for now */ body > .navbar-fixed .nav { display: none; } - .large-bird { - display: none; + /* Change up some type stuff */ + h1 small { + display: block; + line-height: 20px; } + /* Adjust the jumbotron */ + .jumbotron h1, + .jumbotron p { + margin-right: 0; + } .jumbotron h1 { - font-size: 36px; + font-size: 45px; margin-right: 0; } .jumbotron p { @@ -338,6 +348,20 @@ h2 + table { width: auto; margin: 36px 0; } + .jumbotron .btn { + font-size: 18px; + padding: 10px 14px; + } + + /* Popovers */ + .large-bird { + display: none; + } + .popover-well .popover-wrapper { + margin-left: 0; + } + + } @media (min-width: 768px) and (max-width: 940px) { -- cgit v1.2.3 From e616026d678239104b93cafca9a77ea74a4c0ddf Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 26 Oct 2011 21:04:14 -0700 Subject: update to docs to cleanup pagination for smartphones, fix some pagination inconsistencies --- docs/assets/css/docs.css | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'docs/assets') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 0a31ac998..59c64e4a7 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -328,10 +328,18 @@ h2 + table { display: block; line-height: 20px; } + /* More space between sections */ + h2 { + margin-top: 27px; + } + h3 { + margin-top: 18px; + } /* Adjust the jumbotron */ .jumbotron h1, .jumbotron p { + text-align: center; margin-right: 0; } .jumbotron h1 { @@ -349,8 +357,15 @@ h2 + table { margin: 36px 0; } .jumbotron .btn { + display: block; font-size: 18px; padding: 10px 14px; + margin: 0 auto 10px; + } + + /* Don't space out quick links so much */ + .quick-links { + margin: 40px 0 0; } /* Popovers */ @@ -361,6 +376,15 @@ h2 + table { margin-left: 0; } + /* Space out the show-grid examples */ + .show-grid [class*="span"] { + margin-bottom: 5px; + } + + /* Unfloat the back to top link in footer */ + .footer .pull-right { + float: none; + } } -- cgit v1.2.3 From 648c4689273647c321dd6e3979d910282e9a9339 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 26 Oct 2011 23:11:56 -0700 Subject: breaking down the main page into subpages for easier, more comprehensive documentation --- docs/assets/css/docs.css | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'docs/assets') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 59c64e4a7..8ed81e713 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -14,9 +14,6 @@ body { background-image: url(../img/grid-18px-masked.png); background-repeat: repeat-x; } -section { - padding-top: 60px; -} /* Tweak topbar brand link to be super sleek -------------------------------------------------- */ @@ -40,7 +37,7 @@ body > .navbar-fixed .brand:hover { } .jumbotron h1 { margin-right: 40%; - margin-bottom: 10px; + margin-bottom: 9px; font-size: 90px; letter-spacing: -1px; line-height: 1; @@ -100,15 +97,15 @@ body > .navbar-fixed .brand:hover { ------------------------- */ /* supporting docs pages */ .subhead { - padding-bottom: 18px; - border-bottom: 3px solid #eee; + padding-bottom: 14px; + border-bottom: 3px solid #e5e5e5; } .subhead h1, .subhead p { margin-right: 0; } .subhead h1 { - font-size: 40px; + font-size: 45px; } -- cgit v1.2.3 From b4c894961c0b75361ead496f1686eb3cf41c5c97 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 26 Oct 2011 23:24:22 -0700 Subject: address issue #414 and fix up a number of docs loose ends --- docs/assets/css/docs.css | 58 ++++++++++-------------------------------------- 1 file changed, 12 insertions(+), 46 deletions(-) (limited to 'docs/assets') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 8ed81e713..3a4dcff1c 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -15,7 +15,7 @@ body { background-repeat: repeat-x; } -/* Tweak topbar brand link to be super sleek +/* Tweak navbar brand link to be super sleek -------------------------------------------------- */ body > .navbar-fixed .brand { padding-right: 0; @@ -29,6 +29,12 @@ body > .navbar-fixed .brand:hover { text-decoration: none; } +/* Space out sub-sections more +-------------------------------------------------- */ +.page-header { + margin-top: 36px; +} + /* Jumbotrons -------------------------------------------------- */ .jumbotron { @@ -92,12 +98,12 @@ body > .navbar-fixed .brand:hover { color: #999; } - /* Specific jumbotrons ------------------------- */ /* supporting docs pages */ .subhead { padding-bottom: 14px; + margin-bottom: 45px; border-bottom: 3px solid #e5e5e5; } .subhead h1, @@ -224,46 +230,6 @@ body > .navbar-fixed .brand:hover { } -/* Topbar special styles --------------------------------------------------- */ -.topbar-wrapper { - position: relative; - height: 40px; - margin: 5px 0 15px; -} -.topbar-wrapper .topbar { - position: absolute; - margin: 0 -20px; -} -.topbar-wrapper .topbar .topbar-inner { - padding-left: 20px; - padding-right: 20px; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} - -/* Topbar in js docs -------------------------- */ -#bootstrap-js .topbar-wrapper { - z-index: 1; -} -#bootstrap-js .topbar-wrapper .topbar { - position: absolute; - margin: 0 -20px; -} -#bootstrap-js .topbar-wrapper .topbar .topbar-inner { - padding-left: 20px; - padding-right: 20px; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} -#bootstrap-js .topbar-wrapper .container { - width: auto; -} - - /* Popover docs -------------------------------------------------- */ .popover-well { @@ -288,15 +254,13 @@ img.large-bird { } -/* Pretty Print +/* Misc -------------------------------------------------- */ + pre.prettyprint { overflow: hidden; } - -/* Wells --------------------------------------------------- */ .well form { margin-bottom: 0; } @@ -311,6 +275,7 @@ h2 + table { margin-top: 5px; } + /* Responsive Docs -------------------------------------------------- */ @media (max-width: 480px) { @@ -385,6 +350,7 @@ h2 + table { } + @media (min-width: 768px) and (max-width: 940px) { /* Scale down the jumbotron content */ -- cgit v1.2.3 From 20b9390a9e3a94dae86af388821aa8f458ba057f Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 27 Oct 2011 09:35:58 -0700 Subject: update docs for responsive --- docs/assets/css/docs.css | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'docs/assets') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 3a4dcff1c..7238badb3 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -351,6 +351,21 @@ h2 + table { } +@media (min-width: 480px) and (max-width: 768px) { + + /* Scale down the jumbotron content */ + .jumbotron h1 { + font-size: 54px; + } + + .jumbotron h1, + .jumbotron p { + margin-right: 40%; + } + +} + + @media (min-width: 768px) and (max-width: 940px) { /* Scale down the jumbotron content */ -- cgit v1.2.3 From f3128d0fa1f1f14104b7c4ffab54f083b99a108e Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 27 Oct 2011 23:00:09 -0700 Subject: overhauled the front page to feel a bit more marketing-like, added the awesome glyphicons to bring some life to the docs --- docs/assets/css/docs.css | 35 +++++++++++++++++++-- .../assets/img/glyphicons/glyphicons_009_magic.png | Bin 0 -> 1426 bytes .../assets/img/glyphicons/glyphicons_042_group.png | Bin 0 -> 1386 bytes .../img/glyphicons/glyphicons_079_podium.png | Bin 0 -> 1328 bytes .../img/glyphicons/glyphicons_082_roundabout.png | Bin 0 -> 1516 bytes .../glyphicons/glyphicons_155_show_thumbnails.png | Bin 0 -> 1179 bytes .../img/glyphicons/glyphicons_163_iphone.png | Bin 0 -> 1235 bytes .../img/glyphicons/glyphicons_214_resize_small.png | Bin 0 -> 1406 bytes .../img/glyphicons/glyphicons_266_book_open.png | Bin 0 -> 1405 bytes 9 files changed, 33 insertions(+), 2 deletions(-) create mode 100644 docs/assets/img/glyphicons/glyphicons_009_magic.png create mode 100644 docs/assets/img/glyphicons/glyphicons_042_group.png create mode 100644 docs/assets/img/glyphicons/glyphicons_079_podium.png create mode 100644 docs/assets/img/glyphicons/glyphicons_082_roundabout.png create mode 100644 docs/assets/img/glyphicons/glyphicons_155_show_thumbnails.png create mode 100644 docs/assets/img/glyphicons/glyphicons_163_iphone.png create mode 100644 docs/assets/img/glyphicons/glyphicons_214_resize_small.png create mode 100644 docs/assets/img/glyphicons/glyphicons_266_book_open.png (limited to 'docs/assets') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 7238badb3..66e87fdf9 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -5,6 +5,7 @@ Special styles for presenting Bootstrap's documentation and examples */ + /* Body and structure -------------------------------------------------- */ body { @@ -15,6 +16,7 @@ body { background-repeat: repeat-x; } + /* Tweak navbar brand link to be super sleek -------------------------------------------------- */ body > .navbar-fixed .brand { @@ -29,12 +31,14 @@ body > .navbar-fixed .brand:hover { text-decoration: none; } + /* Space out sub-sections more -------------------------------------------------- */ .page-header { margin-top: 36px; } + /* Jumbotrons -------------------------------------------------- */ .jumbotron { @@ -119,7 +123,7 @@ body > .navbar-fixed .brand:hover { -------------------------------------------------- */ .quick-links { padding: 5px 20px; - margin: 60px 0; + margin: 45px 0; list-style: none; text-align: center; background-color: #eee; @@ -149,13 +153,40 @@ body > .navbar-fixed .brand:hover { } +/* Marketing section of Overview +-------------------------------------------------- */ +.marketing .row { + margin-bottom: 18px; +} +.marketing h1 { + margin-bottom: 18px; +} +.marketing h2, +.marketing h3 { + font-weight: 300; + color: #000; +} +.marketing h2 { + margin-bottom: 9px; +} +.marketing p { + margin-right: 10px; +} +.marketing img { + float: left; + margin: 7px 10px 0 0; +} + + /* Footer -------------------------------------------------- */ .footer { - padding: 30px 0; + margin-top: 45px; + padding: 35px 0 36px; border-top: 1px solid #e5e5e5; } .footer p { + margin-bottom: 0; color: #555; } diff --git a/docs/assets/img/glyphicons/glyphicons_009_magic.png b/docs/assets/img/glyphicons/glyphicons_009_magic.png new file mode 100644 index 000000000..ef048aaaa Binary files /dev/null and b/docs/assets/img/glyphicons/glyphicons_009_magic.png differ diff --git a/docs/assets/img/glyphicons/glyphicons_042_group.png b/docs/assets/img/glyphicons/glyphicons_042_group.png new file mode 100644 index 000000000..29393dda1 Binary files /dev/null and b/docs/assets/img/glyphicons/glyphicons_042_group.png differ diff --git a/docs/assets/img/glyphicons/glyphicons_079_podium.png b/docs/assets/img/glyphicons/glyphicons_079_podium.png new file mode 100644 index 000000000..f55445451 Binary files /dev/null and b/docs/assets/img/glyphicons/glyphicons_079_podium.png differ diff --git a/docs/assets/img/glyphicons/glyphicons_082_roundabout.png b/docs/assets/img/glyphicons/glyphicons_082_roundabout.png new file mode 100644 index 000000000..bbda0935c Binary files /dev/null and b/docs/assets/img/glyphicons/glyphicons_082_roundabout.png differ diff --git a/docs/assets/img/glyphicons/glyphicons_155_show_thumbnails.png b/docs/assets/img/glyphicons/glyphicons_155_show_thumbnails.png new file mode 100644 index 000000000..1062f4844 Binary files /dev/null and b/docs/assets/img/glyphicons/glyphicons_155_show_thumbnails.png differ diff --git a/docs/assets/img/glyphicons/glyphicons_163_iphone.png b/docs/assets/img/glyphicons/glyphicons_163_iphone.png new file mode 100644 index 000000000..bbb71dceb Binary files /dev/null and b/docs/assets/img/glyphicons/glyphicons_163_iphone.png differ diff --git a/docs/assets/img/glyphicons/glyphicons_214_resize_small.png b/docs/assets/img/glyphicons/glyphicons_214_resize_small.png new file mode 100644 index 000000000..5ecaa72b2 Binary files /dev/null and b/docs/assets/img/glyphicons/glyphicons_214_resize_small.png differ diff --git a/docs/assets/img/glyphicons/glyphicons_266_book_open.png b/docs/assets/img/glyphicons/glyphicons_266_book_open.png new file mode 100644 index 000000000..de084d472 Binary files /dev/null and b/docs/assets/img/glyphicons/glyphicons_266_book_open.png differ -- cgit v1.2.3 From 9fd4e459fe829454c811118c64aa32eafd6e8b97 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 27 Oct 2011 23:34:48 -0700 Subject: adding more icons for the homepage for open source, twitter, and html5/css3 --- docs/assets/css/docs.css | 6 +++++- docs/assets/img/icon-css3.png | Bin 0 -> 1145 bytes docs/assets/img/icon-github.png | Bin 0 -> 1191 bytes docs/assets/img/icon-html5.png | Bin 0 -> 1230 bytes docs/assets/img/icon-twitter.png | Bin 0 -> 1096 bytes 5 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 docs/assets/img/icon-css3.png create mode 100644 docs/assets/img/icon-github.png create mode 100644 docs/assets/img/icon-html5.png create mode 100644 docs/assets/img/icon-twitter.png (limited to 'docs/assets') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 66e87fdf9..79c904774 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -172,10 +172,14 @@ body > .navbar-fixed .brand:hover { .marketing p { margin-right: 10px; } -.marketing img { +.marketing .icon { float: left; margin: 7px 10px 0 0; } +.marketing .small-icon { + float: left; + margin: 4px 5px 0 0; +} /* Footer diff --git a/docs/assets/img/icon-css3.png b/docs/assets/img/icon-css3.png new file mode 100644 index 000000000..eb3651bac Binary files /dev/null and b/docs/assets/img/icon-css3.png differ diff --git a/docs/assets/img/icon-github.png b/docs/assets/img/icon-github.png new file mode 100644 index 000000000..8afcce9cb Binary files /dev/null and b/docs/assets/img/icon-github.png differ diff --git a/docs/assets/img/icon-html5.png b/docs/assets/img/icon-html5.png new file mode 100644 index 000000000..e9066c672 Binary files /dev/null and b/docs/assets/img/icon-html5.png differ diff --git a/docs/assets/img/icon-twitter.png b/docs/assets/img/icon-twitter.png new file mode 100644 index 000000000..98241d098 Binary files /dev/null and b/docs/assets/img/icon-twitter.png differ -- cgit v1.2.3 From 0218d079ad83ce5f8fd08e9f68b6f661855a27a9 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 29 Oct 2011 18:11:17 -0700 Subject: fix some of the docs styles at 480 to 768 --- docs/assets/css/docs.css | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) (limited to 'docs/assets') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 79c904774..52738d808 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -348,11 +348,6 @@ h2 + table { font-size: 18px; line-height: 24px; } - .jumbotron .benefits { - position: relative; - width: auto; - margin: 36px 0; - } .jumbotron .btn { display: block; font-size: 18px; @@ -365,6 +360,23 @@ h2 + table { margin: 40px 0 0; } +} + + +@media (max-width: 768px) { + + /* Hide the nav for now */ + body > .navbar-fixed .nav { + display: none; + } + + /* Adjust the jumbotron */ + .jumbotron .benefits { + position: relative; + width: auto; + margin: 36px 0; + } + /* Popovers */ .large-bird { display: none; @@ -395,7 +407,7 @@ h2 + table { .jumbotron h1, .jumbotron p { - margin-right: 40%; + margin-right: 0; } } -- cgit v1.2.3 From 3f512adf953da3a3fbbfca18b138fb6659f2b77f Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 30 Oct 2011 20:14:27 -0700 Subject: updated docs and type styles for blockquotes and a few fixes for type --- docs/assets/css/docs.css | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'docs/assets') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 52738d808..185f381e9 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -164,7 +164,6 @@ body > .navbar-fixed .brand:hover { .marketing h2, .marketing h3 { font-weight: 300; - color: #000; } .marketing h2 { margin-bottom: 9px; @@ -175,6 +174,7 @@ body > .navbar-fixed .brand:hover { .marketing .icon { float: left; margin: 7px 10px 0 0; + opacity: .8; } .marketing .small-icon { float: left; @@ -300,7 +300,6 @@ pre.prettyprint { margin-bottom: 0; } - .browser-support { max-width: 100%; } -- cgit v1.2.3 From 2534fee7538526e2b4e263258fe62953cf08f159 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 1 Nov 2011 13:56:00 -0700 Subject: adding unofficial github buttons --- docs/assets/css/docs.css | 41 +++++++++++++++++++++++++++++++++++++++- docs/assets/img/github-16px.png | Bin 0 -> 398 bytes 2 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 docs/assets/img/github-16px.png (limited to 'docs/assets') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 185f381e9..2dde6a452 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -39,6 +39,44 @@ body > .navbar-fixed .brand:hover { } +/* Github buttons +-------------------------------------------------- */ +.github-btn + .github-btn { + margin-left: 10px; +} +.github-btn { + display: inline-block; + height: 20px; + overflow: hidden; +} +.github-btn .btn, +.github-btn .count { + float: left; + padding: 1px 5px 1px 4px; + font-size: 11px; + font-weight: normal; + line-height: 16px; + color: #555; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; +} +.github-btn .btn { + box-shadow: none; +} +.github-btn .github-ico { + float: left; + margin-right: 4px; + opacity: .75; +} +.github-btn .count { + display: inline-block; + margin-left: 2px; + background-color: #fff; + border: 1px solid #ddd; +} + + /* Jumbotrons -------------------------------------------------- */ .jumbotron { @@ -59,7 +97,7 @@ body > .navbar-fixed .brand:hover { font-weight: 300; line-height: 36px; } -.jumbotron .btn { +.jumbotron .btn-large { font-size: 20px; padding: 14px 24px; margin-right: 5px; @@ -146,6 +184,7 @@ body > .navbar-fixed .brand:hover { font-weight: normal; color: #999; } +.quick-links .github-btn, .quick-links .tweet-btn, .quick-links .follow-btn { position: relative; diff --git a/docs/assets/img/github-16px.png b/docs/assets/img/github-16px.png new file mode 100644 index 000000000..c99ab237a Binary files /dev/null and b/docs/assets/img/github-16px.png differ -- cgit v1.2.3 From 1fb98bed91977b710ae321443d0819939a1a8cc7 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 12 Nov 2011 00:46:02 -0800 Subject: updated docs pages (still wip), adding misc css classes, added form styles from 1.4, added github buttons to homepage --- docs/assets/css/docs.css | 7 ++++--- docs/assets/img/less-logo-large.png | Bin 0 -> 13831 bytes 2 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 docs/assets/img/less-logo-large.png (limited to 'docs/assets') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 2dde6a452..b503c23e4 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -54,9 +54,10 @@ body > .navbar-fixed .brand:hover { float: left; padding: 1px 5px 1px 4px; font-size: 11px; - font-weight: normal; + font-weight: bold; line-height: 16px; - color: #555; + color: #666; + text-shadow: 0 1px 0 #fff; -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; @@ -67,7 +68,7 @@ body > .navbar-fixed .brand:hover { .github-btn .github-ico { float: left; margin-right: 4px; - opacity: .75; + opacity: .65; } .github-btn .count { display: inline-block; diff --git a/docs/assets/img/less-logo-large.png b/docs/assets/img/less-logo-large.png new file mode 100644 index 000000000..1a739b3e9 Binary files /dev/null and b/docs/assets/img/less-logo-large.png differ -- cgit v1.2.3 From bc65b58551575c9dfb2e4d9f4f7af97009e39432 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sun, 20 Nov 2011 20:58:04 -0800 Subject: merge in js from 1.4... start working through js docs --- docs/assets/css/docs.css | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'docs/assets') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index b503c23e4..cde8ff1e0 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -304,6 +304,13 @@ body > .navbar-fixed .brand:hover { margin-left: 10px; } +/* scrollspy docs */ + +.scrollspy-example { + overflow: auto; + height: 200px; + position: relative; +} /* Popover docs -------------------------------------------------- */ -- cgit v1.2.3 From 98fddaa3557b1c872f1e585d579ec7e5e989e95d Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Fri, 25 Nov 2011 17:23:14 -0800 Subject: new plugin "collapse" for collapsible lists and "accordion" like support --- docs/assets/css/docs.css | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'docs/assets') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index cde8ff1e0..0873d443f 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -473,3 +473,19 @@ h2 + table { } } +#accordion dt a{ + display:block; + padding: 9px 15px; + line-height: 1; + background-color: whiteSmoke; + border: 1px solid #EEE; + border-top-color: #fff; +} + +#accordion dt:first-child a { + border-top-color:#eee; +} + +#accordion dd p { + padding: 10px; +} \ No newline at end of file -- cgit v1.2.3 From b36df463108e2e4df8c389a06f577823564788d9 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 29 Nov 2011 22:35:03 -0800 Subject: misc docs updates, revamped tables CSS save for grid columns and tablesorter options --- docs/assets/css/docs.css | 46 ++++++++++++++++++++++++++++++++++++---------- 1 file changed, 36 insertions(+), 10 deletions(-) (limited to 'docs/assets') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index b503c23e4..6c57fddab 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -41,36 +41,62 @@ body > .navbar-fixed .brand:hover { /* Github buttons -------------------------------------------------- */ -.github-btn + .github-btn { - margin-left: 10px; -} .github-btn { display: inline-block; height: 20px; overflow: hidden; } -.github-btn .btn, -.github-btn .count { +.github-btn .gh-btn, +.github-btn .gh-count, +.github-btn .gh-ico { float: left; +} +.github-btn .gh-btn, +.github-btn .gh-count { padding: 1px 5px 1px 4px; font-size: 11px; font-weight: bold; line-height: 16px; color: #666; text-shadow: 0 1px 0 #fff; + cursor: pointer; +} +.github-btn .gh-btn { + background-color: #e6e6e6; + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6)); + background-image: -webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6); + background-image: -moz-linear-gradient(top, #ffffff, #ffffff 25%, #e6e6e6); + background-image: -ms-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6); + background-image: -o-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6); + background-image: linear-gradient(#ffffff, #ffffff 25%, #e6e6e6); + background-repeat: no-repeat; + border: 1px solid #ccc; + border-bottom-color: #bbb; -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; + -webkit-box-shadow: inset 0 1px 0 rgba(255,255,255,.2); + -moz-box-shadow: inset 0 1px 0 rgba(255,255,255,.2); + box-shadow: inset 0 1px 0 rgba(255,255,255,.2); } -.github-btn .btn { - box-shadow: none; +.github-btn .gh-btn:hover { + color: #333; + text-decoration: none; + background-position: 0 -10px; } -.github-btn .github-ico { - float: left; +.github-btn .gh-btn:active { + -webkit-box-shadow: inset 0 2px 4px rgba(0,0,0,.15); + -moz-box-shadow: inset 0 2px 4px rgba(0,0,0,.15); + box-shadow: inset 0 2px 4px rgba(0,0,0,.15); +} +.github-btn .gh-ico { margin-right: 4px; opacity: .65; } -.github-btn .count { +.github-btn .gh-btn:hover .gh-ico { + opacity: .75; +} +.github-btn .gh-count { display: inline-block; margin-left: 2px; background-color: #fff; -- cgit v1.2.3 From f2c40ee24d0caa26e79ed206370858918c603419 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 30 Nov 2011 00:39:38 -0800 Subject: adding step nav to components --- docs/assets/css/docs.css | 88 ------------------------------------------------ 1 file changed, 88 deletions(-) (limited to 'docs/assets') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index ec3cd83cb..a7b52821e 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -39,71 +39,6 @@ body > .navbar-fixed .brand:hover { } -/* Github buttons --------------------------------------------------- */ -.github-btn { - display: inline-block; - height: 20px; - overflow: hidden; -} -.github-btn .gh-btn, -.github-btn .gh-count, -.github-btn .gh-ico { - float: left; -} -.github-btn .gh-btn, -.github-btn .gh-count { - padding: 1px 5px 1px 4px; - font-size: 11px; - font-weight: bold; - line-height: 16px; - color: #666; - text-shadow: 0 1px 0 #fff; - cursor: pointer; -} -.github-btn .gh-btn { - background-color: #e6e6e6; - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6)); - background-image: -webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6); - background-image: -moz-linear-gradient(top, #ffffff, #ffffff 25%, #e6e6e6); - background-image: -ms-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6); - background-image: -o-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6); - background-image: linear-gradient(#ffffff, #ffffff 25%, #e6e6e6); - background-repeat: no-repeat; - border: 1px solid #ccc; - border-bottom-color: #bbb; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; - -webkit-box-shadow: inset 0 1px 0 rgba(255,255,255,.2); - -moz-box-shadow: inset 0 1px 0 rgba(255,255,255,.2); - box-shadow: inset 0 1px 0 rgba(255,255,255,.2); -} -.github-btn .gh-btn:hover { - color: #333; - text-decoration: none; - background-position: 0 -10px; -} -.github-btn .gh-btn:active { - -webkit-box-shadow: inset 0 2px 4px rgba(0,0,0,.15); - -moz-box-shadow: inset 0 2px 4px rgba(0,0,0,.15); - box-shadow: inset 0 2px 4px rgba(0,0,0,.15); -} -.github-btn .gh-ico { - margin-right: 4px; - opacity: .65; -} -.github-btn .gh-btn:hover .gh-ico { - opacity: .75; -} -.github-btn .gh-count { - display: inline-block; - margin-left: 2px; - background-color: #fff; - border: 1px solid #ddd; -} - - /* Jumbotrons -------------------------------------------------- */ .jumbotron { @@ -330,13 +265,6 @@ body > .navbar-fixed .brand:hover { margin-left: 10px; } -/* scrollspy docs */ - -.scrollspy-example { - overflow: auto; - height: 200px; - position: relative; -} /* Popover docs -------------------------------------------------- */ @@ -499,19 +427,3 @@ h2 + table { } } -#accordion dt a{ - display:block; - padding: 9px 15px; - line-height: 1; - background-color: whiteSmoke; - border: 1px solid #EEE; - border-top-color: #fff; -} - -#accordion dt:first-child a { - border-top-color:#eee; -} - -#accordion dd p { - padding: 10px; -} -- cgit v1.2.3 From b12b71bf7ca76437a532122d8efff59506b61530 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 9 Dec 2011 11:32:07 -0800 Subject: updated to include sub nav and pip nav, new docs updates, topbar nav refinements for media queried settings --- docs/assets/css/docs.css | 15 ++++----------- docs/assets/img/less-small.png | Bin 0 -> 2235 bytes 2 files changed, 4 insertions(+), 11 deletions(-) create mode 100644 docs/assets/img/less-small.png (limited to 'docs/assets') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index a7b52821e..281b224e3 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -315,11 +315,6 @@ h2 + table { -------------------------------------------------- */ @media (max-width: 480px) { - /* Hide the nav for now */ - body > .navbar-fixed .nav { - display: none; - } - /* Change up some type stuff */ h1 small { display: block; @@ -365,11 +360,6 @@ h2 + table { @media (max-width: 768px) { - /* Hide the nav for now */ - body > .navbar-fixed .nav { - display: none; - } - /* Adjust the jumbotron */ .jumbotron .benefits { position: relative; @@ -394,6 +384,9 @@ h2 + table { .footer .pull-right { float: none; } + .footer p { + margin-bottom: 9px; + } } @@ -423,7 +416,7 @@ h2 + table { /* Provide enough space on right-hand side for benefits list */ .jumbotron h1, .jumbotron p { - margin-right: 40%; + margin-right: 20%; } } diff --git a/docs/assets/img/less-small.png b/docs/assets/img/less-small.png new file mode 100644 index 000000000..763b847e8 Binary files /dev/null and b/docs/assets/img/less-small.png differ -- cgit v1.2.3 From 5c8df1d2858c3d5f2cc65a80acaef5312b1ae87f Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 9 Dec 2011 14:34:38 -0800 Subject: updated index page to add featured sites, more docs tweaks --- docs/assets/css/docs.css | 10 +++++++++- docs/assets/img/example-sites/bartop.png | Bin 0 -> 86214 bytes docs/assets/img/example-sites/fleetio.png | Bin 0 -> 47275 bytes docs/assets/img/example-sites/jshint.png | Bin 0 -> 8886 bytes docs/assets/img/example-sites/kippt.png | Bin 0 -> 57064 bytes docs/assets/img/example-sites/railwayjs.png | Bin 0 -> 34839 bytes docs/assets/img/example-sites/totalwireframe.png | Bin 0 -> 47095 bytes 7 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 docs/assets/img/example-sites/bartop.png create mode 100644 docs/assets/img/example-sites/fleetio.png create mode 100644 docs/assets/img/example-sites/jshint.png create mode 100644 docs/assets/img/example-sites/kippt.png create mode 100644 docs/assets/img/example-sites/railwayjs.png create mode 100644 docs/assets/img/example-sites/totalwireframe.png (limited to 'docs/assets') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 281b224e3..73e619d29 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -160,7 +160,10 @@ body > .navbar-fixed .brand:hover { margin-bottom: 18px; } .marketing h1 { - margin-bottom: 18px; + margin: 36px 0 27px; + font-size: 36px; + font-weight: 300; + text-align: center; } .marketing h2, .marketing h3 { @@ -310,6 +313,11 @@ h2 + table { margin-top: 5px; } +/* Example sites showcase */ +.example-sites img { + width: 290px; +} + /* Responsive Docs -------------------------------------------------- */ diff --git a/docs/assets/img/example-sites/bartop.png b/docs/assets/img/example-sites/bartop.png new file mode 100644 index 000000000..962851636 Binary files /dev/null and b/docs/assets/img/example-sites/bartop.png differ diff --git a/docs/assets/img/example-sites/fleetio.png b/docs/assets/img/example-sites/fleetio.png new file mode 100644 index 000000000..b48d6f010 Binary files /dev/null and b/docs/assets/img/example-sites/fleetio.png differ diff --git a/docs/assets/img/example-sites/jshint.png b/docs/assets/img/example-sites/jshint.png new file mode 100644 index 000000000..e532320a3 Binary files /dev/null and b/docs/assets/img/example-sites/jshint.png differ diff --git a/docs/assets/img/example-sites/kippt.png b/docs/assets/img/example-sites/kippt.png new file mode 100644 index 000000000..af15baa11 Binary files /dev/null and b/docs/assets/img/example-sites/kippt.png differ diff --git a/docs/assets/img/example-sites/railwayjs.png b/docs/assets/img/example-sites/railwayjs.png new file mode 100644 index 000000000..2480dd68e Binary files /dev/null and b/docs/assets/img/example-sites/railwayjs.png differ diff --git a/docs/assets/img/example-sites/totalwireframe.png b/docs/assets/img/example-sites/totalwireframe.png new file mode 100644 index 000000000..b6256138e Binary files /dev/null and b/docs/assets/img/example-sites/totalwireframe.png differ -- cgit v1.2.3 From 401f84a7ec65996a8573671b2c17077f85e63e6f Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 11 Dec 2011 01:58:06 -0800 Subject: center example sites in docs on mobile --- docs/assets/css/docs.css | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'docs/assets') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 73e619d29..9324f9990 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -323,6 +323,11 @@ h2 + table { -------------------------------------------------- */ @media (max-width: 480px) { + /* Reduce padding above jumbotron */ + body { + padding-top: 70px; + } + /* Change up some type stuff */ h1 small { display: block; @@ -362,6 +367,21 @@ h2 + table { .quick-links { margin: 40px 0 0; } + /* hide the bullets on mobile since our horizontal space is limited */ + .quick-links .divider { + display: none; + } + + /* center example sites */ + .example-sites { + margin-left: 0; + } + .example-sites a { + float: none; + display: block; + max-width: 300px; + margin: 0 auto 18px; + } } -- cgit v1.2.3 From 4e8c26d409c60f50e2ab245e74ec18af5131d838 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 11 Dec 2011 02:38:58 -0800 Subject: updated buttons docs --- docs/assets/css/docs.css | 1 - 1 file changed, 1 deletion(-) (limited to 'docs/assets') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 9324f9990..7c1e65942 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -382,7 +382,6 @@ h2 + table { max-width: 300px; margin: 0 auto 18px; } - } -- cgit v1.2.3 From d681ae9f51b85d8e1efae2a819ce289266d7efd0 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 12 Dec 2011 09:51:41 -0800 Subject: updated docs to include other less apps --- docs/assets/css/docs.css | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'docs/assets') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 7c1e65942..586b5334b 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -382,6 +382,12 @@ h2 + table { max-width: 300px; margin: 0 auto 18px; } + + table code { + white-space: normal; + word-wrap: break-word; + word-break: break-all; + } } -- cgit v1.2.3 From 7df0d1c7d18a72f401094d08afa4eaa9142fe511 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Wed, 14 Dec 2011 18:45:33 -0800 Subject: rename transitions to transition and fix scrollspy example --- docs/assets/css/docs.css | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'docs/assets') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 586b5334b..fa8c92e50 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -318,6 +318,12 @@ h2 + table { width: 290px; } +.scrollspy-example { + height: 200px; + overflow: auto; + position: relative; +} + /* Responsive Docs -------------------------------------------------- */ -- cgit v1.2.3 From 72a536393c2f2aba4f855384e94c4ce09bc2e39c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 19 Dec 2011 22:58:56 -0800 Subject: mostly docs updates, but also some bug fixes per github issues --- docs/assets/css/docs.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'docs/assets') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 586b5334b..3cf2208e9 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -25,7 +25,7 @@ body > .navbar-fixed .brand { float: right; font-weight: bold; color: #000; - text-shadow: 0 1px 0 rgba(255,255,255,.1); + text-shadow: 0 1px 0 rgba(255,255,255,.1), 0 0 30px rgba(255,255,255,.125); } body > .navbar-fixed .brand:hover { text-decoration: none; @@ -449,7 +449,7 @@ h2 + table { /* Provide enough space on right-hand side for benefits list */ .jumbotron h1, .jumbotron p { - margin-right: 20%; + margin-right: 40%; } } -- cgit v1.2.3 From 0980a33b4703677e1aaf3cd949c0437512fa6f33 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Tue, 20 Dec 2011 19:37:41 -0800 Subject: update all to new on api + add animation support to tabs --- docs/assets/js/application.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/assets') diff --git a/docs/assets/js/application.js b/docs/assets/js/application.js index 74024caa1..dd759bf8b 100644 --- a/docs/assets/js/application.js +++ b/docs/assets/js/application.js @@ -37,7 +37,7 @@ $(function(){ // POSITION STATIC TWIPSIES // ======================== - $(window).bind( 'load resize', function () { + $(window).on('load resize', function () { $(".twipsies a").each(function () { $(this) .twipsy({ -- cgit v1.2.3 From 20aecb983838422c7b43e20960b10d4d79fefaa3 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 21 Dec 2011 16:22:20 -0600 Subject: updated all docs to jQuery 1.7, move all docs JS to application.js, and move dropdowns css to dedicated file --- docs/assets/css/docs.css | 5 +++++ docs/assets/js/application.js | 31 +++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+) (limited to 'docs/assets') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 8432f92ea..5ed38bb47 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -317,6 +317,11 @@ h2 + table { .example-sites img { width: 290px; } +.built-with { + margin: -18px 0 27px; + color: #999; + text-align: center; +} .scrollspy-example { height: 200px; diff --git a/docs/assets/js/application.js b/docs/assets/js/application.js index 74024caa1..255f624be 100644 --- a/docs/assets/js/application.js +++ b/docs/assets/js/application.js @@ -1,5 +1,36 @@ $(function(){ + // Hide the Mobile Safari address bar once loaded + // ============================================== + + window.addEventListener("load",function() { + // Set a timeout... + setTimeout(function(){ + // Hide the address bar! + window.scrollTo(0, 1); + }, 0); + }); + + + // Docs topbar nav + // =============== + + $('.nav .active').click(function(e) { + e.preventDefault(); + $(this).siblings().toggle(); + }); + + + // Show grid dimensions on hover + // ============================= + + $('.show-grid > div').hover(function() { + var width = $(this).width(); + $(this).attr('title', width); + $(this).twipsy(); + }); + + // table sort example // ================== -- cgit v1.2.3 From c854ed167ce37d6a008723c78f2e6336211fff69 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 21 Dec 2011 16:26:21 -0600 Subject: rename media grid to thumbnails, recompile bootstrap, fix examples for mobile phones --- docs/assets/css/docs.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/assets') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 5ed38bb47..20ea50d6f 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -387,7 +387,7 @@ h2 + table { .example-sites { margin-left: 0; } - .example-sites a { + .example-sites > li { float: none; display: block; max-width: 300px; -- cgit v1.2.3 From af5793e1cd358862cf510a54dda2476b95a26ca8 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 21 Dec 2011 16:41:46 -0600 Subject: fix mobile example sites, remove unused JS from docs index --- docs/assets/css/docs.css | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'docs/assets') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 20ea50d6f..b3c464941 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -315,7 +315,7 @@ h2 + table { /* Example sites showcase */ .example-sites img { - width: 290px; + max-width: 290px; } .built-with { margin: -18px 0 27px; @@ -393,6 +393,9 @@ h2 + table { max-width: 300px; margin: 0 auto 18px; } + .example-sites img { + max-width: 270px; + } table code { white-space: normal; -- cgit v1.2.3 From efacac0d6c812abffa8a84a48fa760f5f56c92f0 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Wed, 21 Dec 2011 18:42:43 -0800 Subject: clean up all the js across all the doc pages --- docs/assets/js/application.js | 86 ++++++++++++++++++++++++------------------- 1 file changed, 49 insertions(+), 37 deletions(-) (limited to 'docs/assets') diff --git a/docs/assets/js/application.js b/docs/assets/js/application.js index dd759bf8b..c653233e6 100644 --- a/docs/assets/js/application.js +++ b/docs/assets/js/application.js @@ -1,52 +1,64 @@ $(function(){ - // table sort example - // ================== + // NOTICE!! DO NOT USE ANY OF THIS JAVASCRIPT + // IT'S ALL JUST JUNK FOR OUR DOCS! + // ++++++++++++++++++++++++++++++++++++++++++ - $("#sortTableExample").tablesorter( { sortList: [[ 1, 0 ]] } ) + // make code pretty + prettyPrint && prettyPrint() + // table sort example + if ($.fn.tableSorter) { + $("#sortTableExample").tablesorter( { sortList: [[ 1, 0 ]] } ) + } // add on logic - // ============ - - $('.add-on :checkbox').click(function () { - if ($(this).attr('checked')) { - $(this).parents('.add-on').addClass('active') - } else { - $(this).parents('.add-on').removeClass('active') - } + $('.add-on :checkbox').on('click', function () { + var $this = $(this) + , method = $this.attr('checked') ? 'addClass' : 'removeClass' + $(this).parents('.add-on')[method]('active') }) - // Disable certain links in docs - // ============================= - // Please do not carry these styles over to your projects, it's merely here to prevent button clicks form taking you away from your spot on page + // Please do not carry these styles over to your projects + // it's merely here to prevent button clicks form taking you + // away from your spot on page!! - $('ul.tabs a, ul.pills a, .pagination a, .well .btn, .actions .btn, .alert-message .btn, a.close').click(function (e) { + $('[href^=#]').click(function (e) { e.preventDefault() }) // Copy code blocks in docs - $(".copy-code").focus(function () { - var el = this; - // push select to event loop for chrome :{o - setTimeout(function () { $(el).select(); }, 1); - }); - - - // POSITION STATIC TWIPSIES - // ======================== - - $(window).on('load resize', function () { - $(".twipsies a").each(function () { - $(this) - .twipsy({ - live: false - , placement: $(this).attr('title') - , trigger: 'manual' - , offset: 2 - }) - .twipsy('show') - }) + $(".copy-code").on('focus', function () { + var el = this + setTimeout(function () { $(el).select() }, 0) }) -}); + + if ($.fn.twipsy) { + + // position static twipsies for components page + if ($(".twipsies a").length) { + $(window).on('load resize', function () { + $(".twipsies a").each(function () { + $(this) + .twipsy({ + placement: $(this).attr('title') + , trigger: 'manual' + }) + .twipsy('show') + }) + }) + } + + // add tipsies to grid for scaffolding + if ($('#grid-system').length) { + + $('#grid-system').twipsy({ + selector: '.show-grid > div' + , title: function () { return $(this).width() + 'px' } + }) + + } + } + +}) \ No newline at end of file -- cgit v1.2.3 From 3396fc0542a5fbbed658a95f931472fc24feee56 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Thu, 22 Dec 2011 19:17:41 -0800 Subject: check for prettyprint on window --- docs/assets/js/application.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/assets') diff --git a/docs/assets/js/application.js b/docs/assets/js/application.js index c8e796a39..eae84b138 100644 --- a/docs/assets/js/application.js +++ b/docs/assets/js/application.js @@ -17,7 +17,7 @@ $(function(){ // ================== // make code pretty - prettyPrint && prettyPrint() + window.prettyPrint && prettyPrint() // table sort example if ($.fn.tableSorter) { -- cgit v1.2.3 From 324246e4f964437a2dfa7efbd2d1b6b039369b2c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 27 Dec 2011 12:39:39 -0600 Subject: remove negative margin from .brand in docs, update navbar to support buttons up thurr --- docs/assets/css/docs.css | 1 + 1 file changed, 1 insertion(+) (limited to 'docs/assets') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index b3c464941..c2c92a251 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -22,6 +22,7 @@ body { body > .navbar-fixed .brand { padding-right: 0; padding-left: 0; + margin-left: 20px; float: right; font-weight: bold; color: #000; -- cgit v1.2.3 From fb9401b355366452d310d39f51224999da4daa82 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 5 Jan 2012 01:34:14 -0800 Subject: tweaks abound, updated prettify styles, new sidenav component started, sprite icons started --- docs/assets/css/docs.css | 18 ++++++++++ docs/assets/img/glyphicons-halflings-sprite.png | Bin 0 -> 9944 bytes docs/assets/js/google-code-prettify/prettify.css | 41 +++++++---------------- 3 files changed, 30 insertions(+), 29 deletions(-) create mode 100644 docs/assets/img/glyphicons-halflings-sprite.png (limited to 'docs/assets') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index c2c92a251..b218b465c 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -330,6 +330,24 @@ h2 + table { position: relative; } +/* Icons +------------------------- */ +.the-icons { + +} +.the-icons i { + display: block; + margin-bottom: 5px; + background-color: rgba(255,0,0,.25); +} +.the-icons i:after { + display: block; + content: attr(class); + font-style: normal; + margin-left: 20px; + width: 100px; +} + /* Responsive Docs -------------------------------------------------- */ diff --git a/docs/assets/img/glyphicons-halflings-sprite.png b/docs/assets/img/glyphicons-halflings-sprite.png new file mode 100644 index 000000000..525acee6d Binary files /dev/null and b/docs/assets/img/glyphicons-halflings-sprite.png differ diff --git a/docs/assets/js/google-code-prettify/prettify.css b/docs/assets/js/google-code-prettify/prettify.css index da6b6e7e1..7ff618550 100644 --- a/docs/assets/js/google-code-prettify/prettify.css +++ b/docs/assets/js/google-code-prettify/prettify.css @@ -2,40 +2,23 @@ .lit { color: #195f91; } .pun, .opn, .clo { color: #93a1a1; } .fun { color: #dc322f; } -.str, .atv { color: #268bd2; } -.kwd, .tag { color: #195f91; } -.typ, .atn, .dec, .var { color: #CB4B16; } +.str, .atv { color: #62C462; } +.kwd, .linenums .tag { color: #049CD9; } +.typ, .atn, .dec, .var { color: #EE5F5B; } .pln { color: #93a1a1; } pre.prettyprint { - background: #fefbf3; + background-color: #fefbf3; padding: 9px; - border: 1px solid rgba(0,0,0,.2); - -webkit-box-shadow: 0 1px 2px rgba(0,0,0,.1); - -moz-box-shadow: 0 1px 2px rgba(0,0,0,.1); - box-shadow: 0 1px 2px rgba(0,0,0,.1); + margin-bottom: 9px; +} + +pre.prettyprint { + color: #ccc; + background-color: #252525; } /* Specify class=linenums on a pre to get line numbering */ ol.linenums { margin: 0 0 0 40px; } /* IE indents via margin-left */ -ol.linenums li { color: rgba(0,0,0,.15); line-height: 20px; } +ol.linenums li { color: #444; line-height: 18px; } /* Alternate shading for lines */ -li.L1, li.L3, li.L5, li.L7, li.L9 { } - -/* -$base03: #002b36; -$base02: #073642; -$base01: #586e75; -$base00: #657b83; -$base0: #839496; -$base1: #93a1a1; -$base2: #eee8d5; -$base3: #fdf6e3; -$yellow: #b58900; -$orange: #cb4b16; -$red: #dc322f; -$magenta: #d33682; -$violet: #6c71c4; -$blue: #268bd2; -$cyan: #2aa198; -$green: #859900; -*/ \ No newline at end of file +li.L1, li.L3, li.L5, li.L7, li.L9 { } \ No newline at end of file -- cgit v1.2.3 From 20add59de3f2b69aaa9c9b325dab20b13c75eaa1 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 5 Jan 2012 10:01:42 -0800 Subject: breaking out patterns.less even more, removing unnecessary div from checkbox and radio lists--now just labels and inputs --- docs/assets/css/docs.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/assets') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index b218b465c..a4573448f 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -171,7 +171,7 @@ body > .navbar-fixed .brand:hover { font-weight: 300; } .marketing h2 { - margin-bottom: 9px; + font-size: 22px; } .marketing p { margin-right: 10px; -- cgit v1.2.3 From 23e5fc2133dd748ba4a7df52b598a24a2915811a Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 5 Jan 2012 14:11:41 -0800 Subject: Tweak the docs and address the new forms list of controls: radios and checkboxes are now hanging controls to wrap text properly --- docs/assets/css/docs.css | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'docs/assets') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index a4573448f..9501ec5dc 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -36,7 +36,11 @@ body > .navbar-fixed .brand:hover { /* Space out sub-sections more -------------------------------------------------- */ .page-header { - margin-top: 36px; + margin: 36px 0 18px; + border-bottom: 1px solid #eee; +} +.page-header h1 { + margin-bottom: 9px; } -- cgit v1.2.3 From 621dd13d87b6ba5fd351966056ea335c6a946f45 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 5 Jan 2012 15:43:07 -0800 Subject: move mega link footer to scaffolding to try it out, fix broken button text shadow, change UL/OL margins back, make li color same as body --- docs/assets/css/docs.css | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'docs/assets') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 9501ec5dc..5eafb962b 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -202,6 +202,28 @@ body > .navbar-fixed .brand:hover { margin-bottom: 0; color: #555; } +.footer dl { + margin-bottom: 0; +} +.footer dl dt { + font-size: 11px; + color: #999; + text-transform: uppercase; +} +.footer dl dd + dt { + margin-top: 18px; +} +.footer dl dd { + margin-left: 0; + font-size: 12px; +} +.footer dl a { + color: #999; +} +.footer dl a:hover { + color: #555; +} + /* Special grid styles -- cgit v1.2.3 From 90e3a706ba8c01462516efd3c60cd124620950b9 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 5 Jan 2012 16:03:05 -0800 Subject: add jank js back to docs application.js for responsive dropdown in topbar --- docs/assets/js/application.js | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'docs/assets') diff --git a/docs/assets/js/application.js b/docs/assets/js/application.js index eae84b138..63791bd37 100644 --- a/docs/assets/js/application.js +++ b/docs/assets/js/application.js @@ -4,6 +4,7 @@ $(function(){ // IT'S ALL JUST JUNK FOR OUR DOCS! // ++++++++++++++++++++++++++++++++++++++++++ + // Hide the Mobile Safari address bar once loaded // ============================================== @@ -13,6 +14,16 @@ $(function(){ window.scrollTo(0, 1); }, 0); + + // Docs topbar nav + // =============== + + $('.nav .active').on('click', function (e) { + e.preventDefault() + $(this).siblings().toggle() + }); + + // table sort example // ================== -- cgit v1.2.3 From 314feb702f9a95ee473e529650e16654714cd9f4 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Thu, 5 Jan 2012 18:32:08 -0800 Subject: listen to window for dropdown clear --- docs/assets/js/application.js | 9 --------- 1 file changed, 9 deletions(-) (limited to 'docs/assets') diff --git a/docs/assets/js/application.js b/docs/assets/js/application.js index 63791bd37..6194b88db 100644 --- a/docs/assets/js/application.js +++ b/docs/assets/js/application.js @@ -15,15 +15,6 @@ $(function(){ }, 0); - // Docs topbar nav - // =============== - - $('.nav .active').on('click', function (e) { - e.preventDefault() - $(this).siblings().toggle() - }); - - // table sort example // ================== -- cgit v1.2.3 From c56e9d2d35299b4c9e4e3d1aabcf59cedc9143f2 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 5 Jan 2012 21:43:28 -0800 Subject: massive docs update, mostly to all our new forms, and to the buttons --- docs/assets/css/docs.css | 44 +++++++++++++++++++++++++++++++++++++------ docs/assets/js/application.js | 8 ++++---- 2 files changed, 42 insertions(+), 10 deletions(-) (limited to 'docs/assets') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 5eafb962b..41c7ae4b6 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -36,11 +36,13 @@ body > .navbar-fixed .brand:hover { /* Space out sub-sections more -------------------------------------------------- */ .page-header { - margin: 36px 0 18px; + margin: 45px 0 18px; border-bottom: 1px solid #eee; } .page-header h1 { - margin-bottom: 9px; + margin-bottom: 17px; + font-size: 36px; + line-height: 1; } @@ -327,10 +329,6 @@ pre.prettyprint { overflow: hidden; } -.well form { - margin-bottom: 0; -} - .browser-support { max-width: 100%; } @@ -356,6 +354,40 @@ h2 + table { position: relative; } +/* Remove bottom margin on example forms in wells */ +form.well { + margin-bottom: 0; +} + +/* Tighten up spacing */ +.well hr { + margin: 18px 0; +} + +/* Form docs for horizontal forms */ +.form-docs { + padding-left: 10px; +} +.form-docs h3, +.form-docs p, +.form-docs li { + color: #777; +} +.form-docs hr { + margin: 18px 0; +} + +/* Fake the :focus state to demo it */ +.focused { + border-color: rgba(82,168,236,.8); + -webkit-box-shadow: inset 0 1px 3px rgba(0,0,0,.1), 0 0 8px rgba(82,168,236,.6); + -moz-box-shadow: inset 0 1px 3px rgba(0,0,0,.1), 0 0 8px rgba(82,168,236,.6); + box-shadow: inset 0 1px 3px rgba(0,0,0,.1), 0 0 8px rgba(82,168,236,.6); + outline: 0; +} + + + /* Icons ------------------------- */ .the-icons { diff --git a/docs/assets/js/application.js b/docs/assets/js/application.js index 63791bd37..5fe8b53ef 100644 --- a/docs/assets/js/application.js +++ b/docs/assets/js/application.js @@ -9,10 +9,10 @@ $(function(){ // ============================================== // Set a timeout... - setTimeout(function(){ - // Hide the address bar! - window.scrollTo(0, 1); - }, 0); + // setTimeout(function(){ + // // Hide the address bar! + // window.scrollTo(0, 1); + // }, 0); // Docs topbar nav -- cgit v1.2.3 From 5cb76037ae70ca26a923750ca9441b04d2fbd6a7 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 5 Jan 2012 23:24:19 -0800 Subject: fixing conflict in dividers in navbar, fix navbar docs, fix search form in navbar --- docs/assets/css/docs.css | 1 - 1 file changed, 1 deletion(-) (limited to 'docs/assets') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 41c7ae4b6..6cffcbc20 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -41,7 +41,6 @@ body > .navbar-fixed .brand:hover { } .page-header h1 { margin-bottom: 17px; - font-size: 36px; line-height: 1; } -- cgit v1.2.3 From cfc2353059df628c67d19a3c5c3ead2cc6051f53 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 6 Jan 2012 23:59:22 -0800 Subject: front page docs updated to include old getting started section, update code styles to look like github gists, and lots more docs updates --- docs/assets/css/docs.css | 73 +++++++++++++++++++++++- docs/assets/js/google-code-prettify/prettify.css | 16 ++++-- 2 files changed, 83 insertions(+), 6 deletions(-) (limited to 'docs/assets') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 6cffcbc20..579baad7d 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -192,6 +192,75 @@ body > .navbar-fixed .brand:hover { } +/* Quickstart section for getting le code +-------------------------------------------------- */ +.getting-started { + background-color: #f5f5f5; + background-repeat: repeat-x; + background-image: -khtml-gradient(linear, left top, left bottom, from(#f9f9f9), to(#f5f5f5)); + background-image: -moz-linear-gradient(#f9f9f9, #f5f5f5); + background-image: -ms-linear-gradient(#f9f9f9, #f5f5f5); + background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #f9f9f9), color-stop(100%, #f5f5f5)); + background-image: -webkit-linear-gradient(#f9f9f9, #f5f5f5); + background-image: -o-linear-gradient(#f9f9f9, #f5f5f5); + -ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr='#f9f9f9', endColorstr='#f5f5f5', GradientType=0)"; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f9f9f9', endColorstr='#f5f5f5', GradientType=0); + background-image: linear-gradient(#f9f9f9, #f5f5f5); + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; +} +.getting-started { + border-color: #eee; +} +.getting-started td { + width: 33%; + border-right: 1px solid #eee; +} +.getting-started td + td { + border-left: 1px solid #fff; +} +.getting-started td:last-child { + border-right: 0; +} +.quick-start { + padding: 17px 20px; +} +.quick-start h3, +.quick-start p { + line-height: 18px; + text-align: center; + margin-bottom: 9px; +} +.quick-start p { + color: #777; +} +.quick-start .current-version, +.quick-start .current-version a { + color: #999; +} +.quick-start form { + margin-bottom: 0; +} +.quick-start textarea { + display: block; + width: 100%; + height: auto; + margin-bottom: 0; + line-height: 21px; + white-space: nowrap; + overflow: hidden; + /* Makes inputs behave like true block-level elements */ + -webkit-box-sizing: border-box; /* Older Webkit */ + -moz-box-sizing: border-box; /* Older FF */ + -ms-box-sizing: border-box; /* IE8 */ + box-sizing: border-box; /* CSS3 spec*/ + /* Hacks for IE7 to make this work just okay enough to function */ + *width: 90%; + *height: 24px; +} + + /* Footer -------------------------------------------------- */ .footer { @@ -341,8 +410,10 @@ h2 + table { .example-sites img { max-width: 290px; } -.built-with { +.marketing-byline { margin: -18px 0 27px; + font-size: 18px; + font-weight: 300; color: #999; text-align: center; } diff --git a/docs/assets/js/google-code-prettify/prettify.css b/docs/assets/js/google-code-prettify/prettify.css index 7ff618550..e3bbf8b6c 100644 --- a/docs/assets/js/google-code-prettify/prettify.css +++ b/docs/assets/js/google-code-prettify/prettify.css @@ -2,10 +2,10 @@ .lit { color: #195f91; } .pun, .opn, .clo { color: #93a1a1; } .fun { color: #dc322f; } -.str, .atv { color: #62C462; } -.kwd, .linenums .tag { color: #049CD9; } -.typ, .atn, .dec, .var { color: #EE5F5B; } -.pln { color: #93a1a1; } +.str, .atv { color: #D14; } +.kwd, .linenums .tag { color: #1e347b; } +.typ, .atn, .dec, .var { color: teal; } +.pln { color: #48484c; } pre.prettyprint { background-color: #fefbf3; padding: 9px; @@ -17,8 +17,14 @@ pre.prettyprint { background-color: #252525; } +pre.prettyprint { + padding: 8px; + background-color: #f7f7f9; + border: 1px solid #e1e1e8; +} + /* Specify class=linenums on a pre to get line numbering */ ol.linenums { margin: 0 0 0 40px; } /* IE indents via margin-left */ -ol.linenums li { color: #444; line-height: 18px; } +ol.linenums li { color: #bebec5; line-height: 18px; text-shadow: 0 1px 0 #fff; } /* Alternate shading for lines */ li.L1, li.L3, li.L5, li.L7, li.L9 { } \ No newline at end of file -- cgit v1.2.3 From bcf1136f2c8236cd3fa28eac7e57a9a3fc17d104 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 7 Jan 2012 00:47:53 -0800 Subject: fix form field sizing for selects, document form field grid sizing --- docs/assets/css/docs.css | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'docs/assets') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 579baad7d..1180effd1 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -456,7 +456,11 @@ form.well { outline: 0; } - +/* For input sizes, make them display block */ +.docs-input-sizes input[type=text] { + display: block; + margin-bottom: 9px; +} /* Icons ------------------------- */ -- cgit v1.2.3 From d6a1402f2af5111e11a87a6029b642dc0b814854 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 7 Jan 2012 01:03:26 -0800 Subject: update form shadows and tweak prettyprint styles --- docs/assets/js/google-code-prettify/prettify.css | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) (limited to 'docs/assets') diff --git a/docs/assets/js/google-code-prettify/prettify.css b/docs/assets/js/google-code-prettify/prettify.css index e3bbf8b6c..c2031b594 100644 --- a/docs/assets/js/google-code-prettify/prettify.css +++ b/docs/assets/js/google-code-prettify/prettify.css @@ -21,10 +21,22 @@ pre.prettyprint { padding: 8px; background-color: #f7f7f9; border: 1px solid #e1e1e8; + -webkit-box-shadow: inset 40px 0 0 #fbfbfc, inset 41px 0 0 #ececf0; + -moz-box-shadow: inset 40px 0 0 #fbfbfc, inset 41px 0 0 #ececf0; + box-shadow: inset 40px 0 0 #fbfbfc, inset 41px 0 0 #ececf0; } /* Specify class=linenums on a pre to get line numbering */ -ol.linenums { margin: 0 0 0 40px; } /* IE indents via margin-left */ -ol.linenums li { color: #bebec5; line-height: 18px; text-shadow: 0 1px 0 #fff; } +ol.linenums { + margin: 0 0 0 33px; /* IE indents via margin-left */ +} +ol.linenums li { + padding-left: 7px; + color: #bebec5; + line-height: 18px; + text-shadow: 0 1px 0 #fff; +} /* Alternate shading for lines */ -li.L1, li.L3, li.L5, li.L7, li.L9 { } \ No newline at end of file +li.L1, li.L3, li.L5, li.L7, li.L9 { + +} \ No newline at end of file -- cgit v1.2.3 From 45d671d97f4d448780729bbb6357e9ec776f980c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 7 Jan 2012 01:22:52 -0800 Subject: tweak spacing once more on prettify; add support for uneditable inputs to input-append and prepend --- docs/assets/js/google-code-prettify/prettify.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/assets') diff --git a/docs/assets/js/google-code-prettify/prettify.css b/docs/assets/js/google-code-prettify/prettify.css index c2031b594..f195124a9 100644 --- a/docs/assets/js/google-code-prettify/prettify.css +++ b/docs/assets/js/google-code-prettify/prettify.css @@ -31,7 +31,7 @@ ol.linenums { margin: 0 0 0 33px; /* IE indents via margin-left */ } ol.linenums li { - padding-left: 7px; + padding-left: 12px; color: #bebec5; line-height: 18px; text-shadow: 0 1px 0 #fff; -- cgit v1.2.3 From 8ccc3bcf03fedbe8c3a19a96c08a5cad6ae456e8 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 7 Jan 2012 03:45:24 -0800 Subject: overhauled dropdowns now require use of .caret for dropdown arrow, redid the button group docs section, added the split button dropdown docs section --- docs/assets/css/docs.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'docs/assets') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 1180effd1..c359cf73b 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -402,7 +402,8 @@ pre.prettyprint { } /* Make tables spaced out a bit more */ -h2 + table { +h2 + table, +h2 + .row { margin-top: 5px; } -- cgit v1.2.3 From a339f0051b21f9e51d47c3eb1fd7d37f126e87a0 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 7 Jan 2012 12:22:51 -0800 Subject: fixing tablesorter styles by adding the jquery plugin back to the lib, fixing the docs examples --- docs/assets/js/jquery.tablesorter.js | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 docs/assets/js/jquery.tablesorter.js (limited to 'docs/assets') diff --git a/docs/assets/js/jquery.tablesorter.js b/docs/assets/js/jquery.tablesorter.js new file mode 100644 index 000000000..8ca383e39 --- /dev/null +++ b/docs/assets/js/jquery.tablesorter.js @@ -0,0 +1,3 @@ +(function($){$.extend({tablesorter:new +function(){var parsers=[],widgets=[];this.defaults={cssHeader:"header",cssAsc:"headerSortUp",cssDesc:"headerSortDown",cssChildRow:"expand-child",sortInitialOrder:"asc",sortMultiSortKey:"shiftKey",sortForce:null,sortAppend:null,sortLocaleCompare:true,textExtraction:"simple",parsers:{},widgets:[],widgetZebra:{css:["even","odd"]},headers:{},widthFixed:false,cancelSelection:true,sortList:[],headerList:[],dateFormat:"us",decimal:'/\.|\,/g',onRenderHeader:null,selectorHeaders:'thead th',debug:false};function benchmark(s,d){log(s+","+(new Date().getTime()-d.getTime())+"ms");}this.benchmark=benchmark;function log(s){if(typeof console!="undefined"&&typeof console.debug!="undefined"){console.log(s);}else{alert(s);}}function buildParserCache(table,$headers){if(table.config.debug){var parsersDebug="";}if(table.tBodies.length==0)return;var rows=table.tBodies[0].rows;if(rows[0]){var list=[],cells=rows[0].cells,l=cells.length;for(var i=0;i1){arr=arr.concat(checkCellColSpan(table,headerArr,row++));}else{if(table.tHead.length==1||(cell.rowSpan>1||!r[row+1])){arr.push(cell);}}}return arr;};function checkHeaderMetadata(cell){if(($.metadata)&&($(cell).metadata().sorter===false)){return true;};return false;}function checkHeaderOptions(table,i){if((table.config.headers[i])&&(table.config.headers[i].sorter===false)){return true;};return false;}function checkHeaderOptionsSortingLocked(table,i){if((table.config.headers[i])&&(table.config.headers[i].lockedOrder))return table.config.headers[i].lockedOrder;return false;}function applyWidget(table){var c=table.config.widgets;var l=c.length;for(var i=0;i');$("tr:first td",table.tBodies[0]).each(function(){colgroup.append($('').css('width',$(this).width()));});$(table).prepend(colgroup);};}function updateHeaderSortCount(table,sortList){var c=table.config,l=sortList.length;for(var i=0;i b["+i+"]) ? 1 : 0));";};function makeSortTextDesc(i){return"((b["+i+"] < a["+i+"]) ? -1 : ((b["+i+"] > a["+i+"]) ? 1 : 0));";};function makeSortNumeric(i){return"a["+i+"]-b["+i+"];";};function makeSortNumericDesc(i){return"b["+i+"]-a["+i+"];";};function sortText(a,b){if(table.config.sortLocaleCompare)return a.localeCompare(b);return((ab)?1:0));};function sortTextDesc(a,b){if(table.config.sortLocaleCompare)return b.localeCompare(a);return((ba)?1:0));};function sortNumeric(a,b){return a-b;};function sortNumericDesc(a,b){return b-a;};function getCachedSortType(parsers,i){return parsers[i].type;};this.construct=function(settings){return this.each(function(){if(!this.tHead||!this.tBodies)return;var $this,$document,$headers,cache,config,shiftDown=0,sortOrder;this.config={};config=$.extend(this.config,$.tablesorter.defaults,settings);$this=$(this);$.data(this,"tablesorter",config);$headers=buildHeaders(this);this.config.parsers=buildParserCache(this,$headers);cache=buildCache(this);var sortCSS=[config.cssDesc,config.cssAsc];fixColumnWidth(this);$headers.click(function(e){var totalRows=($this[0].tBodies[0]&&$this[0].tBodies[0].rows.length)||0;if(!this.sortDisabled&&totalRows>0){$this.trigger("sortStart");var $cell=$(this);var i=this.column;this.order=this.count++%2;if(this.lockedOrder)this.order=this.lockedOrder;if(!e[config.sortMultiSortKey]){config.sortList=[];if(config.sortForce!=null){var a=config.sortForce;for(var j=0;j0){$this.trigger("sorton",[config.sortList]);}applyWidget(this);});};this.addParser=function(parser){var l=parsers.length,a=true;for(var i=0;i Date: Sat, 7 Jan 2012 20:40:28 -0800 Subject: overhaul the entire tabs component structure and docs; remove side nav and make it a nav list to build on new .nav base class --- docs/assets/js/google-code-prettify/prettify.css | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) (limited to 'docs/assets') diff --git a/docs/assets/js/google-code-prettify/prettify.css b/docs/assets/js/google-code-prettify/prettify.css index f195124a9..0d54905fb 100644 --- a/docs/assets/js/google-code-prettify/prettify.css +++ b/docs/assets/js/google-code-prettify/prettify.css @@ -6,21 +6,13 @@ .kwd, .linenums .tag { color: #1e347b; } .typ, .atn, .dec, .var { color: teal; } .pln { color: #48484c; } -pre.prettyprint { - background-color: #fefbf3; - padding: 9px; - margin-bottom: 9px; -} - -pre.prettyprint { - color: #ccc; - background-color: #252525; -} -pre.prettyprint { +.prettyprint { padding: 8px; background-color: #f7f7f9; border: 1px solid #e1e1e8; +} +.prettyprint.linenums { -webkit-box-shadow: inset 40px 0 0 #fbfbfc, inset 41px 0 0 #ececf0; -moz-box-shadow: inset 40px 0 0 #fbfbfc, inset 41px 0 0 #ececf0; box-shadow: inset 40px 0 0 #fbfbfc, inset 41px 0 0 #ececf0; -- cgit v1.2.3 From cb9be7bd0cde19b3b401d2dcdfb6162dd00b5ab5 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 8 Jan 2012 13:21:44 -0800 Subject: clean up dup css in responsive, fix navbar dropdown caret --- docs/assets/css/docs.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/assets') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index c359cf73b..f37067203 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -163,7 +163,7 @@ body > .navbar-fixed .brand:hover { /* Marketing section of Overview -------------------------------------------------- */ .marketing .row { - margin-bottom: 18px; + margin-bottom: 9px; } .marketing h1 { margin: 36px 0 27px; -- cgit v1.2.3 From 6f2f947a4309a8fdeb7067612447c0f1a15dcfd9 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Wed, 11 Jan 2012 21:42:55 -0800 Subject: add build tool for js + rename twipsy to tooltip + lots of little doc cleanup --- docs/assets/css/docs.css | 9 ++++- docs/assets/js/application.js | 83 ++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 87 insertions(+), 5 deletions(-) (limited to 'docs/assets') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index f37067203..134224e56 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -466,7 +466,7 @@ form.well { /* Icons ------------------------- */ .the-icons { - + } .the-icons i { display: block; @@ -481,6 +481,13 @@ form.well { width: 100px; } +#javascript input[type='checkbox'] { +display: inline; +margin-left: 6px; +position: relative; +top: -1px; +} + /* Responsive Docs -------------------------------------------------- */ diff --git a/docs/assets/js/application.js b/docs/assets/js/application.js index c31fc97a0..0e14a5350 100644 --- a/docs/assets/js/application.js +++ b/docs/assets/js/application.js @@ -48,18 +48,18 @@ $(function(){ setTimeout(function () { $(el).select() }, 0) }) - if ($.fn.twipsy) { + if ($.fn.tooltip) { // position static twipsies for components page if ($(".twipsies a").length) { $(window).on('load resize', function () { $(".twipsies a").each(function () { $(this) - .twipsy({ + .tooltip({ placement: $(this).attr('title') , trigger: 'manual' }) - .twipsy('show') + .tooltip('show') }) }) } @@ -67,7 +67,7 @@ $(function(){ // add tipsies to grid for scaffolding if ($('#grid-system').length) { - $('#grid-system').twipsy({ + $('#grid-system').tooltip({ selector: '.show-grid > div' , title: function () { return $(this).width() + 'px' } }) @@ -75,4 +75,79 @@ $(function(){ } } + // javascript build logic + + var inputs = $("#javascript input") + + // toggle all plugin checkboxes + $('#selectAll').on('click', function (e) { + e.preventDefault() + inputs.attr('checked', !inputs.is(':checked')) + }) + + // handle build button dropdown + var buildTypes = $('#javascriptBuilder .dropdown-menu li').on('click', function () { + buildTypes.removeClass('active') + $(this).addClass('active') + }) + + // request built javascript + $('#javascriptBuild').on('click', function () { + + var names = $("#javascript input:checked") + .map(function () { return this.value }) + .toArray() + + if (names[names.length - 1] == 'bootstrap-transition.js') { + names.unshift(names.pop()) + } + + $.ajax({ + type: 'POST' + , dataType: 'jsonpi' + , params: { + branch: '2.0-wip' + , dir: 'js' + , filenames: names + , compress: buildTypes.first().hasClass('active') + } + , url: "http://bootstrap.herokuapp.com" + }) + }) + }) + + +// Modified from the original jsonpi https://github.com/benvinegar/jquery-jsonpi +// by the talented Ben Vinegar +!function($) { + $.ajaxTransport('jsonpi', function(opts, originalOptions, jqXHR) { + var url = opts.url; + + return { + send: function(_, completeCallback) { + var name = 'jQuery_iframe_' + jQuery.now(), + iframe, form; + + iframe = $('