Skip to content

Commit

Permalink
Merge branch 'main' into handle_firewall_rules_on_windows
Browse files Browse the repository at this point in the history
  • Loading branch information
@mmrrnn
mmrrnn authored Nov 21, 2024
2 parents ed0f24c + 5a653b9 commit 679609d
Show file tree
Hide file tree
Showing 8 changed files with 88 additions and 260 deletions.
97 changes: 82 additions & 15 deletions index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,33 +6,100 @@
<link rel="icon" type="image/svg+xml" href="/tari.svg" />

<!-- Preload Poppins fonts -->
<link rel="preload" href="/assets/fonts/Poppins/Poppins-ExtraLight.woff2" as="font" type="font/woff2" crossorigin>
<link rel="preload" href="/assets/fonts/Poppins/Poppins-Light.woff2" as="font" type="font/woff2" crossorigin>
<link rel="preload" href="/assets/fonts/Poppins/Poppins-Regular.woff2" as="font" type="font/woff2" crossorigin>
<link rel="preload" href="/assets/fonts/Poppins/Poppins-Medium.woff2" as="font" type="font/woff2" crossorigin>
<link rel="preload" href="/assets/fonts/Poppins/Poppins-SemiBold.woff2" as="font" type="font/woff2" crossorigin>
<link rel="preload" href="/assets/fonts/Poppins/Poppins-Bold.woff2" as="font" type="font/woff2" crossorigin>
<link rel="preload" href="/assets/fonts/Poppins/Poppins-ExtraBold.woff2" as="font" type="font/woff2" crossorigin>
<link rel="preload" href="/assets/fonts/Poppins/Poppins-Black.woff2" as="font" type="font/woff2" crossorigin>

<!-- Preload Druk fonts -->
<link rel="preload" href="/assets/fonts/Druk/DrukLCG-Medium.ttf" as="font" type="font/ttf" crossorigin>
<link rel="preload" href="/assets/fonts/Druk/DrukLCG-Bold.ttf" as="font" type="font/ttf" crossorigin>
<link rel="preload" href="/assets/fonts/Druk/DrukLCG-Heavy.ttf" as="font" type="font/ttf" crossorigin>
<link rel="preload" href="/assets/fonts/Druk/DrukWideLCG-Medium.ttf" as="font" type="font/ttf" crossorigin>
<link rel="preload" href="/assets/fonts/Druk/DrukWideLCG-Bold.ttf" as="font" type="font/ttf" crossorigin>
<link rel="preload" href="/assets/fonts/Druk/DrukWideLCG-Heavy.ttf" as="font" type="font/ttf" crossorigin>

<!-- Preload GT America fonts -->
<link rel="preload" href="/assets/fonts/GT-America/GT-America-Standard-Light-Trial.otf" as="font" type="font/otf" crossorigin>
<link rel="preload" href="/assets/fonts/GT-America/GT-America-Standard-Regular-Trial.otf" as="font" type="font/otf" crossorigin>
<link rel="preload" href="/assets/fonts/GT-America/GT-America-Standard-Medium-Trial.otf" as="font" type="font/otf" crossorigin>
<link rel="preload" href="/assets/fonts/GT-America/GT-America-Standard-Bold-Trial.otf" as="font" type="font/otf" crossorigin>
<link rel="preload" href="/assets/fonts/GT-America/GT-America-Standard-Black-Trial.otf" as="font" type="font/otf" crossorigin>

<script type="module" crossorigin src="/assets/glApp.js"></script>
<title>Tari Universe | Testnet</title>
<style>
/* Poppins Font Faces */

@font-face {
font-family: "Poppins";
font-weight: 400;
font-style: normal;
src:
url("/assets/fonts/Poppins/Poppins-Regular.woff2") format("woff2"),
url("/assets/fonts/Poppins/Poppins-Regular.woff") format("woff"),
url("/assets/fonts/Poppins/Poppins-Regular.ttf") format("truetype");
font-display: swap;
}
@font-face {
font-family: "Poppins";
font-weight: 500;
font-style: normal;
src:
url("/assets/fonts/Poppins/Poppins-Medium.woff2") format("woff2"),
url("/assets/fonts/Poppins/Poppins-Medium.woff") format("woff"),
url("/assets/fonts/Poppins/Poppins-Medium.ttf") format("truetype");
font-display: swap;
}
@font-face {
font-family: "Poppins";
font-weight: 600;
font-style: normal;
src:
url("/assets/fonts/Poppins/Poppins-SemiBold.woff2") format("woff2"),
url("/assets/fonts/Poppins/Poppins-SemiBold.woff") format("woff"),
url("/assets/fonts/Poppins/Poppins-SemiBold.ttf") format("truetype");
font-display: swap;
}
@font-face {
font-family: "Poppins";
font-weight: 700;
font-style: normal;
src:
url("/assets/fonts/Poppins/Poppins-Bold.woff2") format("woff2"),
url("/assets/fonts/Poppins/Poppins-Bold.woff") format("woff"),
url("/assets/fonts/Poppins/Poppins-Bold.ttf") format("truetype");
font-display: swap;
}
@font-face {
font-family: "Poppins";
font-weight: 800;
font-style: normal;
src:
url("/assets/fonts/Poppins/Poppins-ExtraBold.woff2") format("woff2"),
url("/assets/fonts/Poppins/Poppins-ExtraBold.woff") format("woff"),
url("/assets/fonts/Poppins/Poppins-ExtraBold.ttf") format("truetype");
font-display: swap;
}


/* Druk Font Faces */

@font-face {
font-family: "Druk";
src: url("/assets/fonts/Druk/DrukLCG-Bold.ttf") format("truetype");
font-weight: 700;
font-style: normal;
font-display: swap;
}
@font-face {
font-family: "DrukWide";
src: url("/assets/fonts/Druk/DrukWideLCG-Medium.ttf") format("truetype");
font-weight: 500;
font-style: normal;
font-display: swap;
}
@font-face {
font-family: "DrukWide";
src: url("/assets/fonts/Druk/DrukWideLCG-Bold.ttf") format("truetype");
font-weight: 700;
font-style: normal;
font-display: swap;
}


/* Existing styles */
body,
main,
#root {
Expand All @@ -44,8 +111,8 @@
position: absolute;
pointer-events: auto;
}
</style>
</head>
</style>
</head>
<body>
<main>
<canvas id="canvas"></canvas>
Expand Down
2 changes: 0 additions & 2 deletions src/App/App.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import MainView from '../containers/main/MainView.tsx';
import Setup from '../containers/phase/Setup/Setup';

import { GlobalReset, GlobalStyle } from '../theme/GlobalStyle.ts';
import { GlobalFontFace } from '../theme/fonts/GlobalFontFaces.ts';
import ThemeProvider from '../theme/ThemeProvider.tsx';

import AppContent from './AppContent';
Expand All @@ -19,7 +18,6 @@ export default function App() {
return (
<ThemeProvider>
<GlobalReset />
<GlobalFontFace />
<GlobalStyle />
<LazyMotion features={domMax} strict>
{/*
Expand Down
9 changes: 6 additions & 3 deletions src/containers/main/SideBar/components/Wallet/HistoryItem.styles.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,12 @@ export const Wrapper = styled(m.div)`
flex-shrink: 0;
flex-grow: 0;
max-height: 269px;
font-family:
GTAmerica Standard,
sans-serif;
&:hover {
.hover-target {
opacity: 0.2;
}
}
`;

export const LeftContent = styled.div`
Expand Down
10 changes: 0 additions & 10 deletions src/theme/fonts/GlobalFontFaces.ts
View file

This file was deleted.

19 changes: 0 additions & 19 deletions src/theme/fonts/avenir.ts
View file

This file was deleted.

61 changes: 0 additions & 61 deletions src/theme/fonts/druk.ts
View file

This file was deleted.

60 changes: 0 additions & 60 deletions src/theme/fonts/gt-america.ts
View file

This file was deleted.

Loading

0 comments on commit 679609d

Please sign in to comment.