Moved to using Atlas fontface

This commit is contained in:
Jori Lallo 2016-03-11 00:27:57 -08:00
parent 1133720fd4
commit bc7ae72210
38 changed files with 85 additions and 24 deletions

48
dist/bundle.js vendored

File diff suppressed because one or more lines are too long

2
dist/bundle.js.map vendored
View File

@ -1 +1 @@
{"version":3,"file":"bundle.js","sources":["webpack:///bundle.js","webpack:///"],"mappings":"AAAA;ACi2GA;AAmhFA;AAw2GA;AA99DA;AAugFA;AAy4HA;;;;;;;;;;;;;;AA+uFA;AAguOA;AA3iLA;AA8+jBA;;;;;AA43FA;;;;;AAsDA;AA85DA;AAyvDA;AA0yGA;AAu1FA;AAghEA;AA8pEA;AA45GA;AA03HA;AAu8IA","sourceRoot":""}
{"version":3,"file":"bundle.js","sources":["webpack:///bundle.js","webpack:///"],"mappings":"AAAA;ACi2GA;AAmhFA;AAw2GA;AA99DA;AAugFA;AAy4HA;;;;;;;;;;;;;;AA+uFA;AAguOA;AA3iLA;AA8+jBA;AA4uDA;;;;;AAwpCA;;;;;AAsDA;AA85DA;AA+nDA;AAo7GA;AAu1FA;AAghEA;AA8pEA;AA45GA;AA03HA;AAu8IA;AAu/EA;AAMA;AAMA;AAMA;AAMA","sourceRoot":""}

View File

@ -44,6 +44,7 @@
"eslint-plugin-react": "^3.16.1",
"exports-loader": "^0.6.3",
"fetch": "^1.0.1",
"file-loader": "^0.8.5",
"history": "^1.17.0",
"imports-loader": "^0.6.5",
"json-loader": "^0.5.4",
@ -62,6 +63,7 @@
"sass-loader": "^3.1.2",
"style-loader": "^0.13.0",
"to-markdown": "^2.0.1",
"url-loader": "^0.5.7",
"webpack": "^1.12.12",
"webpack-dev-middleware": "^1.5.1",
"webpack-hot-middleware": "^2.6.4",

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -21,6 +21,7 @@
font-size: 13px;
font-weight: 300;
font-family: "Atlas Grotesk", "Helvetica Neue", sans-serif;
text-align: center;
&:first-child {

View File

@ -13,7 +13,7 @@
.cm-s-atlas.CodeMirror {
background: #ffffff;
color: #202020;
font-family: 'Cousine', 'Monaco', monospace;
font-family: 'Atlas Typewriter', 'Cousine', 'Monaco', monospace;
font-weight: 300;
height: auto;
}

View File

@ -10,6 +10,8 @@
.editor {
outline: none;
font-family: 'Atlas Grotesk', 'Helvetica Neue', sans-serif;
}
@media all and (max-width: 2000px) and (min-width: 960px) {

View File

@ -2,6 +2,7 @@ import React, { Component } from 'react';
import { connect } from 'react-redux';
import 'normalize.css/normalize.css';
import '../../fonts/atlas/atlas.css';
import styles from './App.scss';
import {

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

48
src/fonts/atlas/atlas.css Normal file
View File

@ -0,0 +1,48 @@
@font-face {
font-family: 'Atlas Grotesk';
src: url('./AtlasGrotesk-Regular-Web.woff') format('woff');
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: 'Atlas Grotesk';
src: url('./AtlasGrotesk-RegularItalic-Web.woff') format('woff');
font-weight: normal;
font-style: italic;
}
@font-face {
font-family: 'Atlas Grotesk';
src: url('./AtlasGrotesk-Medium-Web.woff') format('woff');
font-weight: bold;
font-style: normal;
}
@font-face {
font-family: 'Atlas Grotesk';
src: url('./AtlasGrotesk-MediumItalic-Web.woff') format('woff');
font-weight: bold;
font-style: italic;
}
@font-face {
font-family: 'Atlas Grotesk';
src: url('./AtlasGrotesk-MediumItalic-Web.woff') format('woff');
font-weight: bold;
font-style: italic;
}
@font-face {
font-family: 'Atlas Typewriter';
src: url('./AtlasTypewriterRegular.woff') format('woff');
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: 'Atlas Typewriter';
src: url('./AtlasTypewriterMedium.woff') format('woff');
font-weight: bold;
font-style: normal;
}

View File

@ -25,7 +25,8 @@ module.exports = {
{ test: /\.json$/, loader: 'json-loader' },
{ test: /\.scss$/, loader: 'style!css-loader?modules&importLoaders=1&localIdentName=[name]__[local]___[hash:base64:5]!sass?sourceMap' },
{ test: /\.css$/, loader: 'style!css-loader' },
{ test: /\.(png|jpg)$/, loader: 'url-loader?limit=8192' } // inline base64 URLs for <=8k images, direct URLs for the rest
{ test: /\.(png|jpg)$/, loader: 'url-loader?limit=8192' }, // inline base64 URLs for <=8k images, direct URLs for the rest
{ test: /\.woff$/, loader: 'url-loader?limit=65000&mimetype=application/font-woff&name=public/fonts/[name].[ext]' },
]
},
resolve: {