Skip to content

Replace googlefonts by @fontsource #42

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.

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

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
56 changes: 46 additions & 10 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 4 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@files-ui/react",
"version": "1.2.3",
"version": "1.2.4",
"description": "UI components for file uploads with React js",
"main": "./build/index.js",
"module": "./build/index.es.js",
Expand Down Expand Up @@ -54,6 +54,7 @@
"identity-obj-proxy": "^3.0.0",
"jest": "^29.5.0",
"jest-environment-jsdom": "^29.5.0",
"rollup-plugin-import-css": "^3.5.0",
"rollup-plugin-peer-deps-external": "^2.2.4",
"rollup-plugin-sass": "^1.12.19",
"rollup-plugin-terser": "^7.0.2",
Expand All @@ -68,7 +69,8 @@
},
"dependencies": {
"@dynamicss/dynamicss": "^2.2.8",
"@files-ui/core": "^2.0.6"
"@files-ui/core": "^2.0.6",
"@fontsource/poppins": "^5.0.14"
},
"publishConfig": {
"access": "public"
Expand Down
2 changes: 2 additions & 0 deletions rollup.config.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import commonjs from "@rollup/plugin-commonjs";
import css from "rollup-plugin-import-css";
import resolve from "@rollup/plugin-node-resolve";
import peerDepsExternal from "rollup-plugin-peer-deps-external";
import typescript from "rollup-plugin-typescript2";
Expand All @@ -22,6 +23,7 @@ export default {
},
],
plugins: [
css(),
sass({ insert: true }),

peerDepsExternal(),
Expand Down
1 change: 0 additions & 1 deletion src/Avatar/Avatar.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
@import url(https://fonts.googleapis.com/css?family=Poppins:300,400,500,600,700,900);

.fui-avatar-main-container {
width: 200px;
Expand Down
1 change: 0 additions & 1 deletion src/Dropzone/components/dropzone/Dropzone.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
@import url(https://fonts.googleapis.com/css?family=Poppins:300,400,500,600,700,900);

.fui-dropzone-root {
width: 100%;
Expand Down
3 changes: 1 addition & 2 deletions src/FileCard/FileCard.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
@import url(https://fonts.googleapis.com/css?family=Poppins:300,400,500,600,700,900);

.files-ui-file-card-main-container {
border-radius: 8px;
Expand Down Expand Up @@ -241,4 +240,4 @@
background-color: rgba(154, 160, 166, 0.85);
}
}
} */
} */
3 changes: 1 addition & 2 deletions src/FileMosaic/components/file-mosaic/FileMosaic.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
@import url(https://fonts.googleapis.com/css?family=Poppins:300,400,500,600,700,900);

.files-ui-file-mosaic-main-container {
//min width
Expand Down Expand Up @@ -193,4 +192,4 @@
}
}
}
*/
*/
1 change: 0 additions & 1 deletion src/MaterialButton/MaterialButton.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
@import url(https://fonts.googleapis.com/css?family=Poppins:300,400,500,600,700,900);

.material-button-root {
border: 0;
Expand Down
10 changes: 9 additions & 1 deletion src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -154,4 +154,12 @@ export { default as FilesUiProvider } from "./FilesUiProvider/FilesUiProvider";
export * from "./FilesUiProvider/FilesUiProvider";


export type { IconsSet, FilesUIConfig } from "./FilesUiProvider";
export type { IconsSet, FilesUIConfig } from "./FilesUiProvider";

import '@fontsource/poppins/300.css';
import '@fontsource/poppins/400.css';
import '@fontsource/poppins/500.css';
import '@fontsource/poppins/600.css';
import '@fontsource/poppins/700.css';
import '@fontsource/poppins/800.css';
import '@fontsource/poppins/900.css';