1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2022-11-09 12:25:43 -05:00

more rem fixes for examples

This commit is contained in:
Mark Otto 2014-12-04 14:02:38 -08:00
parent 0d7115928b
commit 908f776c08
3 changed files with 33 additions and 43 deletions

View file

@ -16,7 +16,7 @@ a:hover {
color: #333; color: #333;
text-shadow: none; /* Prevent inheritence from `body` */ text-shadow: none; /* Prevent inheritence from `body` */
background-color: #fff; background-color: #fff;
border: 1px solid #fff; border: .05rem solid #fff;
} }
@ -32,7 +32,7 @@ body {
body { body {
color: #fff; color: #fff;
text-align: center; text-align: center;
text-shadow: 0 1px 3px rgba(0,0,0,.5); text-shadow: 0 .05rem .1rem rgba(0,0,0,.5);
} }
/* Extra markup and styles for table-esque vertical and horizontal centering */ /* Extra markup and styles for table-esque vertical and horizontal centering */
@ -41,8 +41,8 @@ body {
width: 100%; width: 100%;
height: 100%; /* For at least Firefox */ height: 100%; /* For at least Firefox */
min-height: 100%; min-height: 100%;
-webkit-box-shadow: inset 0 0 100px rgba(0,0,0,.5); -webkit-box-shadow: inset 0 0 5rem rgba(0,0,0,.5);
box-shadow: inset 0 0 100px rgba(0,0,0,.5); box-shadow: inset 0 0 5rem rgba(0,0,0,.5);
} }
.site-wrapper-inner { .site-wrapper-inner {
display: table-cell; display: table-cell;
@ -55,51 +55,44 @@ body {
/* Padding for spacing */ /* Padding for spacing */
.inner { .inner {
padding: 30px; padding: 2rem;
} }
/* /*
* Header * Header
*/ */
.masthead-brand {
margin-top: 10px; .masthead {
margin-bottom: 10px; margin-bottom: 2rem;
} }
.masthead-nav > li { .masthead-brand {
display: inline-block; margin-bottom: 0;
} }
.masthead-nav > li + li {
margin-left: 20px; .nav-masthead .nav-link {
} padding: .25rem 0;
.masthead-nav > li > a {
padding-right: 0;
padding-left: 0;
font-size: 16px;
font-weight: bold; font-weight: bold;
color: #fff; /* IE8 proofing */ color: rgba(255,255,255,.5);
color: rgba(255,255,255,.75);
border-bottom: 2px solid transparent;
}
.masthead-nav > li > a:hover,
.masthead-nav > li > a:focus {
background-color: transparent; background-color: transparent;
border-bottom-color: #a9a9a9; border-bottom: .25rem solid transparent;
border-bottom-color: rgba(255,255,255,.25);
} }
.masthead-nav > .active > a,
.masthead-nav > .active > a:hover, .nav-masthead .nav-link + .nav-link {
.masthead-nav > .active > a:focus { margin-left: 1rem;
}
.nav-masthead .active {
color: #fff; color: #fff;
border-bottom-color: #fff; border-bottom-color: #fff;
} }
@media (min-width: 768px) { @media (min-width: 48em) {
.masthead-brand { .masthead-brand {
float: left; float: left;
} }
.masthead-nav { .nav-masthead {
float: right; float: right;
} }
} }
@ -110,10 +103,10 @@ body {
*/ */
.cover { .cover {
padding: 0 20px; padding: 0 1.5rem;
} }
.cover .btn-lg { .cover .btn-lg {
padding: 10px 20px; padding: .75rem 1.25rem;
font-weight: bold; font-weight: bold;
} }
@ -123,7 +116,6 @@ body {
*/ */
.mastfoot { .mastfoot {
color: #999; /* IE8 proofing */
color: rgba(255,255,255,.5); color: rgba(255,255,255,.5);
} }
@ -132,7 +124,7 @@ body {
* Affix and center * Affix and center
*/ */
@media (min-width: 768px) { @media (min-width: 40em) {
/* Pull out the header and footer */ /* Pull out the header and footer */
.masthead { .masthead {
position: fixed; position: fixed;
@ -154,10 +146,10 @@ body {
} }
} }
@media (min-width: 992px) { @media (min-width: 62em) {
.masthead, .masthead,
.mastfoot, .mastfoot,
.cover-container { .cover-container {
width: 700px; width: 42rem;
} }
} }

View file

@ -31,12 +31,10 @@
<div class="masthead clearfix"> <div class="masthead clearfix">
<div class="inner"> <div class="inner">
<h3 class="masthead-brand">Cover</h3> <h3 class="masthead-brand">Cover</h3>
<nav> <nav class="nav nav-masthead">
<ul class="nav masthead-nav"> <a class="nav-link active" href="#">Home</a>
<li class="active"><a href="#">Home</a></li> <a class="nav-link" href="#">Features</a>
<li><a href="#">Features</a></li> <a class="nav-link" href="#">Contact</a>
<li><a href="#">Contact</a></li>
</ul>
</nav> </nav>
</div> </div>
</div> </div>

View file

@ -60,7 +60,7 @@ body {
} }
/* Responsive: Portrait tablets and up */ /* Responsive: Portrait tablets and up */
@media screen and (min-width: 768px) { @media screen and (min-width: 48em) {
/* Remove the padding we set earlier */ /* Remove the padding we set earlier */
.header, .header,
.marketing, .marketing,