浏览代码

Use .otf fonts instead of .woffs, which broke everything.

parisminton 8 年前
父节点
当前提交
db7d0bf8c4

+ 3 - 2
renderer/patterns.js 查看文件

@@ -89,19 +89,20 @@ function halfbars () {
89 89
 
90 90
     var height = d3.scaleLinear()
91 91
       .domain([0, 1])
92
-      .range([0, waveHeight / 2]);
92
+      .range([0, waveHeight * .65]);
93 93
 
94 94
     var barWidth = barX.bandwidth();
95 95
 
96 96
     data.forEach(function(val, i){
97 97
 
98
-      var h = height(val[0]) * 2,
98
+      var h = height(val[0]),
99 99
           x = barX(i),
100 100
           y = waveHeight - h;
101 101
 
102 102
       context.fillRect(x, y, barWidth, h);
103 103
 
104 104
     });
105
+
105 106
   }
106 107
 } // end halfbars function
107 108
 

二进制
settings/fonts/NYTFranklinBold.otf 查看文件


二进制
settings/fonts/NYTFranklinBoldItalic.otf 查看文件


二进制
settings/fonts/NYTFranklinExtraBold.otf 查看文件


二进制
settings/fonts/NYTFranklinExtraBoldItalic.otf 查看文件


二进制
settings/fonts/NYTFranklinLight.otf 查看文件


二进制
settings/fonts/NYTFranklinLightItalic.otf 查看文件


二进制
settings/fonts/NYTFranklinMedium.otf 查看文件


二进制
settings/fonts/NYTFranklinMediumItalic.otf 查看文件


二进制
settings/fonts/NYTFranklinSemibold.otf 查看文件


二进制
settings/fonts/NYTFranklinSemiboldItalic.otf 查看文件


+ 4 - 3
settings/index.js 查看文件

@@ -24,8 +24,9 @@ module.exports = {
24 24
   storagePath: (env === "development") ? path.join(__dirname, "..", "media") : "applications/audiogram/media",
25 25
   s3Bucket: process.env.S3_BUCKETS_NAME,
26 26
   fonts: [
27
-    { family: "NYT Franklin", file: path.join(__dirname, "fonts", "nyt-franklin-500-normal.woff") },
28
-    { family: "NYT Franklin Bold", file: path.join(__dirname, "fonts", "nyt-franklin-700-normal.woff") },
27
+    { family: "NYT Franklin", file: path.join(__dirname, "fonts", "NYTFranklinMedium.otf") },
28
+    { family: "NYT Franklin Light", file: path.join(__dirname, "fonts", "NYTFranklinLight.otf") },
29
+    { family: "NYT Franklin Bold", file: path.join(__dirname, "fonts", "NYTFranklinBold.otf") },
29 30
     { family: "Source Sans Pro", file: path.join(__dirname, "fonts", "SourceSansPro-Regular.ttf") },
30 31
     { family: "Source Sans Pro", file: path.join(__dirname, "fonts", "SourceSansPro-Light.ttf"), weight: 300 },
31 32
     { family: "Source Sans Pro", file: path.join(__dirname, "fonts", "SourceSansPro-Bold.ttf"), weight: "bold" },
@@ -33,5 +34,5 @@ module.exports = {
33 34
     { family: "Source Sans Pro", file: path.join(__dirname, "fonts", "SourceSansPro-BoldItalic.ttf"), weight: "bold", style: "italic" }
34 35
   ],
35 36
   redisHost: process.env.REDIS_URI,
36
-  worker: (env === "development") ? true : false
37
+  worker: (env === "development") ? false : true
37 38
 };

+ 2 - 2
settings/themes.json 查看文件

@@ -21,9 +21,9 @@
21 21
     "pattern": "halfbars",
22 22
     "waveLeft": 20,
23 23
     "waveColor": "#d9d9d9",
24
-    "waveBottom": 520,
24
+    "waveBottom": 470,
25 25
     "foregroundColor": "#000",
26
-    "captionFont": "300 44px 'NYT Franklin'",
26
+    "captionFont": "300 44px 'NYT Franklin Light'",
27 27
     "captionAlign": "left",
28 28
     "captionTop": 70,
29 29
     "captionLeft": 70,