From 6836530f723d10032460338a537a58932d8d6c27 Mon Sep 17 00:00:00 2001 From: Mark Otto <markdotto@gmail.com> Date: Wed, 5 Aug 2015 00:10:15 -0700 Subject: [PATCH] account for nav on docs pages --- docs/_includes/nav-home.html | 14 ++++++-------- docs/assets/css/docs.min.css | 8 +++++--- docs/assets/css/docs.min.css.map | Bin 26428 -> 26448 bytes docs/assets/scss/_homepage.scss | 3 +-- docs/assets/scss/_layout.scss | 5 +++++ docs/assets/scss/_sidebar.scss | 2 +- 6 files changed, 18 insertions(+), 14 deletions(-) diff --git a/docs/_includes/nav-home.html b/docs/_includes/nav-home.html index 1fffe04cda..e96b87cf71 100644 --- a/docs/_includes/nav-home.html +++ b/docs/_includes/nav-home.html @@ -1,10 +1,8 @@ <header class="navbar navbar-sm navbar-inverse navbar-fixed-top bd-navbar" role="banner"> - <div class="container"> - <nav class="nav navbar-nav"> - <a class="nav-item nav-link" href="{{ site.baseurl }}/" onclick="ga('send', 'event', 'Navbar', 'Community links', 'Bootstrap');">Bootstrap</a> - <a class="nav-item nav-link" href="{{ site.baseurl }}/getting-started/overview/" onclick="ga('send', 'event', 'Navbar', 'Community links', 'Docs');">Documentation</a> - <a class="nav-item nav-link" href="{{ site.expo }}" onclick="ga('send', 'event', 'Navbar', 'Community links', 'Expo');">Expo</a> - <a class="nav-item nav-link" href="{{ site.blog }}" onclick="ga('send', 'event', 'Navbar', 'Community links', 'Blog');">Blog</a> - </nav> - </div> + <nav class="nav navbar-nav"> + <a class="nav-item nav-link" href="{{ site.baseurl }}/" onclick="ga('send', 'event', 'Navbar', 'Community links', 'Bootstrap');">Bootstrap</a> + <a class="nav-item nav-link" href="{{ site.baseurl }}/getting-started/overview/" onclick="ga('send', 'event', 'Navbar', 'Community links', 'Docs');">Documentation</a> + <a class="nav-item nav-link" href="{{ site.expo }}" onclick="ga('send', 'event', 'Navbar', 'Community links', 'Expo');">Expo</a> + <a class="nav-item nav-link" href="{{ site.blog }}" onclick="ga('send', 'event', 'Navbar', 'Community links', 'Blog');">Blog</a> + </nav> </header> diff --git a/docs/assets/css/docs.min.css b/docs/assets/css/docs.min.css index e24a6312cc..92472a9f8e 100644 --- a/docs/assets/css/docs.min.css +++ b/docs/assets/css/docs.min.css @@ -4,6 +4,9 @@ * Licensed under the Creative Commons Attribution 3.0 Unported License. For * details, see http://creativecommons.org/licenses/by/3.0/. */ +.bd-docs { + padding-top: 3.7rem; } + .bd-container { position: relative; max-width: 62rem; @@ -81,7 +84,7 @@ margin-left: 240px; } .bd-sidebar { position: fixed; - top: 0; + top: 3.7rem; bottom: 0; left: 0; width: 240px; @@ -240,8 +243,7 @@ background-color: rgba(0, 0, 0, 0.5); } .bd-navbar { - padding-top: .25rem; - padding-bottom: .25rem; + padding: .25rem; background-color: #2a2730; } .bd-navbar .nav-link { color: #8e869d; } diff --git a/docs/assets/css/docs.min.css.map b/docs/assets/css/docs.min.css.map index 1e42744a79937624793f299fd76cbb10566a57f7..927f60a51c611f8b6ab4f72d088a12f17ffafec6 100644 GIT binary patch delta 541 zcmZ9Jzb`{k6vuPDl+r2@A_l)&iO`!=LMuEH=iYbk?IX7|M75iNs-IPKFd6KIyD%BW zCb@&f-yjwXF-gR1AhGbOuO-&+`JVInesgYa(cLY&dZ`Of$8i!Mi75az8PGYL0!U#7 zz_0|E#R9C1X*!lg^;&mg?9e5(JkX|wBDKag$*WWE;D1d&dz+CzN7C2^u(4qK`m0`` zP?oRYSpaED7GY81g7_{?IuH<!oL4#Dh(AwR$>*S1SYP@&kugT*T&Tyxw#gP%ul_4E zs?QqlP<<(-X#>sZLQ_vbebR=$AIT}RMsSt@WC>;ot8!FYt4>i{-FF6k@svxFOx1Kf z2BOyTk6<zxvkukMRJ*F_J`C-%vd^^T0V@)m21q+6i_EU9@96XHV-$+=sxiiYjibD3 zJW#xMWO7r?mpM{yiNc?h>w;GX8>N9u+7#9FVXm%w$BkjWQ2oOiiK&+0g;5m0zbR=C m!4G3N{#VQCw~)sO6cT&H?K!iTP)Dt;x}zT(D6je8`@}aDb)OUf delta 488 zcmYk1JuHJ!6ozwKiPF~3&=N_NR*>cfi8d`CiF3c+dwt~k2}!jZLYw%l-|8l@OPtYU zvP$l1F-t_O5;lo}u(0~jmhI$u-}Aob+}@DO8*=ef?MRMdqwAO);F&8(ig@LUlxOX! zX&|0$mZlbfMJ4ao-L;a0^J0lk0w_cAO%Y=>1(2d#^qJFC0!SMd@x&eV^fLbKo3uCk z^qo6E?D#iN(2-!+=)I^ah@6QJszpC~HK{QHxM6`grBCbI>Tsdc*Ru$)NV(0avQrEW z<{qP229RZxPl$53N-o>lI6enL?y*#<QAzZ--q*#G^FP4gDv>PW`$!Y|gT?S3|MeM` z+UIs?8X#>)7PwVj&ubk#BH_5G7!%^pI3Oy<eay5+hu7uIZ;w(Na_irft5TGOwQr%+ zv@R>xXC+>@4?1IF77x387znvY0y{(J&Vro#M_xmp&e&*$RIOM!hNR7>TRUDH-kphU TR(f=NS2uTolWgfs<YVXyqd1S_ diff --git a/docs/assets/scss/_homepage.scss b/docs/assets/scss/_homepage.scss index e57cb70cd3..63360fac17 100644 --- a/docs/assets/scss/_homepage.scss +++ b/docs/assets/scss/_homepage.scss @@ -30,8 +30,7 @@ // .bd-navbar { - padding-top: .25rem; - padding-bottom: .25rem; + padding: .25rem; background-color: $bd-graphite; .nav-link { diff --git a/docs/assets/scss/_layout.scss b/docs/assets/scss/_layout.scss index 3b5a1f7387..23c2558b99 100644 --- a/docs/assets/scss/_layout.scss +++ b/docs/assets/scss/_layout.scss @@ -1,3 +1,8 @@ + +.bd-docs { + padding-top: 3.7rem; +} + // Custom container // // Doesn't use the default `.container` styles for easier modifications. diff --git a/docs/assets/scss/_sidebar.scss b/docs/assets/scss/_sidebar.scss index 0712b98c11..00ec4497bd 100644 --- a/docs/assets/scss/_sidebar.scss +++ b/docs/assets/scss/_sidebar.scss @@ -31,7 +31,7 @@ } .bd-sidebar { position: fixed; - top: 0; + top: 3.7rem; bottom: 0; left: 0; width: 240px; -- GitLab