Skip to content

prevent external-fonts #789

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

Merged
merged 3 commits into from
Nov 9, 2018
Merged

prevent external-fonts #789

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
739d7ff
prevent external-fonts
VeraZab Nov 9, 2018
98e1388
better default + add Dosis to Demo
VeraZab Nov 9, 2018
9352eab
percy adjustment
VeraZab Nov 9, 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
1 change: 1 addition & 0 deletions dev/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
<head>
<meta charset="utf-8">
<link rel="shortcut icon" href="/favicon.ico">
<link href='https://fonts.googleapis.com/css?family=Dosis:500,700|Open+Sans:400,400i,600,700' rel='stylesheet' type='text/css'>
<title>Editor Dev</title>
</head>
<body>
Expand Down
1 change: 1 addition & 0 deletions examples/custom/public/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<meta name="theme-color" content="#000000">
<link href='https://fonts.googleapis.com/css?family=Dosis:500,700|Open+Sans:400,400i,600,700' rel='stylesheet' type='text/css'>
<!--
manifest.json provides metadata used when your web app is added to the
homescreen on Android. See https://developers.google.com/web/fundamentals/engage-and-retain/web-app-manifest/
Expand Down
1 change: 1 addition & 0 deletions examples/demo/public/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<meta name="theme-color" content="#000000">
<link href='https://fonts.googleapis.com/css?family=Dosis:500,700|Open+Sans:400,400i,600,700' rel='stylesheet' type='text/css'>
<!--
manifest.json provides metadata used when your web app is added to the
homescreen on Android. See https://developers.google.com/web/fundamentals/engage-and-retain/web-app-manifest/
Expand Down
1 change: 1 addition & 0 deletions examples/redux/public/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<meta name="theme-color" content="#000000">
<link href='https://fonts.googleapis.com/css?family=Dosis:500,700|Open+Sans:400,400i,600,700' rel='stylesheet' type='text/css'>
<!--
manifest.json provides metadata used when your web app is added to the
homescreen on Android. See https://developers.google.com/web/fundamentals/engage-and-retain/web-app-manifest/
Expand Down
1 change: 1 addition & 0 deletions examples/simple/public/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<meta name="theme-color" content="#000000">
<link href='https://fonts.googleapis.com/css?family=Dosis:500,700|Open+Sans:400,400i,600,700' rel='stylesheet' type='text/css'>
<!--
manifest.json provides metadata used when your web app is added to the
homescreen on Android. See https://developers.google.com/web/fundamentals/engage-and-retain/web-app-manifest/
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,4 +125,4 @@
"watch": "babel src --watch --out-dir lib --source-maps | node-sass -w src/styles/main.scss lib/react-chart-editor.css",
"watch-test": "jest --watch"
}
}
}
4 changes: 2 additions & 2 deletions scripts/translationKeys/combined-translation-keys.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -516,7 +516,7 @@ Relative
Relative To // react-chart-editor: /default_panels/StyleImagesPanel.js:51
Relative to // react-chart-editor: /default_panels/StyleShapesPanel.js:31
Relative to Grid // react-chart-editor: /default_panels/StyleImagesPanel.js:33
Rendering // react-chart-editor: /components/fields/TraceSelector.js:135
Rendering // react-chart-editor: /components/fields/TraceSelector.js:136
Reset // plotly.js: components/modebar/buttons.js:443
Reset axes // plotly.js: components/modebar/buttons.js:159
Reset camera to default // plotly.js: components/modebar/buttons.js:325
Expand Down Expand Up @@ -551,7 +551,7 @@ See a basic example.
Select // react-chart-editor: /default_panels/StyleLayoutPanel.js:85
Select Data Point // react-chart-editor: /default_panels/StyleLayoutPanel.js:111
Select Direction // react-chart-editor: /default_panels/StyleLayoutPanel.js:94
Select Trace Type // react-chart-editor: /components/widgets/TraceTypeSelector.js:234
Select Trace Type // react-chart-editor: /components/widgets/TraceTypeSelector.js:220
Select a Colorscale Type // react-chart-editor: /components/widgets/ColorscalePicker.js:54
Select an Option // react-chart-editor: /components/widgets/Dropdown.js:66
Separate Thousands // react-chart-editor: /default_panels/StyleAxesPanel.js:174
Expand Down
4 changes: 2 additions & 2 deletions scripts/translationKeys/translation-keys.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -509,7 +509,7 @@ Relative
Relative To // /default_panels/StyleImagesPanel.js:51
Relative to // /default_panels/StyleShapesPanel.js:31
Relative to Grid // /default_panels/StyleImagesPanel.js:33
Rendering // /components/fields/TraceSelector.js:135
Rendering // /components/fields/TraceSelector.js:136
Resolution // /default_panels/GraphSubplotsPanel.js:209
Reversed // /components/fields/MarkerColor.js:185
Reversed and Grouped // /default_panels/StyleLegendPanel.js:72
Expand Down Expand Up @@ -538,7 +538,7 @@ See a basic example.
Select // /default_panels/StyleLayoutPanel.js:85
Select Data Point // /default_panels/StyleLayoutPanel.js:111
Select Direction // /default_panels/StyleLayoutPanel.js:94
Select Trace Type // /components/widgets/TraceTypeSelector.js:234
Select Trace Type // /components/widgets/TraceTypeSelector.js:220
Select a Colorscale Type // /components/widgets/ColorscalePicker.js:54
Select an Option // /components/widgets/Dropdown.js:66
Separate Thousands // /default_panels/StyleAxesPanel.js:174
Expand Down
2 changes: 2 additions & 0 deletions src/__percy__/percy.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@import url('https://fonts.googleapis.com/css?family=Dosis:500,700|Open+Sans:400,400i,600,700');

.editor_controls__wrapper > div {
position: relative !important;
}
4 changes: 1 addition & 3 deletions src/styles/variables/_typography.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
@import url('https://fonts.googleapis.com/css?family=Dosis:500,700|Open+Sans:400,400i,600,700');

$font-weight-light: 400;
$font-weight-normal: 500;
$font-weight-semibold: 600;
Expand Down Expand Up @@ -34,6 +32,6 @@ $font: (
family:
(
body: ('Open Sans', --apple-default, sans-serif),
headings: ('Dosis', sans-serif)
headings: ('Dosis', 'Arial', sans-serif)
)
);