playground
/
TimelineJS
mirror of https://github.com/NUKnightLab/TimelineJS.git
1
0
Fork 0
Code Issues Releases Activity
Browse Source

Font tweaks

pull/127/head
Zach Wise 13 years ago
parent
c3de930004
commit
7f044e8d61
7 changed files with 40 additions and 7 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      compiled/css/themes/font/DroidSerif-DroidSans.css
  2. 1
      compiled/css/themes/font/Merriweather-NewsCycle.css
  3. 4
      compiled/css/themes/font/PoiretOne-Molengo.css
  4. 7
      source/less/Font/DroidSerif-DroidSans.less
  5. 5
      source/less/Font/Merriweather-NewsCycle.less
  6. 12
      source/less/Font/PoiretOne-Molengo.less
  7. 13
      source/less/Typography.less

5
compiled/css/themes/font/DroidSerif-DroidSans.css
Unescape View File

@ -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{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 .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 .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 p{font-family:'Droid Sans',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:'Droid Serif',serif;} .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;} .tooltip{font-family:'Droid Sans',sans-serif;}

1
compiled/css/themes/font/Merriweather-NewsCycle.css
Unescape View File

@ -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 .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,.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 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;} .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;}

4
compiled/css/themes/font/PoiretOne-Molengo.css
Unescape View File

@ -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{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 .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 .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;} .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;} .tooltip{font-family:'Molengo',sans-serif;}

7
source/less/Font/DroidSerif-DroidSans.less
Unescape View File

@ -26,12 +26,17 @@
} }
/* CONTENT /* 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; font-family: @font-serif !important;
} }
.feature { .feature {
h1, h2, h3, h4, h5, h6 { h1, h2, h3, h4, h5, h6 {
font-family: @font-serif; font-family: @font-serif;
font-weight: 700;
} }
} }
} }

5
source/less/Font/Merriweather-NewsCycle.less
Unescape View File

@ -33,6 +33,11 @@
font-size:16px; font-size:16px;
line-height:22px; line-height:22px;
} }
.wikipedia p {
font-size: 14px !important;
line-height: 20px !important;
}
.feature { .feature {
h1, h2, h3, h4, h5, h6 { h1, h2, h3, h4, h5, h6 {
font-family: @font-serif; font-family: @font-serif;

12
source/less/Font/PoiretOne-Molengo.less
Unescape View File

@ -25,9 +25,19 @@
} }
/* CONTENT /* 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; font-family: @font-serif !important;
} }
.feature { .feature {
h1, h2, h3, h4, h5, h6 { h1, h2, h3, h4, h5, h6 {
font-family: @font-serif; font-family: @font-serif;

13
source/less/Typography.less
Unescape View File

@ -59,9 +59,18 @@
font-weight: bold; font-weight: bold;
} }
h2.start { h2.start {
font-size: 42px; //font-size: 42px;
line-height: 44px; //line-height: 44px;
font-size: 36px;
line-height: 38px;
margin-bottom: @base-space; margin-bottom: @base-space;
-webkit-hyphens:auto;
-moz-hyphens:auto;
-ms-hyphens:auto;
hyphens:auto;
word-wrap:break-word;
} }
h1 { h1 {
margin-bottom: @base-space; margin-bottom: @base-space;

Write Preview
Loading…
Cancel
Save