Updates style settings.

joegattnet · Jun 24, 2013 · a1f2feb · a1f2feb
1 parent a888a49
commit a1f2feb
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 9 deletions.
diff --git a/app/assets/stylesheets/_variables.css.sass b/app/assets/stylesheets/_variables.css.sass
@@ -14,7 +14,7 @@ $total-width:               settings_styling('total_width')
 $line-height:               settings_styling('line_height') * 1px
 $text-indent:               settings_styling('gutter_width') * 1px
 
-$font-family:               settings_styling('font_family')
+$font-family:               settings_styling('headline_font_family')
 $font-size:                 settings_styling('font_size')
 $font-color:                settings_styling('font_color')
 
@@ -23,6 +23,10 @@ $body-font-size:            settings_styling('body_font_size')
 $body-font-color:           settings_styling('body_font_color')
 $count-color:               settings_styling('count_color')
 
+$body-font-citation-family: settings_styling('body_font_citation_family')
+$body-font-citation-size:   settings_styling('body_font_citation_size')
+$body-font-citation-color:  settings_styling('body_font_citation_color')
+
 $headline-font:             settings_styling('headline_font')
 $headline-font-family:      settings_styling('headline_font_family')
 $headline-font-color:       settings_styling('headline_font_color')

diff --git a/app/assets/stylesheets/themes/default.css.sass b/app/assets/stylesheets/themes/default.css.sass
@@ -60,10 +60,10 @@
   text-align: justify
 
 =body-font-citation
-  color: $body-font-color
+  color: $body-font-citation-color
   font:
-    family: $font-family
-    size: $font-size
+    family: $body-font-citation-family
+    size: $body-font-citation-size
   text-align: justify
 
 ///////////////////////////////

diff --git a/config/nembrot.yml b/config/nembrot.yml
@@ -77,18 +77,21 @@ defaults: &defaults
     gutter_width: 30
     columns: 12
     total_width: '100%'
-    font_family: 'Arial, Helvetica, sans-serif'
-    font_size: '14px'
+    font_family: 'DejaVuSansCondensed, Arial, Helvetica, sans-serif'
+    font_size: '15px'
     font_color: '#000'
     body_font_family: 'Georgia, serif'
     body_font_size: '18px'
     body_font_color: '#000'
+    body_font_citation_family: 'DejaVuSansCondensed, Arial, Helvetica, sans-serif'
+    body_font_citation_size: '15px'
+    body_font_citation_color: '#000'
     count_color: '#c00'
     headline_font: 'DejaVuSansCondensed'
-    headline_font_family: 'DejaVuSansCondensed, sans-serif'
+    headline_font_family: 'DejaVuSansCondensed, Arial, Helvetica, sans-serif'
     headline_font_color: '#c00'
     headline_font_size: '24px'
-    small_font_size: '12px'
+    small_font_size: '13px'
     link_color: '#000'
     link_hover_color: '#00c'
     link_visited_color: '#000'
@@ -139,7 +142,6 @@ development:
       required: ['__PUBLISH']
       ignore: ['__IGNORE', '__HOLD']
       reset: ['__RESET']
-    daemon_frequency: 30
 
 test:
   <<: *defaults
@@ -148,6 +150,18 @@ test:
 staging:
   <<: *defaults
   host: staging.joegatt.net
+  evernote:
+    server: https://sandbox.evernote.com
+    notebooks: f63f25b7-0c4f-4541-afb3-7286d72e452b
+    stream_binaries: false
+    synchronous: true
+    reset: true
+    daemon_frequency: 30
+    errors: ['', 'UNKNOWN', 'BAD_DATA_FORMAT', 'PERMISSION_DENIED', 'INTERNAL_ERROR', 'DATA_REQUIRED', 'LIMIT_REACHED', 'QUOTA_REACHED', 'INVALID_AUTH', 'AUTH_EXPIRED', 'DATA_CONFLICT', 'ENML_VALIDATION', 'SHARD_UNAVAILABLE', 'LEN_TOO_SHORT', 'LEN_TOO_LONG', 'TOO_FEW', 'TOO_MANY', 'UNSUPPORTED_OPERATION']
+    instructions:
+      required: ['__PUBLISH']
+      ignore: ['__IGNORE', '__HOLD']
+      reset: ['__RESET']
 
 production:
   <<: *defaults