Skip to content
Browse files

Make typography adjusments

  • Loading branch information...
1 parent a357e24 commit d532426903d0389262fc7fdbe67fd211c4ef4cc7 @morninj committed Jun 3, 2012
Showing with 79 additions and 76 deletions.
  1. +1 −1 bootstrap/less/variables.less
  2. +5 −5 styles/bootstrap-responsive.css
  3. +70 −70 styles/bootstrap.css
  4. +3 −0 styles/entries.css
View
2 bootstrap/less/variables.less
@@ -51,7 +51,7 @@
@baseFontSize: 17px;
@baseFontFamily: @serifFontFamily;
-@baseLineHeight: 25px;
+@baseLineHeight: 26px;
@altFontFamily: @serifFontFamily;
@headingsFontFamily: inherit; // empty to use BS default, @baseFontFamily
View
10 styles/bootstrap-responsive.css
@@ -81,7 +81,7 @@
}
.page-header h1 small {
display: block;
- line-height: 25px;
+ line-height: 26px;
}
input[type="checkbox"],
input[type="radio"] {
@@ -517,7 +517,7 @@
}
.navbar-fixed-top {
position: static;
- margin-bottom: 25px;
+ margin-bottom: 26px;
}
.navbar-fixed-top .navbar-inner {
padding: 5px;
@@ -536,7 +536,7 @@
}
.nav-collapse .nav {
float: none;
- margin: 0 0 12.5px;
+ margin: 0 0 13px;
}
.nav-collapse .nav > li {
float: none;
@@ -606,8 +606,8 @@
.nav-collapse .navbar-form,
.nav-collapse .navbar-search {
float: none;
- padding: 12.5px 15px;
- margin: 12.5px 0;
+ padding: 13px 15px;
+ margin: 13px 0;
border-top: 1px solid #222222;
border-bottom: 1px solid #222222;
-webkit-box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.1);
View
140 styles/bootstrap.css
@@ -132,7 +132,7 @@ body {
margin: 0;
font-family: "skolar", Georgia, "Times New Roman", Times, serif;
font-size: 17px;
- line-height: 25px;
+ line-height: 26px;
color: #333333;
background-color: #ffffff;
}
@@ -299,20 +299,20 @@ a:hover {
clear: both;
}
p {
- margin: 0 0 12.5px;
+ margin: 0 0 13px;
font-family: "skolar", Georgia, "Times New Roman", Times, serif;
font-size: 17px;
- line-height: 25px;
+ line-height: 26px;
}
p small {
font-size: 15px;
color: #999999;
}
.lead {
- margin-bottom: 25px;
+ margin-bottom: 26px;
font-size: 20px;
font-weight: 200;
- line-height: 37.5px;
+ line-height: 39px;
}
h1,
h2,
@@ -337,29 +337,29 @@ h6 small {
}
h1 {
font-size: 30px;
- line-height: 50px;
+ line-height: 52px;
}
h1 small {
font-size: 18px;
}
h2 {
font-size: 24px;
- line-height: 50px;
+ line-height: 52px;
}
h2 small {
font-size: 18px;
}
h3 {
font-size: 18px;
- line-height: 37.5px;
+ line-height: 39px;
}
h3 small {
font-size: 14px;
}
h4,
h5,
h6 {
- line-height: 25px;
+ line-height: 26px;
}
h4 {
font-size: 14px;
@@ -376,8 +376,8 @@ h6 {
text-transform: uppercase;
}
.page-header {
- padding-bottom: 24px;
- margin: 25px 0;
+ padding-bottom: 25px;
+ margin: 26px 0;
border-bottom: 1px solid #eeeeee;
}
.page-header h1 {
@@ -386,7 +386,7 @@ h6 {
ul,
ol {
padding: 0;
- margin: 0 0 12.5px 25px;
+ margin: 0 0 13px 25px;
}
ul ul,
ul ol,
@@ -401,26 +401,26 @@ ol {
list-style: decimal;
}
li {
- line-height: 25px;
+ line-height: 26px;
}
ul.unstyled,
ol.unstyled {
margin-left: 0;
list-style: none;
}
dl {
- margin-bottom: 25px;
+ margin-bottom: 26px;
}
dt,
dd {
- line-height: 25px;
+ line-height: 26px;
}
dt {
font-weight: bold;
- line-height: 24px;
+ line-height: 25px;
}
dd {
- margin-left: 12.5px;
+ margin-left: 13px;
}
.dl-horizontal dt {
float: left;
@@ -435,7 +435,7 @@ dd {
margin-left: 130px;
}
hr {
- margin: 25px 0;
+ margin: 26px 0;
border: 0;
border-top: 1px solid #eeeeee;
border-bottom: 1px solid #ffffff;
@@ -459,18 +459,18 @@ abbr.initialism {
}
blockquote {
padding: 0 0 0 15px;
- margin: 0 0 25px;
+ margin: 0 0 26px;
border-left: 5px solid #eeeeee;
}
blockquote p {
margin-bottom: 0;
font-size: 16px;
font-weight: 300;
- line-height: 31.25px;
+ line-height: 32.5px;
}
blockquote small {
display: block;
- line-height: 25px;
+ line-height: 26px;
color: #999999;
}
blockquote small:before {
@@ -495,9 +495,9 @@ blockquote:after {
}
address {
display: block;
- margin-bottom: 25px;
+ margin-bottom: 26px;
font-style: normal;
- line-height: 25px;
+ line-height: 26px;
}
small {
font-size: 100%;
@@ -523,10 +523,10 @@ code {
}
pre {
display: block;
- padding: 12px;
- margin: 0 0 12.5px;
+ padding: 12.5px;
+ margin: 0 0 13px;
font-size: 15.725000000000001px;
- line-height: 25px;
+ line-height: 26px;
word-break: break-all;
word-wrap: break-word;
white-space: pre;
@@ -539,7 +539,7 @@ pre {
border-radius: 4px;
}
pre.prettyprint {
- margin-bottom: 25px;
+ margin-bottom: 26px;
}
pre code {
padding: 0;
@@ -552,7 +552,7 @@ pre code {
overflow-y: scroll;
}
form {
- margin: 0 0 25px;
+ margin: 0 0 26px;
}
fieldset {
padding: 0;
@@ -563,15 +563,15 @@ legend {
display: block;
width: 100%;
padding: 0;
- margin-bottom: 37.5px;
+ margin-bottom: 39px;
font-size: 25.5px;
- line-height: 50px;
+ line-height: 52px;
color: #333333;
border: 0;
border-bottom: 1px solid #eee;
}
legend small {
- font-size: 18.75px;
+ font-size: 19.5px;
color: #999999;
}
label,
@@ -581,7 +581,7 @@ select,
textarea {
font-size: 17px;
font-weight: normal;
- line-height: 25px;
+ line-height: 26px;
}
input,
button,
@@ -600,11 +600,11 @@ select,
.uneditable-input {
display: inline-block;
width: 210px;
- height: 25px;
+ height: 26px;
padding: 4px;
margin-bottom: 9px;
font-size: 17px;
- line-height: 25px;
+ line-height: 26px;
color: #555555;
background-color: #ffffff;
border: 1px solid #cccccc;
@@ -915,9 +915,9 @@ select:focus:required:invalid:focus {
box-shadow: 0 0 6px #f8b9b7;
}
.form-actions {
- padding: 24px 20px 25px;
- margin-top: 25px;
- margin-bottom: 25px;
+ padding: 25px 20px 26px;
+ margin-top: 26px;
+ margin-bottom: 26px;
background-color: #f5f5f5;
border-top: 1px solid #ddd;
*zoom: 1;
@@ -952,7 +952,7 @@ select:focus:required:invalid:focus {
}
.help-block {
display: block;
- margin-bottom: 12.5px;
+ margin-bottom: 13px;
}
.help-inline {
display: inline-block;
@@ -997,11 +997,11 @@ select:focus:required:invalid:focus {
.input-append .add-on {
display: inline-block;
width: auto;
- height: 25px;
+ height: 26px;
min-width: 16px;
padding: 4px 5px;
font-weight: normal;
- line-height: 25px;
+ line-height: 26px;
text-align: center;
text-shadow: 0 1px 0 #ffffff;
vertical-align: middle;
@@ -1142,14 +1142,14 @@ select:focus:required:invalid:focus {
margin-left: 0;
}
.control-group {
- margin-bottom: 12.5px;
+ margin-bottom: 13px;
}
legend + .control-group {
- margin-top: 25px;
+ margin-top: 26px;
-webkit-margin-top-collapse: separate;
}
.form-horizontal .control-group {
- margin-bottom: 25px;
+ margin-bottom: 26px;
*zoom: 1;
}
.form-horizontal .control-group:before,
@@ -1176,7 +1176,7 @@ legend + .control-group {
*padding-left: 160px;
}
.form-horizontal .help-block {
- margin-top: 12.5px;
+ margin-top: 13px;
margin-bottom: 0;
}
.form-horizontal .form-actions {
@@ -1190,12 +1190,12 @@ table {
}
.table {
width: 100%;
- margin-bottom: 25px;
+ margin-bottom: 26px;
}
.table th,
.table td {
padding: 8px;
- line-height: 25px;
+ line-height: 26px;
text-align: left;
vertical-align: top;
border-top: 1px solid #dddddd;
@@ -1904,7 +1904,7 @@ table .span24 {
.dropdown-menu .divider {
*width: 100%;
height: 1px;
- margin: 11.5px 1px;
+ margin: 12px 1px;
*margin: -5px 0 5px;
overflow: hidden;
background-color: #e5e5e5;
@@ -1915,7 +1915,7 @@ table .span24 {
padding: 3px 15px;
clear: both;
font-weight: normal;
- line-height: 25px;
+ line-height: 26px;
color: #333333;
white-space: nowrap;
}
@@ -2014,7 +2014,7 @@ table .span24 {
float: right;
font-size: 20px;
font-weight: bold;
- line-height: 25px;
+ line-height: 26px;
color: #000000;
text-shadow: 0 1px 0 #ffffff;
opacity: 0.2;
@@ -2043,7 +2043,7 @@ button.close {
padding: 4px 10px 4px;
margin-bottom: 0;
font-size: 17px;
- line-height: 25px;
+ line-height: 26px;
*line-height: 20px;
color: #333333;
text-align: center;
@@ -2145,15 +2145,15 @@ button.close {
.btn-small {
padding: 5px 9px;
font-size: 15px;
- line-height: 23px;
+ line-height: 24px;
}
.btn-small [class^="icon-"] {
margin-top: -1px;
}
.btn-mini {
padding: 2px 6px;
font-size: 15px;
- line-height: 21px;
+ line-height: 22px;
}
.btn-primary,
.btn-primary:hover,
@@ -2401,8 +2401,8 @@ input[type="submit"].btn.btn-mini {
margin-left: 5px;
}
.btn-toolbar {
- margin-top: 12.5px;
- margin-bottom: 12.5px;
+ margin-top: 13px;
+ margin-bottom: 13px;
}
.btn-toolbar .btn-group {
display: inline-block;
@@ -2551,7 +2551,7 @@ input[type="submit"].btn.btn-mini {
}
.alert {
padding: 8px 35px 8px 14px;
- margin-bottom: 25px;
+ margin-bottom: 26px;
text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
background-color: #fcf8e3;
border: 1px solid #fbeed5;
@@ -2598,7 +2598,7 @@ input[type="submit"].btn.btn-mini {
}
.nav {
margin-left: 0;
- margin-bottom: 25px;
+ margin-bottom: 26px;
list-style: none;
}
.nav > li > a {
@@ -2616,7 +2616,7 @@ input[type="submit"].btn.btn-mini {
padding: 3px 15px;
font-size: 11px;
font-weight: bold;
- line-height: 25px;
+ line-height: 26px;
color: #999999;
text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
text-transform: uppercase;
@@ -2650,7 +2650,7 @@ input[type="submit"].btn.btn-mini {
.nav-list .divider {
*width: 100%;
height: 1px;
- margin: 11.5px 1px;
+ margin: 12px 1px;
*margin: -5px 0 5px;
overflow: hidden;
background-color: #e5e5e5;
@@ -2691,7 +2691,7 @@ input[type="submit"].btn.btn-mini {
.nav-tabs > li > a {
padding-top: 8px;
padding-bottom: 8px;
- line-height: 25px;
+ line-height: 26px;
border: 1px solid transparent;
-webkit-border-radius: 4px 4px 0 0;
-moz-border-radius: 4px 4px 0 0;
@@ -2904,7 +2904,7 @@ input[type="submit"].btn.btn-mini {
*position: relative;
*z-index: 2;
overflow: visible;
- margin-bottom: 25px;
+ margin-bottom: 26px;
}
.navbar-inner {
min-height: 40px;
@@ -3096,7 +3096,7 @@ input[type="submit"].btn.btn-mini {
display: inline-block;
padding: 4px 10px 4px;
margin: 5px 5px 6px;
- line-height: 25px;
+ line-height: 26px;
}
.navbar .btn-group {
margin: 0;
@@ -3245,7 +3245,7 @@ input[type="submit"].btn.btn-mini {
}
.breadcrumb {
padding: 7px 14px;
- margin: 0 0 25px;
+ margin: 0 0 26px;
list-style: none;
background-color: #fbfbfb;
background-image: -moz-linear-gradient(top, #ffffff, #f5f5f5);
@@ -3280,8 +3280,8 @@ input[type="submit"].btn.btn-mini {
color: #333333;
}
.pagination {
- height: 50px;
- margin: 25px 0;
+ height: 52px;
+ margin: 26px 0;
}
.pagination ul {
display: inline-block;
@@ -3304,7 +3304,7 @@ input[type="submit"].btn.btn-mini {
.pagination a {
float: left;
padding: 0 14px;
- line-height: 48px;
+ line-height: 50px;
text-decoration: none;
border: 1px solid #ddd;
border-left-width: 0;
@@ -3343,7 +3343,7 @@ input[type="submit"].btn.btn-mini {
}
.pager {
margin-left: 0;
- margin-bottom: 25px;
+ margin-bottom: 26px;
list-style: none;
text-align: center;
*zoom: 1;
@@ -3678,7 +3678,7 @@ input[type="submit"].btn.btn-mini {
}
.thumbnails > li {
float: left;
- margin-bottom: 25px;
+ margin-bottom: 26px;
margin-left: 20px;
}
.thumbnail {
@@ -3967,7 +3967,7 @@ a.badge:hover {
background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
}
.accordion {
- margin-bottom: 25px;
+ margin-bottom: 26px;
}
.accordion-group {
margin-bottom: 2px;
@@ -3992,7 +3992,7 @@ a.badge:hover {
}
.carousel {
position: relative;
- margin-bottom: 25px;
+ margin-bottom: 26px;
line-height: 1;
}
.carousel-inner {
@@ -4104,7 +4104,7 @@ a.badge:hover {
.hero-unit p {
font-size: 18px;
font-weight: 200;
- line-height: 37.5px;
+ line-height: 39px;
color: inherit;
}
.pull-right {
View
3 styles/entries.css
@@ -54,5 +54,8 @@ img.alignleft {
}
div.entry-contents blockquote p {
+ color: #777;
+ font-size: 18px;
+ line-height: 29px;
margin-bottom: 12px !important;
}

0 comments on commit d532426

Please sign in to comment.
Something went wrong with that request. Please try again.