From 901932f9d7e3e907ce44af74f8eedd6d45fb1e57 Mon Sep 17 00:00:00 2001
From: satbir121 <39981226+satbir121@users.noreply.github.com>
Date: Wed, 19 Aug 2020 03:21:23 +0530
Subject: [PATCH] Switching to system fonts (#344)
* Switching to system fonts
* Fixed text alignment issue in text component.
* Changing font of ads components.
* Adding a font type
* Removing unused fonts
* Making fonts in theme an object.
* Removing unncessary font declerations
* Fixing storybook
* Reverting background remove
---
app/client/.storybook/config.js | 2 ++
app/client/package.json | 4 +---
app/client/public/index.html | 13 ++++++-------
app/client/src/components/ads/Button.tsx | 1 -
app/client/src/components/ads/Table.tsx | 2 --
app/client/src/components/ads/Tabs.tsx | 1 -
app/client/src/components/ads/Text.tsx | 1 -
app/client/src/components/ads/TextInput.tsx | 3 +--
.../designSystems/blueprint/TextComponent.tsx | 2 +-
.../editorComponents/ApiResponseView.tsx | 2 +-
.../editorComponents/HighlightedCode/themes.ts | 4 ++--
.../components/editorComponents/RequestView.tsx | 4 ++--
app/client/src/constants/DefaultTheme.tsx | 14 ++++++++------
app/client/src/constants/Fonts.tsx | 8 ++++----
app/client/src/index.css | 6 ------
.../src/pages/Editor/APIEditor/Pagination.tsx | 2 +-
app/client/src/pages/Editor/WidgetCard.tsx | 2 +-
app/client/src/utils/AppsmithUtils.tsx | 11 -----------
18 files changed, 30 insertions(+), 52 deletions(-)
diff --git a/app/client/.storybook/config.js b/app/client/.storybook/config.js
index a73e36cda6..5fea975677 100644
--- a/app/client/.storybook/config.js
+++ b/app/client/.storybook/config.js
@@ -2,6 +2,8 @@ import { configure, addDecorator, addParameters } from "@storybook/react";
import { withContexts } from "@storybook/addon-contexts/react";
import { contexts } from "./configs/contexts";
import { } from '@storybook/react'; // <- or your storybook framework
+import "../src/index.css";
+
addDecorator(withContexts(contexts));
addParameters({
diff --git a/app/client/package.json b/app/client/package.json
index 4ea39be357..e17e64f269 100644
--- a/app/client/package.json
+++ b/app/client/package.json
@@ -19,7 +19,6 @@
"@sentry/browser": "^5.6.3",
"@sentry/webpack-plugin": "^1.10.0",
"@types/chance": "^1.0.7",
- "@types/fontfaceobserver": "^0.0.6",
"@types/lodash": "^4.14.120",
"@types/moment-timezone": "^0.5.10",
"@types/nanoid": "^2.0.0",
@@ -52,7 +51,6 @@
"eslint": "^6.4.0",
"fast-deep-equal": "^3.1.1",
"flow-bin": "^0.91.0",
- "fontfaceobserver": "^2.1.0",
"fuse.js": "^3.4.5",
"fusioncharts": "^3.15.0-sr.1",
"history": "^4.10.1",
@@ -200,4 +198,4 @@
"pre-commit": "lint-staged"
}
}
-}
+}
\ No newline at end of file
diff --git a/app/client/public/index.html b/app/client/public/index.html
index 5c9057683b..8086d8ef28 100755
--- a/app/client/public/index.html
+++ b/app/client/public/index.html
@@ -4,7 +4,6 @@
-
Appsmith