From 8b40aedc0737e4d568152ba2714cef7bfa8c797d Mon Sep 17 00:00:00 2001 From: Zach Wise Date: Fri, 24 Aug 2012 11:17:56 -0500 Subject: [PATCH] New font combo added (actually a remix of an existing one) --- compiled/css/themes/font/NewsCycle-Merriweather.css | 8 ++++++++ compiled/js/storyjs-embed.js | 3 ++- 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 compiled/css/themes/font/NewsCycle-Merriweather.css diff --git a/compiled/css/themes/font/NewsCycle-Merriweather.css b/compiled/css/themes/font/NewsCycle-Merriweather.css new file mode 100644 index 0000000..a588191 --- /dev/null +++ b/compiled/css/themes/font/NewsCycle-Merriweather.css @@ -0,0 +1,8 @@ +.vco-storyjs{font-family:'News Cycle',sans-serif;}.vco-storyjs .twitter,.vco-storyjs .vcard,.vco-storyjs .messege,.vco-storyjs .credit,.vco-storyjs .caption,.vco-storyjs .zoom-in,.vco-storyjs .zoom-out,.vco-storyjs .back-home,.vco-storyjs .time-interval div,.vco-storyjs .time-interval-major div,.vco-storyjs .nav-container{font-family:'Merriweather',serif !important;} +.vco-storyjs .vco-feature h1.date,.vco-storyjs .vco-feature h2.date,.vco-storyjs .vco-feature h3.date,.vco-storyjs .vco-feature h4.date,.vco-storyjs .vco-feature h5.date,.vco-storyjs .vco-feature h6.date{font-family:'News Cycle',sans-serif !important;} +.vco-storyjs .timenav h1,.vco-storyjs .flag-content h1,.vco-storyjs .era h1,.vco-storyjs .timenav h2,.vco-storyjs .flag-content h2,.vco-storyjs .era h2,.vco-storyjs .timenav h3,.vco-storyjs .flag-content h3,.vco-storyjs .era h3,.vco-storyjs .timenav h4,.vco-storyjs .flag-content h4,.vco-storyjs .era h4,.vco-storyjs .timenav h5,.vco-storyjs .flag-content h5,.vco-storyjs .era h5,.vco-storyjs .timenav h6,.vco-storyjs .flag-content h6,.vco-storyjs .era h6{font-family:'News Cycle',sans-serif !important;} +.vco-storyjs p,.vco-storyjs blockquote,.vco-storyjs blockquote p,.vco-storyjs .twitter blockquote p{font-family:'Merriweather',serif !important;} +.vco-storyjs p{font-size:16px;line-height:22px;} +.vco-storyjs .wikipedia p{font-size:14px !important;line-height:20px !important;} +.vco-storyjs .vco-feature h1,.vco-storyjs .vco-feature h2,.vco-storyjs .vco-feature h3,.vco-storyjs .vco-feature h4,.vco-storyjs .vco-feature h5,.vco-storyjs .vco-feature h6{font-family:'News Cycle',sans-serif;font-weight:900;} +.tooltip{font-family:'News Cycle',sans-serif;} diff --git a/compiled/js/storyjs-embed.js b/compiled/js/storyjs-embed.js index 3ebd6bf..0b95439 100644 --- a/compiled/js/storyjs-embed.js +++ b/compiled/js/storyjs-embed.js @@ -505,7 +505,7 @@ function createStoryJS(c, src) { ================================================== */ var storyjs_embedjs, t, te, x, isCDN = false, - js_version = "2.05", + js_version = "2.10", jquery_version_required = "1.7.1", jquery_version = "", ready = { @@ -557,6 +557,7 @@ function createStoryJS(c, src) { }, font_presets = [ { name: "Merriweather-NewsCycle", google: [ 'News+Cycle:400,700:latin', 'Merriweather:400,700,900:latin' ] }, + { name: "NewsCycle-Merriweather", google: [ 'News+Cycle:400,700:latin', 'Merriweather:300,400,700:latin' ] }, { name: "PoiretOne-Molengo", google: [ 'Poiret+One::latin', 'Molengo::latin' ] }, { name: "Arvo-PTSans", google: [ 'Arvo:400,700,400italic:latin', 'PT+Sans:400,700,400italic:latin' ] }, { name: "PTSerif-PTSans", google: [ 'PT+Sans:400,700,400italic:latin', 'PT+Serif:400,700,400italic:latin' ] },