Skip to content

Commit

Permalink
fix: import fonts
Browse files Browse the repository at this point in the history
  • Loading branch information
@thiendang
thiendang committed Mar 12, 2024
1 parent c3f69ae commit 1d152a4
Show file tree
Hide file tree
Showing 4 changed files with 38 additions and 36 deletions.
20 changes: 10 additions & 10 deletions shell/public/config.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8113,79 +8113,79 @@ input[type=search]::-webkit-search-cancel-button {
*/
@font-face {
font-family: Satoshi;
src: url(/assets/Satoshi-Light-8a24f395.woff2) format("woff2"),url(/assets/Satoshi-Light-dd42e743.woff) format("woff"),url(/assets/Satoshi-Light-b54cf060.ttf) format("truetype");
src: url('./fonts/Satoshi-Light.woff2') format("woff2"),url('./fonts/Satoshi-Light.woff2') format("woff"),url('./fonts/Satoshi-Light.ttf') format("truetype");
font-weight: 300;
font-display: swap;
font-style: normal
}

@font-face {
font-family: Satoshi;
src: url(/assets/Satoshi-LightItalic-9690a557.woff2) format("woff2"),url(/assets/Satoshi-LightItalic-2f9c5264.woff) format("woff"),url(/assets/Satoshi-LightItalic-c9a8d027.ttf) format("truetype");
src: url('./fonts/Satoshi-LightItalic.woff2') format("woff2"),url('./fonts/Satoshi-LightItalic.woff') format("woff"),url('./fonts/Satoshi-LightItalic.ttf') format("truetype");
font-weight: 300;
font-display: swap;
font-style: italic
}

@font-face {
font-family: Satoshi;
src: url(/assets/Satoshi-Regular-50dca57f.woff2) format("woff2"),url(/assets/Satoshi-Regular-9fbc41c9.woff) format("woff"),url(/assets/Satoshi-Regular-243b23f6.ttf) format("truetype");
src: url('./fonts/Satoshi-Regular.woff2') format("woff2"),url('./fonts/Satoshi-Regular.woff') format("woff"),url('./fonts/Satoshi-Regular.ttf') format("truetype");
font-weight: 400;
font-display: swap;
font-style: normal
}

@font-face {
font-family: Satoshi;
src: url(/assets/Satoshi-Italic-dbcb8c32.woff2) format("woff2"),url(/assets/Satoshi-Italic-a6df1710.woff) format("woff"),url(/assets/Satoshi-Italic-14c3d259.ttf) format("truetype");
src: url('./fonts/Satoshi-Italic.woff2') format("woff2"),url('./fonts/Satoshi-Italic.woff') format("woff"),url('./fonts/Satoshi-Italic.ttf') format("truetype");
font-weight: 400;
font-display: swap;
font-style: italic
}

@font-face {
font-family: Satoshi;
src: url(/assets/Satoshi-Medium-af02a722.woff2) format("woff2"),url(/assets/Satoshi-Medium-7aeaf037.woff) format("woff"),url(/assets/Satoshi-Medium-7130cef6.ttf) format("truetype");
src: url('./fonts/Satoshi-Medium.woff2') format("woff2"),url('./fonts/Satoshi-Medium.woff') format("woff"),url('./fonts/Satoshi-Medium.ttf') format("truetype");
font-weight: 500;
font-display: swap;
font-style: normal
}

@font-face {
font-family: Satoshi;
src: url(/assets/Satoshi-MediumItalic-beb15382.woff2) format("woff2"),url(/assets/Satoshi-MediumItalic-cf98a3ed.woff) format("woff"),url(/assets/Satoshi-MediumItalic-71f8dce5.ttf) format("truetype");
src: url('./fonts/Satoshi-MediumItalic.woff2') format("woff2"),url('./fonts/Satoshi-MediumItalic.woff') format("woff"),url('./fonts/Satoshi-MediumItalic.ttf') format("truetype");
font-weight: 500;
font-display: swap;
font-style: italic
}

@font-face {
font-family: Satoshi;
src: url(/assets/Satoshi-Bold-353a7fbf.woff2) format("woff2"),url(/assets/Satoshi-Bold-1789917c.woff) format("woff"),url(/assets/Satoshi-Bold-2c122eab.ttf) format("truetype");
src: url('./fonts/Satoshi-Bold.woff2') format("woff2"),url('./fonts/Satoshi-Bold.woff') format("woff"),url('./fonts/Satoshi-Bold.ttf') format("truetype");
font-weight: 700;
font-display: swap;
font-style: normal
}

@font-face {
font-family: Satoshi;
src: url(/assets/Satoshi-BoldItalic-52bfd9e8.woff2) format("woff2"),url(/assets/Satoshi-BoldItalic-5d73878e.woff) format("woff"),url(/assets/Satoshi-BoldItalic-8ff85a17.ttf) format("truetype");
src: url('./fonts/Satoshi-BoldItalic.woff2') format("woff2"),url('./fonts/Satoshi-BoldItalic.woff') format("woff"),url('./fonts/Satoshi-BoldItalic.ttf') format("truetype");
font-weight: 700;
font-display: swap;
font-style: italic
}

@font-face {
font-family: Satoshi;
src: url(/assets/Satoshi-Black-bd11b582.woff2) format("woff2"),url(/assets/Satoshi-Black-a849a7b7.woff) format("woff"),url(/assets/Satoshi-Black-78edaca6.ttf) format("truetype");
src: url('./fonts/Satoshi-Black.woff2') format("woff2"),url('./fonts/Satoshi-Black.woff') format("woff"),url('./fonts/Satoshi-Black.ttf') format("truetype");
font-weight: 900;
font-display: swap;
font-style: normal
}

@font-face {
font-family: Satoshi;
src: url(/assets/Satoshi-BlackItalic-83d61d67.woff2) format("woff2"),url(/assets/Satoshi-BlackItalic-cf5edac8.woff) format("woff"),url(/assets/Satoshi-BlackItalic-d3d6c8d6.ttf) format("truetype");
src: url('./fonts/Satoshi-BlackItalic.woff2') format("woff2"),url('./fonts/Satoshi-BlackItalic.woff') format("woff"),url('./fonts/Satoshi-BlackItalic.ttf') format("truetype");
font-weight: 900;
font-display: swap;
font-style: italic
Expand Down
4 changes: 2 additions & 2 deletions shell/public/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
rel="stylesheet"
href="%PUBLIC_URL%/style.css"
/>
<link
<!-- <link
rel="stylesheet"
href="https://cdn.jsdelivr.net/npm/jsvectormap/dist/css/jsvectormap.min.css"
/>
/> -->
<link
rel="stylesheet"
href="https://cdn.jsdelivr.net/npm/flatpickr/dist/flatpickr.min.css"
Expand Down
1 change: 1 addition & 0 deletions shell/src/components/Maps/MapOne.tsx
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import React, { useEffect } from 'react';
import jsVectorMap from 'jsvectormap';
import 'jsvectormap/dist/maps/world.js'
import 'jsvectormap/dist/css/jsvectormap.min.css'

const MapOne = () => {
useEffect(() => {
Expand Down
49 changes: 25 additions & 24 deletions shell/src/pages/Dashboard/Marketing.tsx
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React from 'react';
import { NavLink } from 'react-router-dom';
import DefaultLayout from '../../components/Layout/DefaultLayout.tsx';
import { MicrofrontendSlot } from 'microfrontends';
import MapOne from '../../components/Maps/MapOne.tsx';
Expand Down Expand Up @@ -137,20 +138,20 @@ const Marketing: React.FC = () => {
fill="#E37300"
></path>
</svg>
<a
<NavLink
aria-current="page"
className="active"
href="/dashboard/marketing"
to="/dashboard/marketing"
>
<h4 className="font-medium text-black group-hover:text-primary dark:text-white dark:group-hover:text-primary">
Google Analytics
</h4>
</a>
</NavLink>
</div>
<a
<NavLink
aria-current="page"
className="inline-block hover:text-primary active"
href="/dashboard/marketing"
to="/dashboard/marketing"
>
<svg
className="fill-current"
Expand All @@ -172,7 +173,7 @@ const Marketing: React.FC = () => {
</clipPath>
</defs>
</svg>
</a>
</NavLink>
</div>
<div className="group flex items-center justify-between rounded-md p-4.5 hover:bg-gray-2 dark:hover:bg-graydark">
<div className="flex items-center gap-4">
Expand All @@ -195,20 +196,20 @@ const Marketing: React.FC = () => {
</clipPath>
</defs>
</svg>
<a
<NavLink
aria-current="page"
className="active"
href="/dashboard/marketing"
to="/dashboard/marketing"
>
<h4 className="font-medium text-black group-hover:text-primary dark:text-white dark:group-hover:text-primary">
Facebook Ads
</h4>
</a>
</NavLink>
</div>
<a
<NavLink
aria-current="page"
className="inline-block hover:text-primary active"
href="/dashboard/marketing"
to="/dashboard/marketing"
>
<svg
className="fill-current"
Expand All @@ -230,7 +231,7 @@ const Marketing: React.FC = () => {
</clipPath>
</defs>
</svg>
</a>
</NavLink>
</div>
<div className="group flex items-center justify-between rounded-md p-4.5 hover:bg-gray-2 dark:hover:bg-graydark">
<div className="flex items-center gap-4">
Expand All @@ -246,20 +247,20 @@ const Marketing: React.FC = () => {
fill="#0080F7"
></path>
</svg>
<a
<NavLink
aria-current="page"
className="active"
href="/dashboard/marketing"
to="/dashboard/marketing"
>
<h4 className="font-medium text-black group-hover:text-primary dark:text-white dark:group-hover:text-primary">
Seranking
</h4>
</a>
</NavLink>
</div>
<a
<NavLink
aria-current="page"
className="inline-block hover:text-primary active"
href="/dashboard/marketing"
to="/dashboard/marketing"
>
<svg
className="fill-current"
Expand All @@ -281,7 +282,7 @@ const Marketing: React.FC = () => {
</clipPath>
</defs>
</svg>
</a>
</NavLink>
</div>
<div className="group flex items-center justify-between rounded-md p-4.5 hover:bg-gray-2 dark:hover:bg-graydark">
<div className="flex items-center gap-4">
Expand Down Expand Up @@ -354,20 +355,20 @@ const Marketing: React.FC = () => {
</clipPath>
</defs>
</svg>
<a
<NavLink
aria-current="page"
className="active"
href="/dashboard/marketing"
to="/dashboard/marketing"
>
<h4 className="font-medium text-black group-hover:text-primary dark:text-white dark:group-hover:text-primary">
Instagram Ads
</h4>
</a>
</NavLink>
</div>
<a
<NavLink
aria-current="page"
className="inline-block hover:text-primary active"
href="/dashboard/marketing"
to="/dashboard/marketing"
>
<svg
className="fill-current"
Expand All @@ -389,7 +390,7 @@ const Marketing: React.FC = () => {
</clipPath>
</defs>
</svg>
</a>
</NavLink>
</div>
</div>
</div>
Expand Down

0 comments on commit 1d152a4

Please sign in to comment.