Permalink
Browse files

Cleaned up the tests and view

  • Loading branch information...
1 parent ff80386 commit 0cf1fcac0022822b745d17de04fde10def066676 @adamstac committed Nov 25, 2011
Showing with 124 additions and 27 deletions.
  1. +31 −6 test/public/stylesheets/stylesheet.css
  2. +30 −6 test/sass/stylesheet.sass
  3. +63 −15 test/views/index.haml
@@ -54,6 +54,10 @@ article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav,
display: block;
}
+body {
+ border-top: 6px solid black;
+}
+
.grid-container {
zoom: 1;
margin-right: auto;
@@ -75,7 +79,7 @@ article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav,
}
.grid-full {
- width: 940px;
+ width: 620px;
zoom: 1;
-moz-box-sizing: border-box;
-webkit-box-sizing: border-box;
@@ -86,6 +90,8 @@ article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav,
position: relative;
margin-right: 10px;
margin-left: 10px;
+ margin-left: 170px;
+ margin-right: 170px;
}
.grid-full:before, .grid-full:after {
content: ".";
@@ -106,26 +112,45 @@ h1 {
font-size: 28px;
font-weight: bold;
letter-spacing: -1px;
- text-transform: uppercase;
margin: 75px 0;
+ text-align: center;
+ text-transform: uppercase;
+}
+
+.on-dark, .family.dark {
+ background: black;
+ color: white;
+}
+
+.on-light, .family {
+ background: #f0f0f0;
+ color: black;
}
.family {
- border-bottom: 3px dashed #aaaaaa;
font-size: 26px;
margin-bottom: 70px;
- padding-bottom: 70px;
+ overflow: hidden;
+ padding: 40px;
+}
+
+.font-family {
+ font-size: 30px;
+ margin-bottom: 25px;
}
.super-size {
- font-size: 110px;
+ font-size: 70px;
+ line-height: 1.25;
margin-top: 30px;
+ white-space: nowrap;
}
.base, .normal, .bold, .italic {
line-height: 1.5;
- font-size: 30px;
+ font-size: 20px;
margin-bottom: 0;
+ white-space: nowrap;
}
.normal {
View
@@ -6,34 +6,58 @@
@import "../../stylesheets/font-stacks"
@import "grid-coordinates"
+body
+ border-top: 6px solid #000
+
.grid-container
+grid-container
.grid-full
- +grid-full
+ +grid(8)
+ +grid-prefix(2)
+ +grid-suffix(2)
h1
+font-family("Gill Sans")
font-size: 28px
font-weight: bold
letter-spacing: -1px
- text-transform: uppercase
margin: 75px 0
+ text-align: center
+ text-transform: uppercase
+
+.on-dark
+ background: #000
+ color: #fff
+
+.on-light
+ background: #f0f0f0
+ color: #000
.family
- border-bottom: 3px dashed #aaa
+ @extend .on-light
font-size: 26px
margin-bottom: 70px
- padding-bottom: 70px
+ overflow: hidden
+ padding: 40px
+ &.dark
+ @extend .on-dark
+
+.font-family
+ font-size: 30px
+ margin-bottom: 25px
.super-size
- font-size: 110px
+ font-size: 70px
+ line-height: 1.25
margin-top: 30px
+ white-space: nowrap
.base
line-height: 1.5
- font-size: 30px
+ font-size: 20px
margin-bottom: 0
+ white-space: nowrap
.normal
@extend .base
View
@@ -2,58 +2,106 @@
%h1 Font Stacks
+-# Serif
+
.family.garamond
- %p.font Garamond
+ %p.font-family Garamond
= render :partial => "stack"
.family.lucida-bright
- %p.font Lucida Bright
+ %p.font-family Lucida Bright
= render :partial => "stack"
.family.palatino
- %p.font Palatino
+ %p.font-family Palatino
= render :partial => "stack"
.family.big-caslon
- %p.font Big Caslon
+ %p.font-family Big Caslon
= render :partial => "stack"
.family.didot
- %p.font Didot
+ %p.font-family Didot
= render :partial => "stack"
.family.baskerville
- %p.font Baskerville
+ %p.font-family Baskerville
= render :partial => "stack"
.family.hoefler-text
- %p.font Hoefler Text
+ %p.font-family Hoefler Text
= render :partial => "stack"
.family.bodoni-mt
- %p.font Bodoni MT
+ %p.font-family Bodoni MT
= render :partial => "stack"
.family.goudy-old-style
- %p.font Goudy Old Style
+ %p.font-family Goudy Old Style
= render :partial => "stack"
.family.constantia
- %p.font Constantia
+ %p.font-family Constantia
= render :partial => "stack"
.family.cambria
- %p.font Cambria
+ %p.font-family Cambria
= render :partial => "stack"
.family.book-antiqua
- %p.font Book Antiqua
+ %p.font-family Book Antiqua
+ = render :partial => "stack"
+
+.family.times
+ %p.font-family Times New Roman
= render :partial => "stack"
+-# Sans-serif
+
.family.calibri
- %p.font Calibri
+ %p.font-family Calibri
= render :partial => "stack"
-.family.times
- %p.font Times New Roman
+.family.franklin-gothic-medium
+ %p.font-family Franklin Gothic Medium
+ = render :partial => "stack"
+
+.family.futura
+ %p.font-family Futura
+ = render :partial => "stack"
+
+.family.geneva
+ %p.font-family Geneva
+ = render :partial => "stack"
+
+.family.gill-sans
+ %p.font-family Gill Sans
+ = render :partial => "stack"
+
+.family.helvetica-neue
+ %p.font-family Helvetica Neue
+ = render :partial => "stack"
+
+.family.lucida-grande
+ %p.font-family Lucida Grande
+ = render :partial => "stack"
+
+.family.optima
+ %p.font-family Optima
+ = render :partial => "stack"
+
+.family.tahoma
+ %p.font-family Tahoma
+ = render :partial => "stack"
+
+.family.trebuchet-ms
+ %p.font-family Trebuchet MS
+ = render :partial => "stack"
+
+.family.verdana
+ %p.font-family Verdana
+ = render :partial => "stack"
+
+.family.monospace
+ %p.font-family Monospace
= render :partial => "stack"

0 comments on commit 0cf1fca

Please sign in to comment.