diff --git a/compiled/css/themes/font/Merriweather-NewsCycle.css b/compiled/css/themes/font/Merriweather-NewsCycle.css index 3cf03ea..02455a3 100644 --- a/compiled/css/themes/font/Merriweather-NewsCycle.css +++ b/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 .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 p,.vmm-timeline blockquote,.vmm-timeline blockquote p,.vmm-timeline .twitter blockquote p{font-family:'Merriweather',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,.vmm-timeline blockquote,.vmm-timeline blockquote p,.vmm-timeline .twitter blockquote p{font-family:'News Cycle',sans-serif !important;} +.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;} diff --git a/compiled/js/timeline-embed.js b/compiled/js/timeline-embed.js index 9532325..828e9bd 100644 --- a/compiled/js/timeline-embed.js +++ b/compiled/js/timeline-embed.js @@ -33,4 +33,4 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. @class LazyLoad @static @version 2.0.3 (git) -*/LazyLoad=function(a){function h(b,c){var d=a.createElement(b),e;for(e in c)c.hasOwnProperty(e)&&d.setAttribute(e,c[e]);return d}function i(a){var b=d[a],c,g;if(b){c=b.callback;g=b.urls;g.shift();e=0;if(!g.length){c&&c.call(b.context,b.obj);d[a]=null;f[a].length&&k(a)}}}function j(){var c=navigator.userAgent;b={async:a.createElement("script").async===!0};(b.webkit=/AppleWebKit\//.test(c))||(b.ie=/MSIE/.test(c))||(b.opera=/Opera/.test(c))||(b.gecko=/Gecko\//.test(c))||(b.unknown=!0)}function k(e,g,k,n,o){var p=function(){i(e)},q=e==="css",r=[],s,t,u,v,w,x;b||j();if(g){g=typeof g=="string"?[g]:g.concat();if(q||b.async||b.gecko||b.opera)f[e].push({urls:g,callback:k,obj:n,context:o});else for(s=0,t=g.length;s=0)if(g[b].href===a.urls[0]){i("css");break}e+=1;a&&(e<200?setTimeout(m,50):i("css"))}}var b,c,d={},e=0,f={css:[],js:[]},g=a.styleSheets;return{css:function(a,b,c,d){k("css",a,b,c,d)},js:function(a,b,c,d){k("js",a,b,c,d)}}}(this.document);(function(){function t(){LazyLoad.js(a.js,u)}function u(){c=!0;y()}function v(){d=!0;y()}function w(){e=!0;y()}function x(){f=!0;y()}function y(){if(m>40)return;m++;if(c&&d&&e&&f){if(!l){l=!0;o=new VMM.Timeline;o.init(a.source)}}else n=setTimeout("checkAgain();",250)}var a={width:800,height:600,source:"taylor/data.json",font:"default",css:"http://veritetimeline.appspot.com/latest/timeline.css",js:"http://veritetimeline.appspot.com/latest/timeline-min.js"};if(typeof timeline_config=="object"){var b;for(b in timeline_config)Object.prototype.hasOwnProperty.call(timeline_config,b)&&(a[b]=timeline_config[b])}else if(typeof config=="object"){var b;for(b in config)Object.prototype.hasOwnProperty.call(config,b)&&(a[b]=config[b])}timeline_config=a;var c=!1,d=!1,e=!1,f=!1,g="http://veritetimeline.appspot.com/latest/",h="http://veritetimeline.appspot.com/latest/",i="http://veritetimeline.appspot.com/latest/themes/font/",j="http://ajax.googleapis.com/ajax/libs/webfont/1/webfont.js",k=["News+Cycle:400,700:latin","Merriweather:400,700,900:latin"],l=!1,m=0,n,o,p=document.createElement("div"),q=document.getElementById("timeline-embed");q.appendChild(p);p.setAttribute("id","timeline");a.width.toString().match("%")||a.width.toString().match("px")?q.style.width=a.width:q.style.width=a.width+"px";a.height.toString().match("%")||a.height.toString().match("px")?q.style.height=a.height:q.style.height=a.height+"px";p.style.position="relative";LazyLoad.css(a.css,v);if(a.font=="default"){f=!0;e=!0}else{a.font.match("http://")?i=a.font:i=i+a.font+".css";LazyLoad.css(i,w);switch(a.font){case"Merriweather-NewsCycle":k=["News+Cycle:400,700:latin","Merriweather:400,700,900:latin"];break;case"PoiretOne-Molengo":k=["Poiret+One::latin","Molengo::latin"];break;case"Arvo-PTSans":k=["Arvo:400,700,400italic:latin","PT+Sans:400,700,400italic:latin"];break;case"PTSerif-PTSans":k=["PT+Sans:400,700,400italic:latin","PT+Serif:400,700,400italic:latin"];break;case"DroidSerif-DroidSans":k=["Droid+Sans:400,700:latin","Droid+Serif:400,700,400italic:latin"];break;case"Lekton-Molengo":k=["Lekton:400,700,400italic:latin","Molengo::latin"];break;case"NixieOne-Ledger":k=["Nixie+One::latin","Ledger::latin"];break;case"AbrilFatface-Average":k=["Average::latin","Abril+Fatface::latin"];break;case"PlayfairDisplay-Muli":k=["Playfair+Display:400,400italic:latin","Muli:300,400,300italic,400italic:latin"];break;case"Rancho-Gudea":k=["Rancho::latin","Gudea:400,700,400italic:latin"];break;case"Bevan-PotanoSans":k=["Bevan::latin","Pontano+Sans::latin"];break;case"BreeSerif-OpenSans":k=["Bree+Serif::latin","Open+Sans:300italic,400italic,600italic,700italic,800italic,400,300,600,700,800:latin"];break;case"SansitaOne-Kameron":k=["Sansita+One::latin","Kameron:400,700:latin"];break;case"Pacifico-Arimo":k=["Pacifico::latin","Arimo:400,700,400italic,700italic:latin"];break;default:k=["News+Cycle:400,700:latin","Merriweather:400,700,900:latin"]}WebFontConfig={google:{families:k}};LazyLoad.js(j,x)}try{var r=jQuery;r=!0}catch(s){var r=!1}r?t():LazyLoad.js("http://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js",t);this.checkAgain=function(){y()}})(); \ No newline at end of file +*/LazyLoad=function(a){function h(b,c){var d=a.createElement(b),e;for(e in c)c.hasOwnProperty(e)&&d.setAttribute(e,c[e]);return d}function i(a){var b=d[a],c,g;if(b){c=b.callback;g=b.urls;g.shift();e=0;if(!g.length){c&&c.call(b.context,b.obj);d[a]=null;f[a].length&&k(a)}}}function j(){var c=navigator.userAgent;b={async:a.createElement("script").async===!0};(b.webkit=/AppleWebKit\//.test(c))||(b.ie=/MSIE/.test(c))||(b.opera=/Opera/.test(c))||(b.gecko=/Gecko\//.test(c))||(b.unknown=!0)}function k(e,g,k,n,o){var p=function(){i(e)},q=e==="css",r=[],s,t,u,v,w,x;b||j();if(g){g=typeof g=="string"?[g]:g.concat();if(q||b.async||b.gecko||b.opera)f[e].push({urls:g,callback:k,obj:n,context:o});else for(s=0,t=g.length;s=0)if(g[b].href===a.urls[0]){i("css");break}e+=1;a&&(e<200?setTimeout(m,50):i("css"))}}var b,c,d={},e=0,f={css:[],js:[]},g=a.styleSheets;return{css:function(a,b,c,d){k("css",a,b,c,d)},js:function(a,b,c,d){k("js",a,b,c,d)}}}(this.document);LazyLoad=function(a){function h(b,c){var d=a.createElement(b),e;for(e in c)c.hasOwnProperty(e)&&d.setAttribute(e,c[e]);return d}function i(a){var b=d[a],c,g;if(b){c=b.callback;g=b.urls;g.shift();e=0;if(!g.length){c&&c.call(b.context,b.obj);d[a]=null;f[a].length&&k(a)}}}function j(){var c=navigator.userAgent;b={async:a.createElement("script").async===!0};(b.webkit=/AppleWebKit\//.test(c))||(b.ie=/MSIE/.test(c))||(b.opera=/Opera/.test(c))||(b.gecko=/Gecko\//.test(c))||(b.unknown=!0)}function k(e,g,k,n,o){var p=function(){i(e)},q=e==="css",r=[],s,t,u,v,w,x;b||j();if(g){g=typeof g=="string"?[g]:g.concat();if(q||b.async||b.gecko||b.opera)f[e].push({urls:g,callback:k,obj:n,context:o});else for(s=0,t=g.length;s=0)if(g[b].href===a.urls[0]){i("css");break}e+=1;a&&(e<200?setTimeout(m,50):i("css"))}}var b,c,d={},e=0,f={css:[],js:[]},g=a.styleSheets;return{css:function(a,b,c,d){k("css",a,b,c,d)},js:function(a,b,c,d){k("js",a,b,c,d)}}}(this.document);(function(){function t(){LazyLoad.js(a.js,u)}function u(){c=!0;y()}function v(){d=!0;y()}function w(){e=!0;y()}function x(){f=!0;y()}function y(){if(m>40)return;m++;if(c&&d&&e&&f){if(!l){l=!0;o=new VMM.Timeline;o.init(a.source)}}else n=setTimeout("checkAgain();",250)}var a={width:800,height:600,source:"taylor/data.json",font:"default",css:"http://veritetimeline.appspot.com/latest/timeline.css",js:"http://veritetimeline.appspot.com/latest/timeline-min.js"};if(typeof timeline_config=="object"){var b;for(b in timeline_config)Object.prototype.hasOwnProperty.call(timeline_config,b)&&(a[b]=timeline_config[b])}else if(typeof config=="object"){var b;for(b in config)Object.prototype.hasOwnProperty.call(config,b)&&(a[b]=config[b])}timeline_config=a;var c=!1,d=!1,e=!1,f=!1,g="http://veritetimeline.appspot.com/latest/",h="http://veritetimeline.appspot.com/latest/",i="http://veritetimeline.appspot.com/latest/themes/font/",j="http://ajax.googleapis.com/ajax/libs/webfont/1/webfont.js",k=["News+Cycle:400,700:latin","Merriweather:400,700,900:latin"],l=!1,m=0,n,o,p=document.createElement("div"),q=document.getElementById("timeline-embed");q.appendChild(p);p.setAttribute("id","timeline");a.width.toString().match("%")||a.width.toString().match("px")?q.style.width=a.width:q.style.width=a.width+"px";a.height.toString().match("%")||a.height.toString().match("px")?q.style.height=a.height:q.style.height=a.height+"px";p.style.position="relative";LazyLoad.css(a.css,v);if(a.font=="default"){f=!0;e=!0}else{a.font.match("/")?i=a.font:i=i+a.font+".css";LazyLoad.css(i,w);switch(a.font){case"Merriweather-NewsCycle":k=["News+Cycle:400,700:latin","Merriweather:400,700,900:latin"];break;case"PoiretOne-Molengo":k=["Poiret+One::latin","Molengo::latin"];break;case"Arvo-PTSans":k=["Arvo:400,700,400italic:latin","PT+Sans:400,700,400italic:latin"];break;case"PTSerif-PTSans":k=["PT+Sans:400,700,400italic:latin","PT+Serif:400,700,400italic:latin"];break;case"DroidSerif-DroidSans":k=["Droid+Sans:400,700:latin","Droid+Serif:400,700,400italic:latin"];break;case"Lekton-Molengo":k=["Lekton:400,700,400italic:latin","Molengo::latin"];break;case"NixieOne-Ledger":k=["Nixie+One::latin","Ledger::latin"];break;case"AbrilFatface-Average":k=["Average::latin","Abril+Fatface::latin"];break;case"PlayfairDisplay-Muli":k=["Playfair+Display:400,400italic:latin","Muli:300,400,300italic,400italic:latin"];break;case"Rancho-Gudea":k=["Rancho::latin","Gudea:400,700,400italic:latin"];break;case"Bevan-PotanoSans":k=["Bevan::latin","Pontano+Sans::latin"];break;case"BreeSerif-OpenSans":k=["Bree+Serif::latin","Open+Sans:300italic,400italic,600italic,700italic,800italic,400,300,600,700,800:latin"];break;case"SansitaOne-Kameron":k=["Sansita+One::latin","Kameron:400,700:latin"];break;case"Pacifico-Arimo":k=["Pacifico::latin","Arimo:400,700,400italic,700italic:latin"];break;default:k=["News+Cycle:400,700:latin","Merriweather:400,700,900:latin"]}WebFontConfig={google:{families:k}};LazyLoad.js(j,x)}try{var r=jQuery;r=!0}catch(s){var r=!1}r?t():LazyLoad.js("http://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js",t);this.checkAgain=function(){y()}})(); \ No newline at end of file diff --git a/source/js/timeline-embed.js b/source/js/timeline-embed.js index 274a097..a63af15 100644 --- a/source/js/timeline-embed.js +++ b/source/js/timeline-embed.js @@ -20,7 +20,7 @@ /* CodeKit Import http://incident57.com/codekit/ ================================================== */ -// @codekit-prepend "Embed.LoadLib.js"; +// @codekit-prepend "lib/Embed.LoadLib.js"; /* TIMELINE CDN LOADER @@ -150,7 +150,7 @@ /* Load Font CSS ================================================== */ - if (embed_config.font.match("http://")) { + if (embed_config.font.match("/")) { font_css_url = embed_config.font; } else { font_css_url = font_css_url + embed_config.font + ".css"; diff --git a/source/less/Font/Merriweather-NewsCycle.less b/source/less/Font/Merriweather-NewsCycle.less index f053c8f..b870151 100644 --- a/source/less/Font/Merriweather-NewsCycle.less +++ b/source/less/Font/Merriweather-NewsCycle.less @@ -27,11 +27,16 @@ /* CONTENT ------------------------------------------------------------------------------------------- */ 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 { h1, h2, h3, h4, h5, h6 { font-family: @font-serif; + font-weight: 900; } } }