Browse Source

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

parisminton 8 years ago
parent
commit
db7d0bf8c4

+ 3 - 2
renderer/patterns.js View File

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

BIN
settings/fonts/NYTFranklinBold.otf View File


BIN
settings/fonts/NYTFranklinBoldItalic.otf View File


BIN
settings/fonts/NYTFranklinExtraBold.otf View File


BIN
settings/fonts/NYTFranklinExtraBoldItalic.otf View File


BIN
settings/fonts/NYTFranklinLight.otf View File


BIN
settings/fonts/NYTFranklinLightItalic.otf View File


BIN
settings/fonts/NYTFranklinMedium.otf View File


BIN
settings/fonts/NYTFranklinMediumItalic.otf View File


BIN
settings/fonts/NYTFranklinSemibold.otf View File


BIN
settings/fonts/NYTFranklinSemiboldItalic.otf View File


+ 4 - 3
settings/index.js View File

24
   storagePath: (env === "development") ? path.join(__dirname, "..", "media") : "applications/audiogram/media",
24
   storagePath: (env === "development") ? path.join(__dirname, "..", "media") : "applications/audiogram/media",
25
   s3Bucket: process.env.S3_BUCKETS_NAME,
25
   s3Bucket: process.env.S3_BUCKETS_NAME,
26
   fonts: [
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
     { family: "Source Sans Pro", file: path.join(__dirname, "fonts", "SourceSansPro-Regular.ttf") },
30
     { family: "Source Sans Pro", file: path.join(__dirname, "fonts", "SourceSansPro-Regular.ttf") },
30
     { family: "Source Sans Pro", file: path.join(__dirname, "fonts", "SourceSansPro-Light.ttf"), weight: 300 },
31
     { family: "Source Sans Pro", file: path.join(__dirname, "fonts", "SourceSansPro-Light.ttf"), weight: 300 },
31
     { family: "Source Sans Pro", file: path.join(__dirname, "fonts", "SourceSansPro-Bold.ttf"), weight: "bold" },
32
     { family: "Source Sans Pro", file: path.join(__dirname, "fonts", "SourceSansPro-Bold.ttf"), weight: "bold" },
33
     { family: "Source Sans Pro", file: path.join(__dirname, "fonts", "SourceSansPro-BoldItalic.ttf"), weight: "bold", style: "italic" }
34
     { family: "Source Sans Pro", file: path.join(__dirname, "fonts", "SourceSansPro-BoldItalic.ttf"), weight: "bold", style: "italic" }
34
   ],
35
   ],
35
   redisHost: process.env.REDIS_URI,
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 View File

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