Browse Source

Starting to tweak the font choices. More work to do.

pull/127/head
Zach Wise 13 years ago
parent
commit
3da313f368
  1. 5
      compiled/css/themes/font/Merriweather-NewsCycle.css
  2. 2
      compiled/js/timeline-embed.js
  3. 4
      source/js/timeline-embed.js
  4. 7
      source/less/Font/Merriweather-NewsCycle.less

5
compiled/css/themes/font/Merriweather-NewsCycle.css

@ -1,6 +1,7 @@
.vmm-timeline{font-family:'Merriweather',serif;}.vmm-timeline .twitter,.vmm-timeline .messege,.vmm-timeline .credit,.vmm-timeline .caption,.vmm-timeline .zoom-in,.vmm-timeline .zoom-out,.vmm-timeline .back-home,.vmm-timeline .time-interval div,.vmm-timeline .time-interval-major div,.vmm-timeline .nav-container{font-family:'News Cycle',sans-serif !important;} .vmm-timeline{font-family:'Merriweather',serif;}.vmm-timeline .twitter,.vmm-timeline .messege,.vmm-timeline .credit,.vmm-timeline .caption,.vmm-timeline .zoom-in,.vmm-timeline .zoom-out,.vmm-timeline .back-home,.vmm-timeline .time-interval div,.vmm-timeline .time-interval-major div,.vmm-timeline .nav-container{font-family:'News Cycle',sans-serif !important;}
.vmm-timeline .feature h1.date,.vmm-timeline .feature h2.date,.vmm-timeline .feature h3.date,.vmm-timeline .feature h4.date,.vmm-timeline .feature h5.date,.vmm-timeline .feature h6.date{font-family:'News Cycle',sans-serif !important;} .vmm-timeline .feature h1.date,.vmm-timeline .feature h2.date,.vmm-timeline .feature h3.date,.vmm-timeline .feature h4.date,.vmm-timeline .feature h5.date,.vmm-timeline .feature h6.date{font-family:'News Cycle',sans-serif !important;}
.vmm-timeline .timenav h1,.vmm-timeline .flag-content h1,.vmm-timeline .era h1,.vmm-timeline .timenav h2,.vmm-timeline .flag-content h2,.vmm-timeline .era h2,.vmm-timeline .timenav h3,.vmm-timeline .flag-content h3,.vmm-timeline .era h3,.vmm-timeline .timenav h4,.vmm-timeline .flag-content h4,.vmm-timeline .era h4,.vmm-timeline .timenav h5,.vmm-timeline .flag-content h5,.vmm-timeline .era h5,.vmm-timeline .timenav h6,.vmm-timeline .flag-content h6,.vmm-timeline .era h6{font-family:'News Cycle',sans-serif !important;} .vmm-timeline .timenav h1,.vmm-timeline .flag-content h1,.vmm-timeline .era h1,.vmm-timeline .timenav h2,.vmm-timeline .flag-content h2,.vmm-timeline .era h2,.vmm-timeline .timenav h3,.vmm-timeline .flag-content h3,.vmm-timeline .era h3,.vmm-timeline .timenav h4,.vmm-timeline .flag-content h4,.vmm-timeline .era h4,.vmm-timeline .timenav h5,.vmm-timeline .flag-content h5,.vmm-timeline .era h5,.vmm-timeline .timenav h6,.vmm-timeline .flag-content h6,.vmm-timeline .era h6{font-family:'News Cycle',sans-serif !important;}
.vmm-timeline p,.vmm-timeline blockquote,.vmm-timeline blockquote p,.vmm-timeline .twitter blockquote p{font-family:'Merriweather',serif !important;} .vmm-timeline p,.vmm-timeline blockquote,.vmm-timeline blockquote p,.vmm-timeline .twitter blockquote p{font-family:'News Cycle',sans-serif !important;}
.vmm-timeline .feature h1,.vmm-timeline .feature h2,.vmm-timeline .feature h3,.vmm-timeline .feature h4,.vmm-timeline .feature h5,.vmm-timeline .feature h6{font-family:'Merriweather',serif;} .vmm-timeline p{font-size:16px;line-height:22px;}
.vmm-timeline .feature h1,.vmm-timeline .feature h2,.vmm-timeline .feature h3,.vmm-timeline .feature h4,.vmm-timeline .feature h5,.vmm-timeline .feature h6{font-family:'Merriweather',serif;font-weight:900;}
.tooltip{font-family:'News Cycle',sans-serif;} .tooltip{font-family:'News Cycle',sans-serif;}

2
compiled/js/timeline-embed.js

File diff suppressed because one or more lines are too long

4
source/js/timeline-embed.js

@ -20,7 +20,7 @@
/* CodeKit Import /* CodeKit Import
http://incident57.com/codekit/ http://incident57.com/codekit/
================================================== */ ================================================== */
// @codekit-prepend "Embed.LoadLib.js"; // @codekit-prepend "lib/Embed.LoadLib.js";
/* TIMELINE CDN LOADER /* TIMELINE CDN LOADER
@ -150,7 +150,7 @@
/* Load Font CSS /* Load Font CSS
================================================== */ ================================================== */
if (embed_config.font.match("http://")) { if (embed_config.font.match("/")) {
font_css_url = embed_config.font; font_css_url = embed_config.font;
} else { } else {
font_css_url = font_css_url + embed_config.font + ".css"; font_css_url = font_css_url + embed_config.font + ".css";

7
source/less/Font/Merriweather-NewsCycle.less

@ -27,11 +27,16 @@
/* CONTENT /* CONTENT
------------------------------------------------------------------------------------------- */ ------------------------------------------------------------------------------------------- */
p, blockquote, blockquote p, .twitter blockquote p { p, blockquote, blockquote p, .twitter blockquote p {
font-family: @font-serif !important; font-family: @font-sans !important;
}
p {
font-size:16px;
line-height:22px;
} }
.feature { .feature {
h1, h2, h3, h4, h5, h6 { h1, h2, h3, h4, h5, h6 {
font-family: @font-serif; font-family: @font-serif;
font-weight: 900;
} }
} }
} }

Loading…
Cancel
Save