lines-engine 0.3 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 102ab36e8069def0ec587ad8212359cd08ae2459
-  data.tar.gz: 28b9ed32939326854249fafa42a582879b5ee1fe
+  metadata.gz: d79594edd289606077b5e2f2372474a84e0ac485
+  data.tar.gz: 4c2022aad36fffea67189b7161ceccd8f08f7a96
 SHA512:
-  metadata.gz: f4d976f97ccfd30ca929f50b8f2e13e8bb0fa4a0a1590b426fdc10b2711b0478e97bb128f7676eab722f3a40ab0b50e42aad953c7526bd114526d3a51f8abe90
-  data.tar.gz: 7cea63bd5a0ed6c8e6c5bd97e720b7f27a91f3348164da0be32a4826fbae41872b5daf8f2f225d62996feb148f2aa46d58026c89c09176edb09b372ff34689ed
+  metadata.gz: cee05d60e72b6e3fd45d67624885e1fadb96bb5063d527aaa43d6da8ea8b2c624935baff9e02f296762d3e5cfda0aab0367d4cc85ea8575924691b1d995ddd98
+  data.tar.gz: 28f0e039b8394e8c850290c7de097a9044592ecc08f2e28d39bd1c662de05c29e176896eae3d3bdd31dde1c672ed87ca3daec27d34611913a7342d31e9b74f81

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.3.1
+
+- Fonts are now referenced by unified names and font attributes ('Ubuntu' instead of 'UbuntuBold' and 'UbuntuItalic')
+
 ## 0.3 
 
 - Heavily simplified CSS and markup for articles

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    lines-engine (0.3)
+    lines-engine (0.3.1)
       acts-as-taggable-on (~> 3.2.6, >= 3.2.6)
       bcrypt (~> 3.1.0, >= 3.1.0)
       carrierwave (~> 0.10.0, >= 0.10.0)

data/app/assets/stylesheets/lines/fonts.css.scss

@@ -11,24 +11,24 @@
 }
 
 @font-face {
-  font-family: 'BPmonoItalic';
+  font-family: 'BPmono';
   src: url('/assets/BPmonoItalics-webfont.eot');
   src: url('/assets/BPmonoItalics-webfont.eot?#iefix') format('embedded-opentype'),
   url('/assets/BPmonoItalics-webfont.woff') format('woff'),
   url('/assets/BPmonoItalics-webfont.ttf') format('truetype'),
   url('/assets/BPmonoItalics-webfont.svg#BPmonoItalics-webfont') format('svg');
   font-weight: normal;
-  font-style: normal;
+  font-style: italic;
 }
 
 @font-face {
-  font-family: 'BPmonoBold';
+  font-family: 'BPmono';
   src: url('/assets/BPmonoBold-webfont.eot');
   src: url('/assets/BPmonoBold-webfont.eot?#iefix') format('embedded-opentype'),
   url('/assets/BPmonoBold-webfont.woff') format('woff'),
   url('/assets/BPmonoBold-webfont.ttf') format('truetype'),
   url('/assets/BPmonoBold-webfont.svg#BPmonoBold-webfont') format('svg');
-  font-weight: normal;
+  font-weight: bold;
   font-style: normal;
 }
 
@@ -39,18 +39,18 @@
   url('/assets/Museo500-Regular-webfont.woff') format('woff'),
   url('/assets/Museo500-Regular-webfont.ttf') format('truetype'),
   url('/assets/Museo500-Regular-webfont.svg#Museo500-Regular-webfont') format('svg');
-  font-weight: normal;
+  font-weight: 500;
   font-style: normal;
 }
 
 @font-face {
-  font-family: 'MuseoLight';
+  font-family: 'Museo';
   src: url('/assets/Museo300-Regular-webfont.eot');
   src: url('/assets/Museo300-Regular-webfont.eot?#iefix') format('embedded-opentype'),
   url('/assets/Museo300-Regular-webfont.woff') format('woff'),
   url('/assets/Museo300-Regular-webfont.ttf') format('truetype'),
   url('/assets/Museo300-Regular-webfont.svg#Museo300-Regular-webfont') format('svg');
-  font-weight: normal;
+  font-weight: 300;
   font-style: normal;
 }
 
@@ -66,25 +66,25 @@
 }
 
 @font-face {
-  font-family: 'UbuntuBold';
+  font-family: 'Ubuntu';
   src: url('/assets/Ubuntu-B-webfont.eot');
   src: url('/assets/Ubuntu-B-webfont.eot?#iefix') format('embedded-opentype'),
   url('/assets/Ubuntu-B-webfont.woff') format('woff'),
   url('/assets/Ubuntu-B-webfont.ttf') format('truetype'),
   url('/assets/Ubuntu-B-webfont.svg#Ubuntu-B-webfont') format('svg');
-  font-weight: normal;
+  font-weight: bold;
   font-style: normal;
 }
 
 @font-face {
-  font-family: 'UbuntuItalic';
+  font-family: 'Ubuntu';
   src: url('/assets/Ubuntu-RI-webfont.eot');
   src: url('/assets/Ubuntu-RI-webfont.eot?#iefix') format('embedded-opentype'),
   url('/assets/Ubuntu-RI-webfont.woff') format('woff'),
   url('/assets/Ubuntu-RI-webfont.ttf') format('truetype'),
   url('/assets/Ubuntu-RI-webfont.svg#Ubuntu-R-webfont') format('svg');
   font-weight: normal;
-  font-style: normal;
+  font-style: italic;
 }
 
 @font-face {

data/app/assets/stylesheets/lines/style.css.scss

@@ -46,8 +46,8 @@ a {
 }
 
 i, em, strong, b { font-weight: normal; font-style: normal; }
-i, em { font-family: 'UbuntuItalic'; }
-strong, b { font-family: 'UbuntuBold'; }
+i, em { font-family: 'Ubuntu'; font-style: italic; }
+strong, b { font-family: 'Ubuntu'; font-weight: bold; }
 
 ul li { list-style-position: inside; }
 
@@ -80,6 +80,7 @@ header {
   max-width: $max-width;
   padding: 20px;
   font-family: 'Museo';
+  font-weight: 500;
   font-size: 1.188em;
   border-bottom: 1px solid #e3e3e3;
   a {
@@ -95,7 +96,6 @@ header {
 }
 
 
-
 /*-----------------------------------------------------------*/
 /*-----------------------------------------------------------*/
 /*-----------------------  3. CONTENT  ----------------------*/
@@ -116,7 +116,6 @@ header {
   font-size: 1.125em;
   color: #555;
 
-
   .hero_image {
     margin-top: 1.2em;
   }
@@ -126,7 +125,7 @@ header {
     padding: 0 15px;
     h1  {
       font-family: 'Museo';
-      font-weight: normal;
+      font-weight: 500;
       font-size: 2.4em;
       line-height: 1.01em;
       letter-spacing: -0.03em;
@@ -152,7 +151,7 @@ header {
     padding: 0 10%;
     margin: 30px auto;
     .more-link { display: none; }
-    p { font-family: 'UbuntuBold'; }
+    p { font-weight: bold; }
   } 
 
   .article_content {
@@ -162,6 +161,7 @@ header {
 
     h1 {
       font-family: 'Museo';
+      font-weight: 500;
       font-size: 1.3em;
       color: $darkgrey;
       text-transform: uppercase;
@@ -179,7 +179,8 @@ header {
 
     h3 {
       font-size: 1.111em;
-      font-family: 'UbuntuBold';
+      font-family: 'Ubuntu';
+      font-weight: bold;
       margin: 30px 0 0 0;
     }
 
@@ -192,7 +193,8 @@ header {
 
     h5 {
       font-size: 1em;
-      font-family: 'UbuntuBold';
+      font-family: 'Ubuntu';
+      font-weight: bold;
       margin: 20px 0 0 0;
     }
 
@@ -216,8 +218,8 @@ header {
       font-size: 1.125em;
       color:#999;
       letter-spacing: -0.02em;
-      em { font-family: 'BPmonoItalic'; letter-spacing: -0.02em; }
-      strong { font-family: 'BPmonoBold'; }
+      em { font-style: italic; letter-spacing: -0.02em; }
+      strong { font-weight: bold; }
     }
 
     pre {
@@ -272,7 +274,7 @@ header {
       h2 { display: none; }
     }
     .article_teaser {
-      p { font-family: 'Ubuntu'; }
+      p { font-weight: normal; }
       .more-link {
         display: block;
         margin:40px auto 0 auto;
@@ -294,11 +296,8 @@ header {
     }
     .article_googleplus, .article_footer, .article_content { display:none; }
   }
-
 }
 
-
-
 #pagination {
   display: block;
   overflow: visible;
@@ -377,20 +376,21 @@ footer, #footer {
   h2, h2 a {
     margin-top: 20px;
     text-transform: uppercase;
-    font-family: 'MuseoLight';
+    font-family: 'Museo';
     font-size: 1.2em;
-    font-weight: normal;
+    font-weight: 300;
     letter-spacing: 0.03em;
   }
 
-
   span.label {
     text-transform: uppercase;
     font-size:13px;
     color:#c0bfbf;
   }
+
   .weekday {
-    font-family: 'MuseoLight';
+    font-family: 'Museo';
+    font-weight: 300;
     color: $darkgrey;
   }
   

data/lib/lines/version.rb

@@ -1,3 +1,3 @@
 module Lines
-  VERSION = "0.3"
+  VERSION = "0.3.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lines-engine
 version: !ruby/object:Gem::Version
-  version: '0.3'
+  version: 0.3.1
 platform: ruby
 authors:
 - Opoloo GbR
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-04 00:00:00.000000000 Z
+date: 2014-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: orm_adapter