Merge pull request #351 from twbs/font-weights

Only use font-weight: 100 on retina screens
This commit is contained in:
Connor Sears 2014-03-01 10:09:54 -08:00
Родитель 89bdebce80 0be2d3803e
Коммит f17a5a1f1b
2 изменённых файлов: 56 добавлений и 9 удалений

Просмотреть файл

@ -93,12 +93,17 @@ body {
left: 50%;
margin-bottom: 0;
font-size: 22px;
font-weight: 100;
font-weight: 300;
z-index: 20;
-webkit-transform: translateX(-50%);
-ms-transform: translateX(-50%);
transform: translateX(-50%);
}
@media (-webkit-min-device-pixel-ratio: 2), (min-resolution: 192dpi) {
.docs-title {
font-weight: 100;
}
}
.docs-nav .docs-nav-trigger {
color: #fff;
@ -125,9 +130,13 @@ body {
.docs-nav .docs-nav-item {
display: block;
padding: 20px 15px;
font-weight: 100;
font-size: 22px;
}
@media (-webkit-min-device-pixel-ratio: 2), (min-resolution: 192dpi) {
.docs-nav .docs-nav-item {
font-weight: 100;
}
}
.docs-jump-menu,
.docs-component-group {
@ -378,7 +387,13 @@ body {
.docs-sub-content .page-description {
margin-top: 0;
margin-bottom: 0;
font-weight: 100;
font-weight: 300;
}
@media (-webkit-min-device-pixel-ratio: 2), (min-resolution: 192dpi) {
.docs-sub-content .page-title,
.docs-sub-content .page-description {
font-weight: 100;
}
}
.docs-sub-content .page-title {
font-size: 40px;
@ -415,7 +430,11 @@ body {
.section-lead {
font-size: 18px;
color: #777;
font-weight: 100;
}
@media (-webkit-min-device-pixel-ratio: 2), (min-resolution: 192dpi) {
.section-lead {
font-weight: 100;
}
}
@media screen and (min-width: 768px) {
@ -646,6 +665,7 @@ body {
code {
padding: 2px 4px;
font-size: 90%;
font-family: Menlo, Monaco, Consolas, "Courier New", monospace;
background-color: #f9f9f9;
border-radius: 3px;
}

Просмотреть файл

@ -93,9 +93,16 @@ body {
left: 50%;
margin-bottom: 0;
font-size: 22px;
font-weight: 100;
font-weight: 300;
z-index: 20;
@include transform(translateX(-50%));
// Use a thinner weight on retina
@media
(-webkit-min-device-pixel-ratio: 2),
(min-resolution: 192dpi) {
font-weight: 100;
}
}
.docs-nav {
.docs-nav-trigger {
@ -125,12 +132,18 @@ body {
.docs-nav-item {
display: block;
padding: 20px 15px;
font-weight: 100;
font-size: 22px;
// Use a thinner weight on retina
@media
(-webkit-min-device-pixel-ratio: 2),
(min-resolution: 192dpi) {
font-weight: 100;
}
}
}
.docs-jump-menu,
.docs-component-group{
.docs-component-group {
display: none;
}
.docs-title a,
@ -377,7 +390,14 @@ body {
.page-description {
margin-top: 0;
margin-bottom: 0;
font-weight: 100;
font-weight: 300;
// Use a thinner weight on retina
@media
(-webkit-min-device-pixel-ratio: 2),
(min-resolution: 192dpi) {
font-weight: 100;
}
}
.page-title {
font-size: 40px;
@ -418,7 +438,13 @@ body {
.section-lead {
font-size: 18px;
color: #777;
font-weight: 100;
// Use a thinner weight on retina
@media
(-webkit-min-device-pixel-ratio: 2),
(min-resolution: 192dpi) {
font-weight: 100;
}
}
// Desktop: Section headings
@ -671,6 +697,7 @@ body {
code {
padding: 2px 4px;
font-size: 90%;
font-family: Menlo, Monaco, Consolas, "Courier New", monospace;
background-color: #f9f9f9;
border-radius: 3px;
}