diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 66c4a6f0..c23f7dbb 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -33,12 +33,13 @@ body > .navbar { /* Change the docs' brand */ body > .navbar .brand { padding-right: 0; - padding-left: 0; + padding-left: 65px; margin-left: 20px; float: right; font-weight: bold; color: #000; text-shadow: 0 1px 0 rgba(255,255,255,.1), 0 0 30px rgba(255,255,255,.125); + background: url("../img/jasny-logo.png") no-repeat scroll -85px -200px transparent; -webkit-transition: all .2s linear; -moz-transition: all .2s linear; transition: all .2s linear; @@ -48,6 +49,11 @@ body > .navbar .brand:hover { text-shadow: 0 1px 0 rgba(255,255,255,.1), 0 0 30px rgba(255,255,255,.4); } +.extended-badge { + position: absolute; + top: 30px; + right: 30px; +} /* Sections -------------------------------------------------- */ @@ -93,14 +99,14 @@ hr.soften { color: #fff; text-align: center; text-shadow: 0 1px 3px rgba(0,0,0,.4), 0 0 30px rgba(0,0,0,.075); - background: #020031; /* Old browsers */ - background: -moz-linear-gradient(45deg, #020031 0%, #6d3353 100%); /* FF3.6+ */ - background: -webkit-gradient(linear, left bottom, right top, color-stop(0%,#020031), color-stop(100%,#6d3353)); /* Chrome,Safari4+ */ - background: -webkit-linear-gradient(45deg, #020031 0%,#6d3353 100%); /* Chrome10+,Safari5.1+ */ - background: -o-linear-gradient(45deg, #020031 0%,#6d3353 100%); /* Opera 11.10+ */ - background: -ms-linear-gradient(45deg, #020031 0%,#6d3353 100%); /* IE10+ */ - background: linear-gradient(45deg, #020031 0%,#6d3353 100%); /* W3C */ - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#020031', endColorstr='#6d3353',GradientType=1 ); /* IE6-9 fallback on horizontal gradient */ + background: #620d0A; /* Old browsers */ + background: -moz-linear-gradient(45deg, #a51217 0%, #2f0800 100%); /* FF3.6+ */ + background: -webkit-gradient(linear, left bottom, right top, color-stop(0%,#a51217), color-stop(100%,#2f0800)); /* Chrome,Safari4+ */ + background: -webkit-linear-gradient(45deg, #a51217 0%,#2f0800 100%); /* Chrome10+,Safari5.1+ */ + background: -o-linear-gradient(45deg, #a51217 0%,#2f0800 100%); /* Opera 11.10+ */ + background: -ms-linear-gradient(45deg, #a51217 0%,#2f0800 100%); /* IE10+ */ + background: linear-gradient(45deg, #a51217 0%,#2f0800 100%); /* W3C */ + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#a51217', endColorstr='#2f0800',GradientType=1 ); /* IE6-9 fallback on horizontal gradient */ -webkit-box-shadow: inset 0 3px 7px rgba(0,0,0,.2), inset 0 -3px 7px rgba(0,0,0,.2); -moz-box-shadow: inset 0 3px 7px rgba(0,0,0,.2), inset 0 -3px 7px rgba(0,0,0,.2); box-shadow: inset 0 3px 7px rgba(0,0,0,.2), inset 0 -3px 7px rgba(0,0,0,.2); @@ -143,34 +149,38 @@ hr.soften { to { box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 5px rgba(0,0,0,.25), 0 2px 10px rgba(0,68,204,.5); } } .masthead .btn { - padding: 14px 24px; + padding: 20px 24px 14px 24px; font-size: 24px; + line-height: 20px; font-weight: 200; color: #fff; /* redeclare to override the `.jumbotron a` */ border: 0; -webkit-border-radius: 6px; -moz-border-radius: 6px; border-radius: 6px; - -webkit-box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 5px rgba(0,0,0,.25), 0 2px 10px rgba(0,68,204,.01); - -moz-box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 5px rgba(0,0,0,.25), 0 2px 10px rgba(0,68,204,.01); - box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 5px rgba(0,0,0,.25), 0 2px 10px rgba(0,68,204,.01); - -webkit-animation-name: downloadButton; - -moz-animation-name: downloadButton; - -webkit-animation-duration: 1.5s; - -moz-animation-duration: 1.5s; - -webkit-animation-iteration-count: infinite; - -moz-animation-iteration-count: infinite; -webkit-transition: none; -moz-transition: none; transition: none; } +.masthead .btn-primary { + -webkit-box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 5px rgba(0,0,0,.25), 0 2px 10px rgba(0,68,204,.5); + -moz-box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 5px rgba(0,0,0,.25), 0 2px 10px rgba(0,68,204,.5); + box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 5px rgba(0,0,0,.25), 0 2px 10px rgba(0,68,204,.5); +} +.masthead .btn-warning { + -webkit-box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 5px rgba(0,0,0,.25), 0 2px 10px rgba(248,148,6,.4); + -moz-box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 5px rgba(0,0,0,.25), 0 2px 10px rgba(248,148,6,.4); + box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 5px rgba(0,0,0,.25), 0 2px 10px rgba(248,148,6,.4); +} .masthead .btn:active { -webkit-box-shadow: inset 0 2px 4px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.1); -moz-box-shadow: inset 0 2px 4px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.1); box-shadow: inset 0 2px 4px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.1); } - +.masthead .btn small { + font-size: 60%; +} /* Pattern overlay ------------------------- */ @@ -207,6 +217,9 @@ hr.soften { font-weight: 200; line-height: 1.25; } +.masthead .container { + background: transparent url(../img/jasny-logo-emboss.png) no-repeat left bottom; +} /* Textual links in masthead */ .masthead-links { @@ -264,10 +277,12 @@ hr.soften { /* Marketing section of Overview -------------------------------------------------- */ +.changes, .marketing { text-align: center; color: #5a5a5a; } +.changes h1, .marketing h1 { margin: 60px 0 10px; font-size: 60px; @@ -275,6 +290,7 @@ hr.soften { line-height: 1; letter-spacing: -1px; } +.changes h2, .marketing h2 { font-weight: 200; margin-bottom: 5px; @@ -283,6 +299,10 @@ hr.soften { font-size: 16px; line-height: 1.5; } +.changes .row { + margin-bottom: 9px; +} +.changes .marketing-byline, .marketing .marketing-byline { margin-bottom: 40px; font-size: 20px; @@ -855,6 +875,11 @@ form.bs-docs-example { padding-right: 10px; } + .extended-badge { + top: 10px; + right: 10px; + } + /* Inline-block quick links for more spacing */ .quick-links li { display: inline-block; @@ -898,6 +923,10 @@ form.bs-docs-example { padding-top: 0; } + .extended-badge { + width: 100px; + } + /* Widen masthead and social buttons to fill body padding */ .jumbotron { padding: 40px 20px; @@ -955,6 +984,10 @@ form.bs-docs-example { padding-top: 0; } + .extended-badge { + display: none; + } + /* Change up some type stuff */ h2 small { display: block; @@ -970,7 +1003,7 @@ form.bs-docs-example { } .jumbotron .btn { display: block; - margin: 0 auto; + margin: 0 auto 10px auto; } /* center align subhead text like the masthead */ diff --git a/docs/assets/img/bs-docs-bootstrap-features.png b/docs/assets/img/bs-docs-bootstrap-features.png index d02c5ca6..9444afd3 100644 Binary files a/docs/assets/img/bs-docs-bootstrap-features.png and b/docs/assets/img/bs-docs-bootstrap-features.png differ diff --git a/docs/assets/img/bs-docs-responsive-illustrations.png b/docs/assets/img/bs-docs-responsive-illustrations.png index 66b564b3..842f8bc3 100644 Binary files a/docs/assets/img/bs-docs-responsive-illustrations.png and b/docs/assets/img/bs-docs-responsive-illustrations.png differ diff --git a/docs/assets/img/bs-docs-twitter-github.png b/docs/assets/img/bs-docs-twitter-github.png index e49eb46e..f5f4f0e4 100644 Binary files a/docs/assets/img/bs-docs-twitter-github.png and b/docs/assets/img/bs-docs-twitter-github.png differ diff --git a/docs/assets/img/extended-by-jasny.png b/docs/assets/img/extended-by-jasny.png new file mode 100644 index 00000000..46e1d0bf Binary files /dev/null and b/docs/assets/img/extended-by-jasny.png differ diff --git a/docs/assets/img/jasny-logo-emboss.png b/docs/assets/img/jasny-logo-emboss.png new file mode 100644 index 00000000..d1d6e8aa Binary files /dev/null and b/docs/assets/img/jasny-logo-emboss.png differ diff --git a/docs/assets/img/jasny-logo.png b/docs/assets/img/jasny-logo.png new file mode 100644 index 00000000..441b1042 Binary files /dev/null and b/docs/assets/img/jasny-logo.png differ diff --git a/docs/assets/js/application.js b/docs/assets/js/application.js index 5baab393..32a34adc 100644 --- a/docs/assets/js/application.js +++ b/docs/assets/js/application.js @@ -107,7 +107,7 @@ $.ajax({ type: 'POST' - , url: /\?dev/.test(window.location) ? 'http://localhost:3000' : 'http://bootstrap.herokuapp.com' + , url: /\?dev/.test(window.location) ? 'http://localhost:3000' : 'http://bootstrap-server.jasny.net' , dataType: 'jsonpi' , params: { js: js diff --git a/docs/templates/layout.mustache b/docs/templates/layout.mustache index d463f441..0abb2e6f 100644 --- a/docs/templates/layout.mustache +++ b/docs/templates/layout.mustache @@ -28,7 +28,7 @@ {{#production}} - - {{#production}} - - - {{/production}} - diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache index 46b15523..1d20ca26 100644 --- a/docs/templates/pages/base-css.mustache +++ b/docs/templates/pages/base-css.mustache @@ -5,6 +5,7 @@

{{_i}}Base CSS{{/i}}

{{_i}}Fundamental HTML elements styled and enhanced with extensible classes.{{/i}}

+ diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache index 8187ce08..1f12e2ea 100644 --- a/docs/templates/pages/components.mustache +++ b/docs/templates/pages/components.mustache @@ -5,6 +5,7 @@

{{_i}}Components{{/i}}

{{_i}}Dozens of reusable components built to provide navigation, alerts, popovers, and more.{{/i}}

+ diff --git a/docs/templates/pages/customize.mustache b/docs/templates/pages/customize.mustache index 0e78f99f..6788750c 100644 --- a/docs/templates/pages/customize.mustache +++ b/docs/templates/pages/customize.mustache @@ -5,6 +5,7 @@

{{_i}}Customize and download{{/i}}

{{_i}}Download Bootstrap or customize variables, components, javascript plugins, and more.{{/i}}

+ diff --git a/docs/templates/pages/extend.mustache b/docs/templates/pages/extend.mustache index a4332e62..6d429346 100644 --- a/docs/templates/pages/extend.mustache +++ b/docs/templates/pages/extend.mustache @@ -5,6 +5,7 @@

{{_i}}Extending Bootstrap{{/i}}

{{_i}}Extend Bootstrap to take advantage of included styles and components, as well as LESS variables and mixins.{{/i}}

+
diff --git a/docs/templates/pages/getting-started.mustache b/docs/templates/pages/getting-started.mustache index 8b58e62b..f3249398 100644 --- a/docs/templates/pages/getting-started.mustache +++ b/docs/templates/pages/getting-started.mustache @@ -5,6 +5,7 @@

{{_i}}Getting started{{/i}}

{{_i}}Overview of the project, it's contents, and how to get started with a simple template.{{/i}}

+ diff --git a/docs/templates/pages/index.mustache b/docs/templates/pages/index.mustache index 654a9884..a1a9bd1f 100644 --- a/docs/templates/pages/index.mustache +++ b/docs/templates/pages/index.mustache @@ -2,38 +2,51 @@

Bootstrap

Sleek, intuitive, and powerful front-end framework for faster and easier web development.

-

{{_i}}Download Bootstrap{{/i}}

+

+ {{_i}}Download Bootstrap{{/i}}
{{_i}}Includes all Jasny extensions{{/i}} + {{_i}}Extend Bootstrap{{/i}}
{{_i}}Download extensions only{{/i}} +

+
+
+

{{_i}}What's different?{{/i}}

+

{{_i}}How can a fantastic library become any better? Check it out.{{/i}}

+
+ +
-

{{_i}}Introducing Bootstrap.{{/i}}

{{_i}}Need reasons to love Bootstrap? Look no further.{{/i}}

diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache index c9e1b612..9df09bd3 100644 --- a/docs/templates/pages/javascript.mustache +++ b/docs/templates/pages/javascript.mustache @@ -5,6 +5,7 @@

{{_i}}JavaScript for Bootstrap{{/i}}

{{_i}}Bring Bootstrap's components to life—now with 13 custom jQuery plugins.{{/i}}

+
diff --git a/docs/templates/pages/scaffolding.mustache b/docs/templates/pages/scaffolding.mustache index 724ab5e5..f2dee468 100644 --- a/docs/templates/pages/scaffolding.mustache +++ b/docs/templates/pages/scaffolding.mustache @@ -5,6 +5,7 @@

{{_i}}Scaffolding{{/i}}

{{_i}}Bootstrap is built on responsive 12-column grids, layouts, and components.{{/i}}

+