diff --git a/.DS_Store b/.DS_Store index 100f0ae2..14567e08 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/.gitignore b/.gitignore index f4ce7d14..655c1a07 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,6 @@ _site .sass-cache .bundle vendor + +.DS_Store +.ruby-version diff --git a/_config.yml b/_config.yml index 03f4dcc6..b1a0b7e4 100644 --- a/_config.yml +++ b/_config.yml @@ -2,13 +2,21 @@ title: OpenTechSchool email: your-email@domain.com 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 diff --git a/_includes/head.html b/_includes/head.html index 7aa17d96..d0f2b19c 100644 --- a/_includes/head.html +++ b/_includes/head.html @@ -4,7 +4,14 @@ {% if page.title %}{{ page.title }}{% else %}{{ site.title }}{% endif %}{% if page.tagline %} || {{page.tagline}}{%endif%} || OpenTechSchool.org - + + + + + + + + diff --git a/_sass/_layout.scss b/_sass/_layout.scss index 463bbd16..f5c0822c 100644 --- a/_sass/_layout.scss +++ b/_sass/_layout.scss @@ -48,8 +48,8 @@ footer { -@import +@import "layouts/page.scss", "layouts/landing.scss", "layouts/chapter.scss" -; \ No newline at end of file +; diff --git a/_sass/base/_typography.scss b/_sass/base/_typography.scss index 090bee07..d3253163 100644 --- a/_sass/base/_typography.scss +++ b/_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; } diff --git a/_sass/base/_variables.scss b/_sass/base/_variables.scss index bbc53693..c818ece1 100644 --- a/_sass/base/_variables.scss +++ b/_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; diff --git a/_sass/bourbon/bourbon/library/_font-face.scss b/_sass/bourbon/bourbon/library/_font-face.scss index dd210008..7de100b0 100644 --- a/_sass/bourbon/bourbon/library/_font-face.scss +++ b/_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, diff --git a/fonts/Esteban/Esteban-Regular.ttf b/fonts/Esteban/Esteban-Regular.ttf new file mode 100755 index 00000000..f278773f Binary files /dev/null and b/fonts/Esteban/Esteban-Regular.ttf differ diff --git a/fonts/Esteban/OFL.txt b/fonts/Esteban/OFL.txt new file mode 100755 index 00000000..64dce555 --- /dev/null +++ b/fonts/Esteban/OFL.txt @@ -0,0 +1,93 @@ +Copyright (c) 2011, Ang�lica D�iaz (http://typereview.wordpress.com|angiecina@gmail.com), +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. diff --git a/fonts/Montserrat/Montserrat-Black.ttf b/fonts/Montserrat/Montserrat-Black.ttf new file mode 100755 index 00000000..bf5443c5 Binary files /dev/null and b/fonts/Montserrat/Montserrat-Black.ttf differ diff --git a/fonts/Montserrat/Montserrat-BlackItalic.ttf b/fonts/Montserrat/Montserrat-BlackItalic.ttf new file mode 100755 index 00000000..3eee3a76 Binary files /dev/null and b/fonts/Montserrat/Montserrat-BlackItalic.ttf differ diff --git a/fonts/Montserrat/Montserrat-Bold.ttf b/fonts/Montserrat/Montserrat-Bold.ttf new file mode 100755 index 00000000..8e9a5f3f Binary files /dev/null and b/fonts/Montserrat/Montserrat-Bold.ttf differ diff --git a/fonts/Montserrat/Montserrat-BoldItalic.ttf b/fonts/Montserrat/Montserrat-BoldItalic.ttf new file mode 100755 index 00000000..2c336300 Binary files /dev/null and b/fonts/Montserrat/Montserrat-BoldItalic.ttf differ diff --git a/fonts/Montserrat/Montserrat-ExtraBold.ttf b/fonts/Montserrat/Montserrat-ExtraBold.ttf new file mode 100755 index 00000000..1e3692d6 Binary files /dev/null and b/fonts/Montserrat/Montserrat-ExtraBold.ttf differ diff --git a/fonts/Montserrat/Montserrat-ExtraBoldItalic.ttf b/fonts/Montserrat/Montserrat-ExtraBoldItalic.ttf new file mode 100755 index 00000000..5f6c3824 Binary files /dev/null and b/fonts/Montserrat/Montserrat-ExtraBoldItalic.ttf differ diff --git a/fonts/Montserrat/Montserrat-ExtraLight.ttf b/fonts/Montserrat/Montserrat-ExtraLight.ttf new file mode 100755 index 00000000..7490dc73 Binary files /dev/null and b/fonts/Montserrat/Montserrat-ExtraLight.ttf differ diff --git a/fonts/Montserrat/Montserrat-ExtraLightItalic.ttf b/fonts/Montserrat/Montserrat-ExtraLightItalic.ttf new file mode 100755 index 00000000..24e13547 Binary files /dev/null and b/fonts/Montserrat/Montserrat-ExtraLightItalic.ttf differ diff --git a/fonts/Montserrat/Montserrat-Italic.ttf b/fonts/Montserrat/Montserrat-Italic.ttf new file mode 100755 index 00000000..c5a36e58 Binary files /dev/null and b/fonts/Montserrat/Montserrat-Italic.ttf differ diff --git a/fonts/Montserrat/Montserrat-Light.ttf b/fonts/Montserrat/Montserrat-Light.ttf new file mode 100755 index 00000000..e66dc5bf Binary files /dev/null and b/fonts/Montserrat/Montserrat-Light.ttf differ diff --git a/fonts/Montserrat/Montserrat-LightItalic.ttf b/fonts/Montserrat/Montserrat-LightItalic.ttf new file mode 100755 index 00000000..b78b8b73 Binary files /dev/null and b/fonts/Montserrat/Montserrat-LightItalic.ttf differ diff --git a/fonts/Montserrat/Montserrat-Medium.ttf b/fonts/Montserrat/Montserrat-Medium.ttf new file mode 100755 index 00000000..88d70b89 Binary files /dev/null and b/fonts/Montserrat/Montserrat-Medium.ttf differ diff --git a/fonts/Montserrat/Montserrat-MediumItalic.ttf b/fonts/Montserrat/Montserrat-MediumItalic.ttf new file mode 100755 index 00000000..225fd18f Binary files /dev/null and b/fonts/Montserrat/Montserrat-MediumItalic.ttf differ diff --git a/fonts/Montserrat/Montserrat-Regular.ttf b/fonts/Montserrat/Montserrat-Regular.ttf new file mode 100755 index 00000000..626355a2 Binary files /dev/null and b/fonts/Montserrat/Montserrat-Regular.ttf differ diff --git a/fonts/Montserrat/Montserrat-SemiBold.ttf b/fonts/Montserrat/Montserrat-SemiBold.ttf new file mode 100755 index 00000000..61570450 Binary files /dev/null and b/fonts/Montserrat/Montserrat-SemiBold.ttf differ diff --git a/fonts/Montserrat/Montserrat-SemiBoldItalic.ttf b/fonts/Montserrat/Montserrat-SemiBoldItalic.ttf new file mode 100755 index 00000000..c6dd9773 Binary files /dev/null and b/fonts/Montserrat/Montserrat-SemiBoldItalic.ttf differ diff --git a/fonts/Montserrat/Montserrat-Thin.ttf b/fonts/Montserrat/Montserrat-Thin.ttf new file mode 100755 index 00000000..dc16a022 Binary files /dev/null and b/fonts/Montserrat/Montserrat-Thin.ttf differ diff --git a/fonts/Montserrat/Montserrat-ThinItalic.ttf b/fonts/Montserrat/Montserrat-ThinItalic.ttf new file mode 100755 index 00000000..b9e12f4a Binary files /dev/null and b/fonts/Montserrat/Montserrat-ThinItalic.ttf differ diff --git a/fonts/Montserrat/OFL.txt b/fonts/Montserrat/OFL.txt new file mode 100755 index 00000000..90ed8151 --- /dev/null +++ b/fonts/Montserrat/OFL.txt @@ -0,0 +1,92 @@ +Copyright 2011 The Montserrat Project Authors (julieta.ulanovsky@gmail.com) +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.