Skip to content

Commit

Permalink
Added roboto 2.0.3
Browse files Browse the repository at this point in the history
  • Loading branch information
simmmpleweb committed Sep 8, 2022
1 parent d6de671 commit 5de312b
Show file tree
Hide file tree
Showing 7 changed files with 52 additions and 49 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
node_modules
yarn.lock
package-lock.json
build
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# Change Log

## [2.0.3] 2022-09-08

### Update v2.0.3

- We deleted `fonts.js` and now you can change the fonts directly in `src/theme/styles.js`.
## [2.0.2] 2022-05-16

### Update v2.0.2
Expand Down
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,6 @@ purity-ui-dashboard/
│ │ └── drawer.js
│ ├── foundations
│ │ ├── breakpoints.js
│ │ ├── fonts.js
│ │ └── text.js
│ ├── styles.js
│ └── theme.js
Expand Down
5 changes: 4 additions & 1 deletion public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,10 @@
<link
href="https://fonts.googleapis.com/icon?family=Material+Icons"
rel="stylesheet"
/>
/>
<link rel="preconnect" href="https://fonts.googleapis.com">
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
<link href="https://fonts.googleapis.com/css2?family=Roboto:wght@400;500;700&display=swap" rel="stylesheet">
<script src="https://maps.googleapis.com/maps/api/js?key=YOUR_KEY_HERE"></script>
<link rel="shortcut icon" type="image/x-icon" href="./favicon.ico" />
<!--
Expand Down
3 changes: 0 additions & 3 deletions src/theme/foundations/fonts.js

This file was deleted.

34 changes: 17 additions & 17 deletions src/theme/styles.js
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
import { mode } from "@chakra-ui/theme-tools";
import { mode } from '@chakra-ui/theme-tools';

export const globalStyles = {
colors: {
gray: {
700: "#1f2733",
},
},
styles: {
global: (props) => ({
body: {
bg: mode("gray.50", "gray.800")(props),
fontFamily: 'Helvetica, sans-serif'
},
html: {
fontFamily: 'Helvetica, sans-serif'
}
}),
},
colors: {
gray: {
700: '#1f2733'
}
},
styles: {
global: (props) => ({
body: {
bg: mode('gray.50', 'gray.800')(props),
fontFamily: "'Roboto', sans-serif"
},
html: {
fontFamily: "'Roboto', sans-serif"
}
})
}
};
52 changes: 25 additions & 27 deletions src/theme/theme.js
Original file line number Diff line number Diff line change
@@ -1,30 +1,28 @@
import { extendTheme } from "@chakra-ui/react";
import { globalStyles } from "./styles";
import { font } from "./foundations/fonts";
import { breakpoints } from "./foundations/breakpoints";
import { buttonStyles } from "./components/button";
import { badgeStyles } from "./components/badge";
import { linkStyles } from "./components/link";
import { drawerStyles } from "./components/drawer";
import { CardComponent } from "./additions/card/Card";
import { CardBodyComponent } from "./additions/card/CardBody";
import { CardHeaderComponent } from "./additions/card/CardHeader";
import { MainPanelComponent } from "./additions/layout/MainPanel";
import { PanelContentComponent } from "./additions/layout/PanelContent";
import { PanelContainerComponent } from "./additions/layout/PanelContainer";
import { extendTheme } from '@chakra-ui/react';
import { globalStyles } from './styles';
import { breakpoints } from './foundations/breakpoints';
import { buttonStyles } from './components/button';
import { badgeStyles } from './components/badge';
import { linkStyles } from './components/link';
import { drawerStyles } from './components/drawer';
import { CardComponent } from './additions/card/Card';
import { CardBodyComponent } from './additions/card/CardBody';
import { CardHeaderComponent } from './additions/card/CardHeader';
import { MainPanelComponent } from './additions/layout/MainPanel';
import { PanelContentComponent } from './additions/layout/PanelContent';
import { PanelContainerComponent } from './additions/layout/PanelContainer';
// import { mode } from "@chakra-ui/theme-tools";
export default extendTheme(
{ breakpoints }, // Breakpoints
globalStyles,
font, // Global styles
buttonStyles, // Button styles
badgeStyles, // Badge styles
linkStyles, // Link styles
drawerStyles, // Sidebar variant for Chakra's drawer
CardComponent, // Card component
CardBodyComponent, // Card Body component
CardHeaderComponent, // Card Header component
MainPanelComponent, // Main Panel component
PanelContentComponent, // Panel Content component
PanelContainerComponent // Panel Container component
{ breakpoints }, // Breakpoints
globalStyles,
buttonStyles, // Button styles
badgeStyles, // Badge styles
linkStyles, // Link styles
drawerStyles, // Sidebar variant for Chakra's drawer
CardComponent, // Card component
CardBodyComponent, // Card Body component
CardHeaderComponent, // Card Header component
MainPanelComponent, // Main Panel component
PanelContentComponent, // Panel Content component
PanelContainerComponent // Panel Container component
);

0 comments on commit 5de312b

Please sign in to comment.