diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 804fc38b63..1618f84e00 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css index 35e96bbcd0..4b032cdb55 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -12,6 +12,9 @@ visibility: hidden; } @media (max-width: 480px) { + .nav-collapse { + -webkit-transform: translate3d(0, 0, 0); + } .page-header h1 small { display: block; line-height: 18px; @@ -99,7 +102,7 @@ margin: 0; } } -@media (min-width: 768px) and (max-width: 940px) { +@media (min-width: 768px) and (max-width: 980px) { .row { margin-left: -20px; *zoom: 1; @@ -275,7 +278,7 @@ width: 714px; } } -@media (max-width: 940px) { +@media (max-width: 980px) { body { padding-top: 0; } @@ -373,10 +376,9 @@ .nav-collapse { overflow: hidden; height: 0; - -webkit-transform: translate3d(0, 0, 0); } } -@media (min-width: 940px) { +@media (min-width: 980px) { .nav-collapse.collapse { height: auto !important; } diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 7d519a608e..7babce5eb2 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1112,7 +1112,7 @@ table .span12 { width: 924px; margin-left: 0; } -[class*="icon-"] { +[class^="icon-"] { display: inline-block; width: 14px; height: 14px; @@ -1122,7 +1122,7 @@ table .span12 { background-repeat: no-repeat; *margin-right: .3em; } -[class*="icon-"]:last-child { +[class^="icon-"]:last-child { *margin-left: 0; } .icon-white { diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index cc64d31664..2e6da9c797 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -61,17 +61,13 @@ hr.soften { position: relative; } .jumbotron h1 { - margin-bottom: 9px; font-size: 81px; letter-spacing: -1px; line-height: 1; } .jumbotron p { margin-bottom: 18px; - font-size: 25px; font-weight: 300; - line-height: 36px; - color: #333; } .jumbotron .btn-large { font-size: 20px; @@ -82,10 +78,6 @@ hr.soften { -moz-border-radius: 6px; border-radius: 6px; } -.jumbotron .download-info { - font-size: 16px; - color: #999; -} /* Masthead (docs home) */ .masthead { @@ -100,7 +92,8 @@ hr.soften { margin-bottom: 18px; } .masthead p { - margin: 0 5% 18px; + margin-left: 5%; + margin-right: 5%; font-size: 30px; line-height: 36px; } @@ -111,11 +104,7 @@ hr.soften { /* supporting docs pages */ .subhead { padding-bottom: 0; - border-bottom: 0; -} -.subhead h1, -.subhead p { - margin-right: 0; + margin-bottom: 9px; } .subhead h1 { font-size: 54px; @@ -184,8 +173,8 @@ hr.soften { border-radius: 0 0 4px 4px; } -/* Fixed subnav on scroll, but only for 940px and up (sorry IE!) */ -@media (min-width: 940px) { +/* Fixed subnav on scroll, but only for 980px and up (sorry IE!) */ +@media (min-width: 980px) { .subnav-fixed { position: fixed; top: 40px; @@ -228,12 +217,6 @@ hr.soften { .quick-links li { display: inline; margin: 0 5px; -} -.quick-links .divider { - color: #999; -} -.quick-links strong { - font-weight: normal; color: #999; } .quick-links .github-btn, @@ -638,10 +621,6 @@ form.well { .quick-links { margin: 40px 0 0; } - .quick-links li { - margin-top: 5px; - margin-bottom: 5px; - } /* hide the bullets on mobile since our horizontal space is limited */ .quick-links .divider { display: none; @@ -654,7 +633,7 @@ form.well { .example-sites > li { float: none; display: block; - max-width: 300px; + max-width: 280px; margin: 0 auto 18px; text-align: center; } @@ -687,6 +666,11 @@ form.well { padding-top: 0; } + /* Jumbotron buttons */ + .jumbotron .btn { + margin-bottom: 10px; + } + /* Subnav */ .subnav { position: static; @@ -715,7 +699,6 @@ form.well { border-radius: 4px 4px 0 0; } - /* Popovers */ .large-bird { display: none; @@ -729,11 +712,6 @@ form.well { margin-bottom: 5px; } - /* Space out the getting started sections */ - .getting-started .span4 { - margin-bottom: 18px; - } - /* Unfloat the back to top link in footer */ .footer .pull-right { float: none; @@ -751,11 +729,6 @@ form.well { .jumbotron h1 { font-size: 54px; } - .masthead p { - font-size: 25px; - line-height: 36px; - } - .jumbotron h1, .jumbotron p { margin-right: 0; margin-left: 0; @@ -764,7 +737,7 @@ form.well { } -@media (min-width: 768px) and (max-width: 940px) { +@media (min-width: 768px) and (max-width: 980px) { /* Remove any padding from the body */ body { @@ -779,7 +752,7 @@ form.well { } -@media (max-width: 940px) { +@media (max-width: 980px) { /* Unfloat brand */ .navbar-fixed-top .brand { @@ -789,6 +762,12 @@ form.well { padding-right: 10px; } + /* Inline-block quick links for more spacing */ + .quick-links li { + display: inline-block; + margin: 5px; + } + } diff --git a/less/responsive.less b/less/responsive.less index 0f45c0985e..7d494a3576 100644 --- a/less/responsive.less +++ b/less/responsive.less @@ -38,6 +38,11 @@ @media (max-width: 480px) { + // Smooth out the collapsing/expanding nav + .nav-collapse { + -webkit-transform: translate3d(0, 0, 0); // activate the GPU + } + // Block level the page header small tag for readability .page-header h1 small { display: block; @@ -149,7 +154,7 @@ // PORTRAIT TABLET TO DEFAULT DESKTOP // ---------------------------------- -@media (min-width: 768px) and (max-width: 940px) { +@media (min-width: 768px) and (max-width: 980px) { // Fixed grid #gridSystem > .generate(12, 42px, 20px); @@ -166,7 +171,7 @@ // TABLETS AND BELOW // ----------------- -@media (max-width: 940px) { +@media (max-width: 980px) { // UNFIX THE TOPBAR // ---------------- @@ -277,7 +282,6 @@ .nav-collapse { overflow: hidden; height: 0; - -webkit-transform: translate3d(0, 0, 0); // activate the GPU } } @@ -286,7 +290,7 @@ // DEFAULT DESKTOP // --------------- -@media (min-width: 940px) { +@media (min-width: 980px) { .nav-collapse.collapse { height: auto !important; } diff --git a/less/sprites.less b/less/sprites.less index 9a68fe0487..a56216c71c 100644 --- a/less/sprites.less +++ b/less/sprites.less @@ -14,7 +14,7 @@ // For the white version of the icons, just add the .icon-white class: // -[class*="icon-"] { +[class^="icon-"] { display: inline-block; width: 14px; height: 14px;