add fonts, set typography, improve gitignore

.gitignore

@@ -2,3 +2,6 @@ _site
 .sass-cache
 .bundle
 vendor
+
+.DS_Store
+.ruby-version

_config.yml

@@ -2,13 +2,21 @@
 title: OpenTechSchool
 email: [email protected]
 description: > # this means to ignore newlines until "baseurl:"
-  Write an awesome description for your new site here. You can edit this
-  line in _config.yml. It will appear in your document head meta (for
-  Google search results) and in your feed.xml site description.
+  OpenTechSchool is a community initiative to
+    provide programming and other tech-related workshops to women and their
+    friends of all genders. We take care of the organizational side of things
+    (venues, press, finding participants) and let our volunteer coaches to create
+    the curriculum according to their vision. Our main goal is to create a
+    friendly and safe learning environment where no one feels shy about asking any
+    question. Everyone, no matter what their gender, skill level or experience, is
+    invited to participate, whether as a coach or a learner
 baseurl: "" # the subpath of your site, e.g. /blog/
 url: "http://opentechschool.org" # the base hostname & protocol for your site
 twitter_username: OpenTechSchool
+twitter_url: twitter.com/OpenTechSchool
 github_username:  OpenTechSchool
+github_url: github.com/OpenTechSchool
+forum_url: discourse.opentechschool.org
 
 # Build settings
 markdown: kramdown

_includes/head.html

@@ -4,7 +4,14 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
 
     <title>{% if page.title %}{{ page.title }}{% else %}{{ site.title }}{% endif %}{% if page.tagline %} || {{page.tagline}}{%endif%} || OpenTechSchool.org</title>
-    <meta name="description" content="{{ site.description }}">
+    <meta name="description" content="{{ site.description }}" />
+	  <meta name="author" content="OpenTechSchool">
+	  <meta property="og:title" content="OpenTechSchool" />
+	  <meta property="og:type" content="school" />
+	  <meta property="og:url" content="http://{{ site.url }}" />
+	  <meta property="og:image" content="http://{{ site.url }}/images/ots_logo_fb.png" />
+	  <meta property="og:site_name" content="{{ site.url }}" />
+	  <meta property="og:description" content="{{ site.description }}" />
 
     <link rel="stylesheet" href="{{ "/css/main.css" | prepend: site.baseurl }}">
     <link rel="canonical" href="{{ page.url | replace:'index.html','' | prepend: site.baseurl | prepend: site.url }}">

_sass/_layout.scss

@@ -48,8 +48,8 @@ footer {
 
 
 
-@import 
+@import
 	"layouts/page.scss",
 	"layouts/landing.scss",
 	"layouts/chapter.scss"
-;
+;

_sass/base/_typography.scss

@@ -1,3 +1,7 @@
+html {
+  font-size: 62.5%; // =10px
+}
+
 body {
   color: $base-font-color;
   font-family: $base-font-family;
@@ -19,7 +23,31 @@ h6 {
   margin: 0 0 $small-spacing;
 }
 
+h1 {
+  font-size: 24px;
+  font-size: 2.4rem;
+}
+
+h2 {
+  font-size: 10px;
+  font-size: 2rem;
+}
+
+h3 {
+  font-size: 18px;
+  font-size: 1.8rem;
+}
+
+h1, h2 {
+  padding: 20px 0;
+}
+
+h3, h4 {
+  padding: 10px 0;
+}
+
 p {
+  text-align: justify;
   margin: 0 0 $small-spacing;
 }
 

_sass/base/_variables.scss

@@ -1,22 +1,70 @@
-// brand
+// Fonts
 
-$brand-color: #085987;
-$brand-color-lighter: #1F8AB6;
-$brand-color-lightest: #2FB0D5;
+// Esteban
+@include font-face('Esteban', '/fonts/Esteban/Esteban-Regular', 400, $file-formats: ttf);
 
-$brand-color-black: #222222;
-$brand-color-red: #E04C3E;
-$brand-color-red-strong: #FD4B22; 
+// Montserrat
+@include font-face('Montserrat', '/fonts/Montserrat/Montserrat-Regular', 400, $file-formats: ttf);
+@include font-face('Montserrat', '/fonts/Montserrat/Montserrat-Light', 300, $file-formats: ttf);
+@include font-face('Montserrat', '/fonts/Montserrat/Montserrat-Italic', 400, italic, $file-formats: ttf);
+@include font-face('Montserrat', '/fonts/Montserrat/Montserrat-LightItalic', 300, italic, $file-formats: ttf);
+@include font-face('Montserrat', '/fonts/Montserrat/Montserrat-Bold', 700, $file-formats: ttf);
+@include font-face('Montserrat', '/fonts/Montserrat/Montserrat-ExtraLight', 100, $file-formats: ttf);
 
 
+$font-stack-esteban: (
+  "Esteban",
+  serif,
+);
+
+$font-stack-mountserrat: (
+  "Montserrat",
+  sans-serif,
+);
+
+
+// OTS colors
+$ots_blue: #085987; /* main blue, logo */
+$ots_blue_l: #1F8AB6; /* Blue links */
+$ots_blue_h: #2FB0D5; /* Blue hover states */
+$ots_text: #222222; /* Default text color*/
+
+$ots_text_i: #84ACC3; /* (Inverted) Text color on dark blue backgrounds */
+$ots_text_i_l: #C1D5E1; /* (Inverted) Link color on dark blue backgrounds */
+
+$ots_red_l: #E04C3E; /* Highlighted, red links, buttons, other highlights */
+$ots_red_h: #FD4B22; /* Red hover states */
+
+
+// brand - use bitters vars name
+$brand-color: $ots_blue;
+$brand-color-lighter: $ots_blue_l;
+$brand-color-lightest: $ots_blue_h;
+
+$brand-color-black: $ots_text;
+$brand-color-red: $ots_red_l;
+$brand-color-red-strong: $ots_red_h;
+
+
+// Colors
+$blue: $brand-color;
+$dark-gray: $brand-color-black;
+$medium-gray: #999;
+$light-gray: #ddd;
+$white: #fff;
+
+// Font Colors
+$base-font-color: $brand-color-black;
+$action-color: $brand-color-lighter;
+
 
 // Breakpoints
 $medium-screen: 600px;
 $large-screen: 900px;
 
 // Typography
-$base-font-family: $font-stack-system;
-$heading-font-family: $base-font-family;
+$base-font-family: $font-stack-esteban;
+$heading-font-family: $font-stack-mountserrat;
 
 // Font Sizes
 $base-font-size: 1em;
@@ -31,16 +79,6 @@ $base-spacing: $base-line-height * 1em;
 $small-spacing: $base-spacing / 2;
 $base-z-index: 0;
 
-// Colors
-$blue: $brand-color;
-$dark-gray: $brand-color-black;
-$medium-gray: #999;
-$light-gray: #ddd;
-
-// Font Colors
-$base-font-color: $brand-color-black;
-$action-color: $brand-color-lighter;
-
 // Border
 $base-border-color: $light-gray;
 $base-border: 1px solid $base-border-color;

_sass/bourbon/bourbon/library/_font-face.scss

@@ -49,12 +49,16 @@
 @mixin font-face(
     $font-family,
     $file-path,
+    $weight: normal,
+    $style: normal,
     $file-formats: _retrieve-bourbon-setting("global-font-file-formats"),
     $asset-pipeline: _retrieve-bourbon-setting("rails-asset-pipeline")
   ) {
 
   @font-face {
     font-family: $font-family;
+    font-style: $style;
+    font-weight: $weight;
     src: _font-source-declaration(
       $font-family,
       $file-path,

fonts/Esteban/OFL.txt

@@ -0,0 +1,93 @@
+Copyright (c) 2011, Ang�lica D�iaz (http://typereview.wordpress.com|[email protected]),
+with Reserved Font Name "Esteban"
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded, 
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.