Permalink
Browse files

Bug fixes

  • Loading branch information...
1 parent dd66967 commit 0ddb107afca5e8d4a33753c8fd6e13168d884ec5 Andy Clarke committed Apr 22, 2012
Showing with 25 additions and 17 deletions.
  1. +1 −1 320andup.html
  2. +12 −8 css/320andup.css
  3. +12 −8 less/typography.less
View
2 320andup.html
@@ -100,7 +100,7 @@ <h2 class="h3">Blockquote</h2>
<h2 class="h3">Text level elements</h2>
-<table class="table table-bordered">
+<table class="table table-bordered table-striped">
<thead>
<tr>
<th>Element</th>
View
20 css/320andup.css
@@ -156,41 +156,45 @@ h6 small {
}
h1,
.h1 {
+ margin-bottom: 0.75em;
font-size: 32px;
font-size: 3.2rem;
- line-height: 3em;
+ line-height: 1.2;
}
h2,
.h2 {
+ margin-bottom: 0.75em;
font-size: 24px;
font-size: 2.4rem;
- line-height: 3em;
+ line-height: 1.2;
}
h3,
.h3 {
+ margin-bottom: 1em;
font-size: 21px;
font-size: 2.1rem;
- line-height: 2.25em;
+ line-height: 1.3;
}
h4,
.h4 {
+ margin-bottom: 1.5em;
font-size: 18px;
font-size: 1.8rem;
- line-height: 2.25em;
+ line-height: 1.25;
}
h5,
.h5 {
font-size: 16px;
font-size: 1.6rem;
- line-height: 1.875em;
+ margin-bottom: 1.5em;
}
h6,
.h6 {
+ margin-bottom: 1.5em;
font-size: 14px;
font-size: 1.4rem;
font-weight: normal;
letter-spacing: 1px;
- line-height: 1.5em;
text-transform: uppercase;
}
.header h1,
@@ -250,8 +254,8 @@ li ol {
font-size: 1.6rem;
}
blockquote {
- margin: 0 0 1.5em -gutterwidth;
- padding-left: gutterwidth;
+ margin: 0 0 1.5em -24px;
+ padding-left: 24px;
border-left: 2px solid #c7ced6;
font-family: Cambria, Georgia, Times, "Times New Roman";
font-style: normal;
View
20 less/typography.less
@@ -30,35 +30,39 @@ color : @lightgrey; }
h1,
.h1 {
+margin-bottom : @baselineheight / 2;
.font-size(32);
-line-height : @baselineheight * 2; }
+line-height : 1.2; }
h2,
.h2 {
+margin-bottom : @baselineheight / 2;
.font-size(24);
-line-height : @baselineheight * 2; }
+line-height : 1.2; }
h3,
.h3 {
+margin-bottom : @baselineheight / 1.5;
.font-size(21);
-line-height : @baselineheight * 1.5; }
+line-height : 1.3; }
h4,
.h4 {
+margin-bottom : @baselineheight;
.font-size(18);
-line-height : @baselineheight * 1.5; }
+line-height : 1.25; }
h5,
.h5 {
.font-size(16);
-line-height : @baselineheight * 1.25; }
+margin-bottom : @baselineheight; }
h6,
.h6 {
+margin-bottom : @baselineheight;
.font-size(14);
font-weight : normal;
letter-spacing : 1px;
-line-height : @baselineheight;
text-transform : uppercase; }
// header
@@ -119,8 +123,8 @@ margin : 0;
// blockquote
blockquote {
-margin : 0 0 @baselineheight -gutterwidth;
-padding-left : gutterwidth;
+margin : 0 0 @baselineheight -@gutterwidth;
+padding-left : @gutterwidth;
border-left : 2px solid @bordercolor;
font-family : @altfont;
font-style : normal; }

0 comments on commit 0ddb107

Please sign in to comment.