From 7f044e8d61a0d93c542cf353c9c7eeb101cdff96 Mon Sep 17 00:00:00 2001 From: Zach Wise Date: Thu, 17 May 2012 21:58:57 -0500 Subject: [PATCH] Font tweaks --- compiled/css/themes/font/DroidSerif-DroidSans.css | 5 +++-- compiled/css/themes/font/Merriweather-NewsCycle.css | 1 + compiled/css/themes/font/PoiretOne-Molengo.css | 4 +++- source/less/Font/DroidSerif-DroidSans.less | 7 ++++++- source/less/Font/Merriweather-NewsCycle.less | 5 +++++ source/less/Font/PoiretOne-Molengo.less | 12 +++++++++++- source/less/Typography.less | 13 +++++++++++-- 7 files changed, 40 insertions(+), 7 deletions(-) diff --git a/compiled/css/themes/font/DroidSerif-DroidSans.css b/compiled/css/themes/font/DroidSerif-DroidSans.css index 72f5a5c..466d8d4 100644 --- a/compiled/css/themes/font/DroidSerif-DroidSans.css +++ b/compiled/css/themes/font/DroidSerif-DroidSans.css @@ -1,6 +1,7 @@ .vmm-timeline{font-family:'Droid Serif',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:'Droid Sans',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:'Droid Sans',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:'Droid Sans',sans-serif !important;} -.vmm-timeline p,.vmm-timeline blockquote,.vmm-timeline blockquote p,.vmm-timeline .twitter blockquote p{font-family:'Droid Serif',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:'Droid Serif',serif;} +.vmm-timeline p{font-family:'Droid Sans',sans-serif !important;} +.vmm-timeline blockquote,.vmm-timeline blockquote p,.vmm-timeline .twitter blockquote p{font-family:'Droid Serif',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:'Droid Serif',serif;font-weight:700;} .tooltip{font-family:'Droid Sans',sans-serif;} diff --git a/compiled/css/themes/font/Merriweather-NewsCycle.css b/compiled/css/themes/font/Merriweather-NewsCycle.css index 02455a3..9215f06 100644 --- a/compiled/css/themes/font/Merriweather-NewsCycle.css +++ b/compiled/css/themes/font/Merriweather-NewsCycle.css @@ -3,5 +3,6 @@ .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:'News Cycle',sans-serif !important;} .vmm-timeline p{font-size:16px;line-height:22px;} +.vmm-timeline .wikipedia p{font-size:14px !important;line-height:20px !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;font-weight:900;} .tooltip{font-family:'News Cycle',sans-serif;} diff --git a/compiled/css/themes/font/PoiretOne-Molengo.css b/compiled/css/themes/font/PoiretOne-Molengo.css index 1e85024..c2285ef 100644 --- a/compiled/css/themes/font/PoiretOne-Molengo.css +++ b/compiled/css/themes/font/PoiretOne-Molengo.css @@ -1,6 +1,8 @@ .vmm-timeline{font-family:'Poiret One',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:'Molengo',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:'Molengo',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:'Molengo',sans-serif !important;} -.vmm-timeline p,.vmm-timeline blockquote,.vmm-timeline blockquote p,.vmm-timeline .twitter blockquote p{font-family:'Poiret One',serif !important;} +.vmm-timeline p{font-family:'Molengo',sans-serif !important;font-size:16px !important;line-height:22px !important;} +.vmm-timeline .wikipedia p{font-size:14px !important;line-height:20px !important;} +.vmm-timeline blockquote,.vmm-timeline blockquote p,.vmm-timeline .twitter blockquote p{font-family:'Poiret One',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:'Poiret One',serif;} .tooltip{font-family:'Molengo',sans-serif;} diff --git a/source/less/Font/DroidSerif-DroidSans.less b/source/less/Font/DroidSerif-DroidSans.less index 6eb184a..6a6ecf0 100644 --- a/source/less/Font/DroidSerif-DroidSans.less +++ b/source/less/Font/DroidSerif-DroidSans.less @@ -26,12 +26,17 @@ } /* CONTENT ------------------------------------------------------------------------------------------- */ - p, blockquote, blockquote p, .twitter blockquote p { + p { + font-family: @font-sans !important; + } + blockquote, blockquote p, .twitter blockquote p { font-family: @font-serif !important; } + .feature { h1, h2, h3, h4, h5, h6 { font-family: @font-serif; + font-weight: 700; } } } diff --git a/source/less/Font/Merriweather-NewsCycle.less b/source/less/Font/Merriweather-NewsCycle.less index b870151..6a75298 100644 --- a/source/less/Font/Merriweather-NewsCycle.less +++ b/source/less/Font/Merriweather-NewsCycle.less @@ -33,6 +33,11 @@ font-size:16px; line-height:22px; } + .wikipedia p { + font-size: 14px !important; + line-height: 20px !important; + } + .feature { h1, h2, h3, h4, h5, h6 { font-family: @font-serif; diff --git a/source/less/Font/PoiretOne-Molengo.less b/source/less/Font/PoiretOne-Molengo.less index db3a2ab..a0ba825 100644 --- a/source/less/Font/PoiretOne-Molengo.less +++ b/source/less/Font/PoiretOne-Molengo.less @@ -25,9 +25,19 @@ } /* CONTENT ------------------------------------------------------------------------------------------- */ - p, blockquote, blockquote p, .twitter blockquote p { + p { + font-family: @font-sans !important; + font-size: 16px !important; + line-height:22px !important; + } + .wikipedia p { + font-size: 14px !important; + line-height: 20px !important; + } + blockquote, blockquote p, .twitter blockquote p { font-family: @font-serif !important; } + .feature { h1, h2, h3, h4, h5, h6 { font-family: @font-serif; diff --git a/source/less/Typography.less b/source/less/Typography.less index 78eaa4e..5e49347 100644 --- a/source/less/Typography.less +++ b/source/less/Typography.less @@ -59,9 +59,18 @@ font-weight: bold; } h2.start { - font-size: 42px; - line-height: 44px; + //font-size: 42px; + //line-height: 44px; + font-size: 36px; + line-height: 38px; + margin-bottom: @base-space; + -webkit-hyphens:auto; + -moz-hyphens:auto; + -ms-hyphens:auto; + hyphens:auto; + word-wrap:break-word; + } h1 { margin-bottom: @base-space;