Skip to content
This repository has been archived by the owner on Jan 14, 2018. It is now read-only.

Commit

Permalink
Bug fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
Andy Clarke committed Apr 22, 2012
1 parent dd66967 commit 0ddb107
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 17 deletions.
2 changes: 1 addition & 1 deletion 320andup.html
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ <h2 class="h3">Blockquote</h2>


<h2 class="h3">Text level elements</h2> <h2 class="h3">Text level elements</h2>


<table class="table table-bordered"> <table class="table table-bordered table-striped">
<thead> <thead>
<tr> <tr>
<th>Element</th> <th>Element</th>
Expand Down
20 changes: 12 additions & 8 deletions css/320andup.css
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -156,41 +156,45 @@ h6 small {
} }
h1, h1,
.h1 { .h1 {
margin-bottom: 0.75em;
font-size: 32px; font-size: 32px;
font-size: 3.2rem; font-size: 3.2rem;
line-height: 3em; line-height: 1.2;
} }
h2, h2,
.h2 { .h2 {
margin-bottom: 0.75em;
font-size: 24px; font-size: 24px;
font-size: 2.4rem; font-size: 2.4rem;
line-height: 3em; line-height: 1.2;
} }
h3, h3,
.h3 { .h3 {
margin-bottom: 1em;
font-size: 21px; font-size: 21px;
font-size: 2.1rem; font-size: 2.1rem;
line-height: 2.25em; line-height: 1.3;
} }
h4, h4,
.h4 { .h4 {
margin-bottom: 1.5em;
font-size: 18px; font-size: 18px;
font-size: 1.8rem; font-size: 1.8rem;
line-height: 2.25em; line-height: 1.25;
} }
h5, h5,
.h5 { .h5 {
font-size: 16px; font-size: 16px;
font-size: 1.6rem; font-size: 1.6rem;
line-height: 1.875em; margin-bottom: 1.5em;
} }
h6, h6,
.h6 { .h6 {
margin-bottom: 1.5em;
font-size: 14px; font-size: 14px;
font-size: 1.4rem; font-size: 1.4rem;
font-weight: normal; font-weight: normal;
letter-spacing: 1px; letter-spacing: 1px;
line-height: 1.5em;
text-transform: uppercase; text-transform: uppercase;
} }
.header h1, .header h1,
Expand Down Expand Up @@ -250,8 +254,8 @@ li ol {
font-size: 1.6rem; font-size: 1.6rem;
} }
blockquote { blockquote {
margin: 0 0 1.5em -gutterwidth; margin: 0 0 1.5em -24px;
padding-left: gutterwidth; padding-left: 24px;
border-left: 2px solid #c7ced6; border-left: 2px solid #c7ced6;
font-family: Cambria, Georgia, Times, "Times New Roman"; font-family: Cambria, Georgia, Times, "Times New Roman";
font-style: normal; font-style: normal;
Expand Down
20 changes: 12 additions & 8 deletions less/typography.less
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -30,35 +30,39 @@ color : @lightgrey; }


h1, h1,
.h1 { .h1 {
margin-bottom : @baselineheight / 2;
.font-size(32); .font-size(32);
line-height : @baselineheight * 2; } line-height : 1.2; }


h2, h2,
.h2 { .h2 {
margin-bottom : @baselineheight / 2;
.font-size(24); .font-size(24);
line-height : @baselineheight * 2; } line-height : 1.2; }


h3, h3,
.h3 { .h3 {
margin-bottom : @baselineheight / 1.5;
.font-size(21); .font-size(21);
line-height : @baselineheight * 1.5; } line-height : 1.3; }


h4, h4,
.h4 { .h4 {
margin-bottom : @baselineheight;
.font-size(18); .font-size(18);
line-height : @baselineheight * 1.5; } line-height : 1.25; }


h5, h5,
.h5 { .h5 {
.font-size(16); .font-size(16);
line-height : @baselineheight * 1.25; } margin-bottom : @baselineheight; }


h6, h6,
.h6 { .h6 {
margin-bottom : @baselineheight;
.font-size(14); .font-size(14);
font-weight : normal; font-weight : normal;
letter-spacing : 1px; letter-spacing : 1px;
line-height : @baselineheight;
text-transform : uppercase; } text-transform : uppercase; }


// header // header
Expand Down Expand Up @@ -119,8 +123,8 @@ margin : 0;
// blockquote // blockquote


blockquote { blockquote {
margin : 0 0 @baselineheight -gutterwidth; margin : 0 0 @baselineheight -@gutterwidth;
padding-left : gutterwidth; padding-left : @gutterwidth;
border-left : 2px solid @bordercolor; border-left : 2px solid @bordercolor;
font-family : @altfont; font-family : @altfont;
font-style : normal; } font-style : normal; }
Expand Down

0 comments on commit 0ddb107

Please sign in to comment.