Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge pull request #1 from vega/master #11

Closed
wants to merge 3 commits into from
Closed

Merge pull request #1 from vega/master #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
64db6a4
Merge pull request #1 from vega/master
Casyfill Oct 8, 2018
b0ae1d6
dedupe files
Casyfill Oct 8, 2018
d79fc62
theme back
Casyfill Oct 8, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
156 changes: 0 additions & 156 deletions src/theme-fiveThirtyEight.ts
View file
Open in desktop

This file was deleted.

30 changes: 19 additions & 11 deletions src/theme-fivethirtyeight.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { Config } from './config';
const markColor = '#30a2da';
const axisColor = '#cbcbcb';
const backgroundColor = '#f0f0f0';
const blackTitle = '#1c1c1c';

const fivethirtyeighttheme: Config = {
arc: { fill: markColor },
Expand All @@ -14,14 +15,15 @@ const fivethirtyeighttheme: Config = {

axisBottom: {
domain: false,
domainColor: 'black',
domainColor: blackTitle,
domainWidth: 3,
grid: true,
gridColor: axisColor,
gridWidth: 1,
labelFontSize: 12,
labelFontSize: 10,
labelPadding: 4,
tickColor: axisColor,
labelColor: axisColor,
tickSize: 10,
titleFontSize: 14,
titlePadding: 10,
Expand All @@ -32,23 +34,27 @@ const fivethirtyeighttheme: Config = {
domainWidth: 1,
gridColor: axisColor,
gridWidth: 1,
labelFontSize: 12,
grid: true,
labelFontSize: 10,
labelPadding: 4,
tickColor: axisColor,
labelColor: axisColor,
tickSize: 10,
ticks: true,
titleFontSize: 14,
titlePadding: 10,
},

axisRight: {
domainColor: axisColor,
domainColor: blackTitle,
domainWidth: 1,
gridColor: axisColor,
gridWidth: 1,
labelFontSize: 12,
grid: true,
labelFontSize: 10,
labelPadding: 4,
tickColor: axisColor,
labelColor: axisColor,
tickSize: 10,
ticks: true,
titleFontSize: 14,
Expand All @@ -57,14 +63,15 @@ const fivethirtyeighttheme: Config = {

axisTop: {
domain: false,
domainColor: 'black',
domainColor: blackTitle,
domainWidth: 3,
grid: true,
gridColor: axisColor,
gridWidth: 1,
labelFontSize: 12,
labelFontSize: 10,
labelPadding: 4,
tickColor: axisColor,
labelColor: axisColor,
tickSize: 10,
titleFontSize: 14,
titlePadding: 10,
Expand All @@ -77,11 +84,13 @@ const fivethirtyeighttheme: Config = {

legend: {
labelFontSize: 11,
labelColor: blackTitle,
padding: 1,
symbolSize: 30,
symbolType: 'square',
titleFontSize: 14,
titlePadding: 10,
titleColor: blackTitle
},

line: {
Expand All @@ -90,7 +99,6 @@ const fivethirtyeighttheme: Config = {
},

path: { stroke: markColor, strokeWidth: 0.5 },
point: { filled: true },
rect: { fill: markColor },

range: {
Expand Down Expand Up @@ -121,10 +129,10 @@ const fivethirtyeighttheme: Config = {
},

symbol: {
opacity: 1,
opacity: 0.5,
shape: 'circle',
size: 40,
strokeWidth: 1,
filled: True
},

shape: { stroke: markColor },
Expand All @@ -145,4 +153,4 @@ const fivethirtyeighttheme: Config = {
},
};

export default fivethirtyeighttheme;
export default fivethirtyeighttheme;