Switched to Ubuntu font.
h3rald h3rald@h3rald.com
Wed, 25 Dec 2013 21:46:17 +0100
4 files changed,
58 insertions(+),
11 deletions(-)
M
content/about.textile
→
content/about.textile
@@ -41,6 +41,6 @@ Special thanks to the following people, who made this web site possible:
* "Denis Defreyne":http://www.stoneship.org/, creator of the exceptional "nanoc":http://nanoc.stoneship.org/ site publishing system. * "David J. Perry":http://scholarsfonts.net/, who designed the "Cardo":http://scholarsfonts.net/cardofnt.html font I used for the H3RALD logo. -* Ćukasz Dziedzic, creator of the "Lato":http://www.latofonts.com font, used throughout the web site. +* The creators of the "Ubuntu":http://font.ubuntu.com/ font, used throughout the web site. * "Mark Otto":https://twitter.com/mdo and "fat-kun":https://twitter.com/fat, creators of the awesome "Bootstrap":http://getbootstrap.com framework. * "Dave Gandy":http://twitter.com/davegandy, designer of the "FontAwesome":http://fontawesome.io/ icon set.
M
content/home.erb
→
content/home.erb
@@ -26,7 +26,7 @@ <%= render 'article_intro', :item => latest[5], :classes => "hyphenate", :extended => false %>
<p><a href="/archives/">← Older Articles</a></p> </section><!-- #main-content end --> <section class="col-md-4" id="secondary-content"> - <span class="featured">Popular Content</span> + <span class="featured">popular</span> <%= render 'article_box', :item => popular[0], :classes => "hyphenate", :extended => true %> <%= render 'article_box', :item => popular[1], :classes => "hyphenate", :extended => false %> <%= render 'article_box', :item => popular[2], :classes => "hyphenate", :extended => false %>
M
content/styles/_vendor.scss
→
content/styles/_vendor.scss
@@ -1,10 +1,10 @@
/* Google Custom Search */ -$font-family: 'Crimson Text', Palatino, Bookman, Georgia, Times; +$font-family: 'Ubuntu', sans-serif; $font-size: 17px; -$link-color: #BD3F00; -$link-hover-color: #712600; +$link-color: #428BCA; +$link-hover-color: #2a6496; /* Google Custom Search Engine */@@ -15,8 +15,28 @@ width: 71px;
margin-top: 4px; } +.gsc-srarch-box, .gs-title, .gs-visibleUrl, .gsc-result-info { + font-family: $font-family; +} + +.gs-snippet { + margin-left: 8px; +} + .gsc-input { padding: 0; +} + +.gsc-cursor-page { + color: #428BCA; +} + +.gsc-cursor-page:hover { + color: #2a6496; +} + +.gsc-cursor-page.gsc-cursor-current-page { + color: #333; } .gsc-input .gsc-input-box {
M
content/styles/style.scss
→
content/styles/style.scss
@@ -4,13 +4,24 @@ @import "_bootstrap.scss";
@import "_vendor.scss"; @import "_coderay.scss"; @import "_font-awesome.scss"; -@import "_lato.scss"; +//@import "_lato.scss"; + +@import url(http://fonts.googleapis.com/css?family=Ubuntu+Mono|Ubuntu:300,300,400,300italic,400italic); /* Bootstrap Overrides */ body, h1, h2, h3, h4, h5, h6 { - font-family: "Lato", sans-serif; + font-family: "Ubuntu", sans-serif; color: #222; + font-weight: 300; +} + +pre, code, samp { + font-family: "Ubuntu Mono", monospace; +} + +b, strong { + font-weight: 400; } pre {@@ -69,8 +80,11 @@ margin-bottom: 20px;
} .featured { - font-variant: small-caps; + display: block; + font-style: italic; + text-align: right; font-size: 130%; + color: #555; } footer {@@ -112,34 +126,42 @@
#main-content > article h1 { line-height: 1em; font-size: 1.6em; + font-weight: 400; } #main-content > article h2 { + margin-top: 0; line-height: 1em; font-size: 1.3em; font-style: italic; + font-weight: 300; } article.page > header h1 { font-size: 2em; - margin-top: -10px; + margin-top: 0; margin-bottom: 0; + font-weight: 400; } #secondary-content > article h1{ - line-height: 1em; + line-height: 1.2em; font-size: 1.3em; + font-weight: 400; } #secondary-content > article h2{ + margin-top: 0; line-height: 1em; font-size: 1em; font-style: italic; + font-weight: 300; } #body-text section header h1, #body-text h2 { font-size: 1.8em; } + h1 > code { font-size: 0.9em; border:none;@@ -153,17 +175,20 @@ #body-text h3 {
margin-top: 1.2em; font-size: 1.5em; font-style: italic; + font-weight: 300px; } article.page > header h2 { margin: 0 0 1em 0; - line-height: 1em; + line-height: 1.2em; + font-weight: 300; } #body-text section section section header h1, #body-text h4 { margin-top: 1.2em; font-size: 1.3em; + font-weight: 300; } #body-text section section section section header h1,@@ -171,12 +196,14 @@ #body-text h5 {
margin-top: 1em; font-size: 1em; font-style: italic; + font-weight: 300; } #body-text section section section section section header h1, #body-text h6 { margin-top: 1em; font-size: 1em; + font-weight: 300; } h1,h2,h3,h4,h5,h6 {