Commit 37f3944b authored by Mark Otto's avatar Mark Otto
Browse files

finish up moving content, tweaking styles

parent 03501f9c
No related merge requests found
Showing with 39 additions and 70 deletions
+39 -70
...@@ -27,11 +27,6 @@ ...@@ -27,11 +27,6 @@
<a href="{{ page.base_url }}customize">Customize</a> <a href="{{ page.base_url }}customize">Customize</a>
</li> </li>
</ul> </ul>
<ul class="nav navbar-nav navbar-right">
<li{% if page.slug == "about" %} class="active"{% endif %}>
<a href="{{ page.base_url }}about">About</a>
</li>
</ul>
</nav> </nav>
</div> </div>
</header> </header>
...@@ -55,15 +55,17 @@ ...@@ -55,15 +55,17 @@
<p>Designed and built with all the love in the world by <a href="http://twitter.com/mdo" target="_blank">@mdo</a> and <a href="http://twitter.com/fat" target="_blank">@fat</a>.</p> <p>Designed and built with all the love in the world by <a href="http://twitter.com/mdo" target="_blank">@mdo</a> and <a href="http://twitter.com/fat" target="_blank">@fat</a>.</p>
<p>Code licensed under <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_blank">Apache License v2.0</a>, documentation under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p> <p>Code licensed under <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_blank">Apache License v2.0</a>, documentation under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p>
<ul class="footer-links"> <ul class="footer-links muted">
<li>Currently v{{ site.current_version }}</li> <li>Currently v{{ site.current_version }}</li>
<li class="muted">&middot;</li> <li>&middot;</li>
<li><a href="{{ page.base_url }}2.3.2/">v2.3.2 docs</a></li> <li><a href="{{ page.base_url }}2.3.2/">v2.3.2 docs</a></li>
<li class="muted">&middot;</li> <li>&middot;</li>
<li><a href="{{ page.base_url }}about/">About</a></li>
<li>&middot;</li>
<li><a href="{{ site.blog }}">Blog</a></li> <li><a href="{{ site.blog }}">Blog</a></li>
<li class="muted">&middot;</li> <li>&middot;</li>
<li><a href="{{ site.repo }}/issues?state=open">Issues</a></li> <li><a href="{{ site.repo }}/issues?state=open">Issues</a></li>
<li class="muted">&middot;</li> <li>&middot;</li>
<li><a href="{{ site.repo }}/releases">Releases</a></li> <li><a href="{{ site.repo }}/releases">Releases</a></li>
</ul> </ul>
</div> </div>
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
<a href="{{ site.repo }}" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'GitHub project']);">GitHub project</a> <a href="{{ site.repo }}" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'GitHub project']);">GitHub project</a>
</li> </li>
<li> <li>
<a href="{{ page.base_url }}getting-started/#examples" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'Examples']);">Examples</a> <a href="{{ page.base_url }}about/" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'About']);">About</a>
</li> </li>
<li> <li>
<a href="{{ site.expo }}" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'Expo']);">Expo</a> <a href="{{ site.expo }}" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'Expo']);">Expo</a>
......
...@@ -126,6 +126,7 @@ body { ...@@ -126,6 +126,7 @@ body {
.footer-links { .footer-links {
margin: 10px 0; margin: 10px 0;
padding-left: 0; padding-left: 0;
color: #999;
} }
.footer-links li { .footer-links li {
display: inline; display: inline;
...@@ -205,31 +206,19 @@ body { ...@@ -205,31 +206,19 @@ body {
position: relative; position: relative;
padding: 30px 15px; padding: 30px 15px;
text-align: center; text-align: center;
/*text-shadow: 0 1px 0 rgba(0,0,0,.15);*/
} }
/*
.bs-masthead:after {
display: block;
width: 144px;
height: 1px;
content: "";
margin: 40px auto;
background-color: #e5e5e5;
}
*/
.bs-masthead h1 { .bs-masthead h1 {
display: none; display: none;
/*font-size: 50px;*/
line-height: 1; line-height: 1;
color: #563d7c; color: #563d7c;
} }
.bs-masthead .lead { .bs-masthead .lead {
font-size: 20px; font-size: 20px;
margin-bottom: 40px; margin-bottom: 30px;
} }
.bs-masthead .btn-outline { .bs-masthead .btn-outline {
width: 100%; width: 100%;
/*margin: 5px;*/ margin: 10px 5px;
padding: 14px 24px; padding: 14px 24px;
font-size: 20px; font-size: 20px;
} }
...@@ -248,6 +237,7 @@ body { ...@@ -248,6 +237,7 @@ body {
line-height: 140px; line-height: 140px;
border: 1px solid #563d7c; border: 1px solid #563d7c;
border-radius: 15%; border-radius: 15%;
cursor: default;
} }
/* Links to project-level content like the repo, Expo, etc */ /* Links to project-level content like the repo, Expo, etc */
...@@ -280,11 +270,6 @@ body { ...@@ -280,11 +270,6 @@ body {
@media (min-width: 480px) { @media (min-width: 480px) {
.bs-masthead .btn-outline { .bs-masthead .btn-outline {
width: auto; width: auto;
margin-left: 5px;
margin-right: 5px;
}
.bs-masthead .btn-outline + .btn-outline {
margin-top: 0;
} }
} }
...@@ -295,25 +280,13 @@ body { ...@@ -295,25 +280,13 @@ body {
} }
@media (min-width: 992px) { @media (min-width: 992px) {
.bs-masthead {
/*padding-top: 120px;*/
/*padding-bottom: 120px;*/
}
/*
.bs-masthead h1 {
font-size: 100px;
}
*/
.bs-masthead .lead { .bs-masthead .lead {
margin-left: 12.5%; margin-left: 12.5%;
margin-right: 12.5%; margin-right: 12.5%;
font-size: 30px; font-size: 30px;
} }
.bs-masthead .btn-outline { .bs-masthead .btn-outline {
/*width: auto;*/
/*margin: 0 5px;*/
padding: 18px 24px; padding: 18px 24px;
/*font-size: 20px;*/
} }
.bs-masthead-links { .bs-masthead-links {
padding: 0; padding: 0;
...@@ -331,7 +304,7 @@ body { ...@@ -331,7 +304,7 @@ body {
/* Page headers */ /* Page headers */
.bs-header { .bs-header {
padding: 30px 15px 40px; /* side padding builds on .container 15px, so 30px */ padding: 30px 15px 40px; /* side padding builds on .container 15px, so 30px */
font-size: 16px; font-size: 20px;
text-align: center; text-align: center;
background-color: #f9f9f9; background-color: #f9f9f9;
border-bottom: 1px solid #eee; border-bottom: 1px solid #eee;
...@@ -349,7 +322,7 @@ body { ...@@ -349,7 +322,7 @@ body {
@media (min-width: 768px) { @media (min-width: 768px) {
.bs-header { .bs-header {
font-size: 21px; /*font-size: 21px;*/
text-align: left; text-align: left;
} }
.bs-header h1 { .bs-header h1 {
...@@ -375,7 +348,7 @@ body { ...@@ -375,7 +348,7 @@ body {
.carbonad { .carbonad {
width: auto !important; width: auto !important;
margin: 50px -30px -40px !important; margin: 20px -30px -41px !important;
padding: 20px !important; padding: 20px !important;
overflow: hidden; /* clearfix */ overflow: hidden; /* clearfix */
height: auto !important; height: auto !important;
...@@ -383,8 +356,8 @@ body { ...@@ -383,8 +356,8 @@ body {
line-height: 16px !important; line-height: 16px !important;
text-align: left; text-align: left;
background: #fff !important; background: #fff !important;
border: 1px solid #e5e5e5 !important; border: solid #e5e5e5 !important;
border-radius: 4px; border-width: 1px 0 !important;
} }
.carbonad-img { .carbonad-img {
margin: 0 !important; margin: 0 !important;
...@@ -413,10 +386,30 @@ body { ...@@ -413,10 +386,30 @@ body {
display: none; /* hide what I assume are tracking images */ display: none; /* hide what I assume are tracking images */
} }
/* Homepage variation */
.bs-docs-home .carbonad {
margin: 0 -15px 40px !important;
}
@media (min-width: 480px) {
.carbonad {
width: 330px !important;
margin: 20px auto 0 !important;
border-radius: 4px;
border-width: 1px !important;
}
.bs-docs-home .carbonad {
margin: 0 auto 40px !important;
}
}
@media (min-width: 768px) { @media (min-width: 768px) {
.carbonad { .carbonad {
margin: 0 !important; margin: 0 !important;
} }
.bs-docs-home .carbonad {
margin: 0 auto 40px !important;
}
} }
@media (min-width: 992px) { @media (min-width: 992px) {
...@@ -427,22 +420,11 @@ body { ...@@ -427,22 +420,11 @@ body {
padding: 15px !important; padding: 15px !important;
width: 330px !important; width: 330px !important;
} }
}
/* Homepage variations */
.bs-docs-home .carbonad {
border-width: 1px 0 !important;
border-radius: 0;
margin: 0 -15px 40px !important;
}
@media (min-width: 480px) {
.bs-docs-home .carbonad { .bs-docs-home .carbonad {
width: 330px !important; position: static;
margin: 0 auto 40px !important;
border-radius: 4px;
border-width: 1px !important;
} }
} }
@media (min-width: 768px) { @media (min-width: 768px) {
.bs-docs-home .bs-social { .bs-docs-home .bs-social {
margin-bottom: 10px; margin-bottom: 10px;
...@@ -455,16 +437,6 @@ body { ...@@ -455,16 +437,6 @@ body {
text-align: center; text-align: center;
} }
} }
@media (min-width: 992px) {
.bs-docs-home .carbonad {
position: static;
}
}
@media (min-width: 1170px) {
.bs-docs-home .carbonad {
margin-top: -25px !important;
}
}
/* /*
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment