Browse files

font

  • Loading branch information...
1 parent 1c5f757 commit a048cfaf1d55cc4670709c946cd6098050e3daed @lancejpollard lancejpollard committed May 3, 2012
View
18 app/client/stylesheets/application.styl
@@ -11,15 +11,16 @@ $font-color = hsl(0, 0%, 30%)//hsl(186, 46%, 20%)//#32373a
$grey = hsl(0, 0%, 60%)
$code-color = hsl(240, 3%, 36%)
$pre-color = hsl(0, 0%, 94%)//hsl(0, 0%, 90%)
+$header-font = 'Varela', sans-serif;
.navbar-inner
- display: none
+ //display: none
+ font-family: 'Forum', cursive;
background: $grey !important// url(/images/noise.png) !important;
a
color: $white !important
text-shadow: none !important
body
- //font-family: 'Forum', cursive;
position: relative;
background: $blue !important//url(/images/noise.png) !important;
.header ul, .header li, .section li, .header p, .header ol, .section p, .section ul, .section ol, .section cite
@@ -87,20 +88,24 @@ h1, h2, h3, h4
line-height: 1.2
background: transparent
//font-family: 'Josefin Sans', sans-serif; // ok
+ //font-family: 'Krona One', sans-serif;
+ font-family: $header-font;
margin-bottom: 15px;
padding-bottom: 0px;
margin-top: 30px;
padding-bottom: 5px//$baseLineHeight - 1
margin: $baseLineHeight 0
- font-weight: bold
+ font-weight: 700
code
- font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif
+ //font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif
+ font-family: $header-font;
.section
h1
border-top: 5px solid #e6e6e6
padding-top: 15px
margin-top: 0
+ color: hsl(0, 0, 40%) !important//hsl(0, 0%, 55%)
text-shadow: 0 1px 0 hsl(0, 0%, 100%);
code
text-shadow: 0 1px 0 hsl(0, 0%, 100%);
@@ -266,7 +271,10 @@ h1, h2, h3, h4
p, li
font-size: 16px !important
line-height: 1.5 !important
-
+ // remove the next 3 lines to convert back to normal font
+ line-height: 1.4 !important
+ font-family: 'Forum', cursive !important;
+ font-size: 17px !important
pre
white-space: pre !important
View
2 app/views/layouts/application.coffee
@@ -14,7 +14,7 @@ html ->
meta name: "author", content: t("author")
meta name: "viewport", content: "width=device-width, initial-scale=1.0"
- stylesheetTag "http://fonts.googleapis.com/css?family=Forum|Josefin+Sans:400,700"
+ stylesheetTag "http://fonts.googleapis.com/css?family=Forum|Varela"
#stylesheets "lib", "vendor", "application"
stylesheetTag "http://twitter.github.com/bootstrap/assets/css/bootstrap.css"
stylesheetTag "http://twitter.github.com/bootstrap/assets/css/bootstrap-responsive.css"
View
11 public/stylesheets/app/client/stylesheets/application.css
@@ -2,7 +2,7 @@
border-left: 1px solid #fff !important;
}
.navbar-inner {
- display: none;
+ font-family: 'Forum', cursive;
background: #999 !important;
}
.navbar-inner a {
@@ -105,23 +105,25 @@ h3,
h4 {
line-height: 1.2;
background: transparent;
+ font-family: 'Varela', sans-serif;
margin-bottom: 15px;
padding-bottom: 0px;
margin-top: 30px;
padding-bottom: 5px;
margin: $baseLineHeight 0;
- font-weight: bold;
+ font-weight: 700;
}
h1 code,
h2 code,
h3 code,
h4 code {
- font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
+ font-family: 'Varela', sans-serif;
}
.section h1 {
border-top: 5px solid #e6e6e6;
padding-top: 15px;
margin-top: 0;
+ color: #666 !important;
text-shadow: 0 1px 0 #fff;
}
.section h1 code {
@@ -302,6 +304,9 @@ p,
li {
font-size: 16px !important;
line-height: 1.5 !important;
+ line-height: 1.4 !important;
+ font-family: 'Forum', cursive !important;
+ font-size: 17px !important;
}
pre {
white-space: pre !important;

0 comments on commit a048cfa

Please sign in to comment.