Skip to content
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.

Sign up for GitHub

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

font fixes and ui fixes #4

Merged
merged 1 commit into from
Nov 11, 2024
Merged

font fixes and ui fixes #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
Binary file modified .yarn/install-state.gz
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion charts/BaseOptions/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ export default function BaseOptions() {
// Tooltip
tooltip: {
style: {
fontFamily: 'Strawford, Helvetica, sans-serif',
fontFamily: 'var(--font-family)',
},
theme: isDarkMode ? 'dark' : 'light',
x: {
Expand Down
8 changes: 4 additions & 4 deletions charts/DoughnutChart/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ const DoughnutChart = ({ data, title, label, value, colorSet }: any) => {
backgroundColor: theme.background.tooltip,
textStyle: {
color: theme.text.primary,
fontFamily: 'Strawford, Helvetica, sans-serif',
fontFamily: 'var(--font-family)',
},
borderWidth: 0,
borderRadius: 10,
Expand All @@ -54,7 +54,7 @@ const DoughnutChart = ({ data, title, label, value, colorSet }: any) => {
textStyle: {
color: theme.graph.legendText,
fontSize: 12,
fontFamily: 'Strawford, Helvetica, sans-serif',
fontFamily: 'var(--font-family)',
fontWeight: 500,
},
itemWidth: 15,
Expand Down Expand Up @@ -90,13 +90,13 @@ const DoughnutChart = ({ data, title, label, value, colorSet }: any) => {
a: {
lineHeight: 15,
color: theme.graph.primaryLabel,
fontFamily: 'Strawford, Helvetica, sans-serif',
fontFamily: 'var(--font-family)',
fontSize: '12px',
},
b: {
fontWeight: 500,
color: theme.graph.secondaryLabel,
fontFamily: 'Strawford, Helvetica, sans-serif',
fontFamily: 'var(--font-family)',
fontSize: '14px',
lineHeight: 20,
},
Expand Down
8 changes: 4 additions & 4 deletions charts/HorizontalBarChart/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ export default function HorizontalBarChart({
window.open(DAPP_LINKS.CHANNELS, '_blank');
},
},
fontFamily: 'Strawford, Helvetica, sans-serif',
fontFamily: 'var(--font-family)',
},
plotOptions: {
bar: {
Expand Down Expand Up @@ -90,7 +90,7 @@ export default function HorizontalBarChart({
},
style: {
fontSize: '12px',
fontFamily: 'Strawford, Helvetica, sans-serif',
fontFamily: 'var(--font-family)',
colors: theme.graph.primaryLabel,
cursor: 'pointer',
},
Expand All @@ -111,7 +111,7 @@ export default function HorizontalBarChart({
},
style: {
fontSize: '12px',
fontFamily: 'Strawford, Helvetica, sans-serif',
fontFamily: 'var(--font-family)',
colors: theme.graph.primaryLabel,
},
},
Expand Down Expand Up @@ -147,7 +147,7 @@ export default function HorizontalBarChart({
alignItems="flex-start"
justifyContent="flex-start"
height="auto"
width="100%"
width="-webkit-fill-available"
background={isMobile ? 'transparent' : theme.background.card}
border={`1px solid ${theme.background.border}`}
borderRadius="28px"
Expand Down
8 changes: 4 additions & 4 deletions charts/LineChart/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ export default function Chart({
// autoScaleYaxis: true,
},
offsetX: -10,
fontFamily: 'Strawford, Helvetica, sans-serif',
fontFamily: 'var(--font-family)',
},
yaxis: {
axisTicks: {
Expand All @@ -67,7 +67,7 @@ export default function Chart({
labels: {
style: {
fontSize: '12px',
fontFamily: 'Strawford, Helvetica, sans-serif',
fontFamily: 'var(--font-family)',
colors: theme.graph.primaryLabel,
},
},
Expand All @@ -82,7 +82,7 @@ export default function Chart({
hideOverlappingLabels: true,
style: {
fontSize: '12px',
fontFamily: 'Strawford, Helvetica, sans-serif',
fontFamily: 'var(--font-family)',
colors: theme.graph.primaryLabel,
},
datetimeFormatter: {
Expand Down Expand Up @@ -130,7 +130,7 @@ export default function Chart({
alignItems="flex-start"
justifyContent="flex-start"
height="auto"
width="100%"
width="-webkit-fill-available"
background={isMobile ? 'transparent' : theme.background.card}
border={`1px solid ${theme.background.border}`}
borderRadius="28px"
Expand Down
4 changes: 2 additions & 2 deletions components/Dashboard/LineChartSet/linchartset.styled.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ export const Option = styled.div`
width: 100%;
background-color: transparent;
color: ${({ theme }) => theme.text.secondary};
font-family: 'Strawford', Helvetica, sans-serif;
font-family: 'var(--font-family)';
display: flex;
justify-content: flex-start;
align-items: center;
Expand Down Expand Up @@ -95,7 +95,7 @@ export const TimeFilter = styled.button<TimeFilterType>`
background-color: ${(props) => props.background || '#cf1c84'};
color: ${(props) => props.color || '#657795'};
font-weight: ${(props) => props.fontWeight || '500'};
font-family: 'Strawford', Helvetica, sans-serif;
font-family: 'FK Grotesk Neu';
font-size: 15px;
border-radius: 12px;
min-width: 41px;
Expand Down
2 changes: 1 addition & 1 deletion components/Navbar/NavBarButtons.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ const Button = styled(ButtonV2)`
max-width: 140px;
font-size: 18px;
font-weight: 500;
font-family: 'Strawford', Helvetica, sans-serif;
font-family: 'var(--font-family)';
border-radius: 10px;
padding: 10px 10px;
type: submit;
Expand Down
20 changes: 2 additions & 18 deletions components/Navbar/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,33 +5,18 @@ import Link from 'next/link';

// External Library imports
import { DarkModeSwitch } from 'react-toggle-dark-mode';
import { useMediaQuery } from '@mui/material';
import { css, useTheme } from 'styled-components';
import { css } from 'styled-components';

// Internal Components imports
import { useTheme as Theme } from '../../contexts/ThemeContext';
import { useData } from '../../contexts/DataContext';
import { ROUTES, CREDENTIALKEYS } from '../../utils/constants';
import { ThemeType } from '../../types/theme';
import { Box, Text, Lozenge, PushLogo } from '../../blocks';
import SearchBar from '../Home/SearchBar';

export default function Navbar() {
const { isDarkMode, darkModeToggle } = Theme();
const { isLoggedIn, setIsLoggedIn, token } = useData();

const router = useRouter();
const theme = useTheme() as ThemeType;
const isMobile = useMediaQuery('(max-width:480px)');
const isSmall = useMediaQuery('(max-width:1024px)');
const { asPath } = useRouter();
const [showSidebar, setShowSidebar] = React.useState<boolean>(false);

const logout = () => {
setIsLoggedIn?.(false);
sessionStorage.setItem(CREDENTIALKEYS.LOGINCHECK, '' + false);
sessionStorage.setItem(CREDENTIALKEYS.TOKEN, '');
router.push(ROUTES.LOGIN);
};

return (
<Box
Expand Down Expand Up @@ -75,7 +60,6 @@ export default function Navbar() {
size="small"
variant="primary"
css={css`
padding: 10px;
margin-left: 10px;
`}
>
Expand Down
7 changes: 3 additions & 4 deletions components/Reusables/SharedStyling/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import {
ISectionV2Props,
ISpanV2Props,
ISkeletonProps,
ISkeletonLineProps
ISkeletonLineProps,
} from '../../../types/sharedStyling';
import { TextType } from '../../../types/otherStyled';
import { themeLight } from '../../../theme/palette';
Expand Down Expand Up @@ -108,8 +108,7 @@ export const ItemVV2 = styled(ItemHV2)`

export const H2V2 = styled.h2<IH2V2Props>`
color: ${(props) => props.color || themeLight.text.primary};
font-family: ${(props) =>
props.family || "'Strawford', Helvetica, sans-serif"};
font-family: ${(props) => props.family || 'var(--font-family)'};
font-size: ${(props) => props.fontSize || 'initial'};
font-weight: ${(props) => props.fontWeight || 'initial'};
letter-spacing: ${(props) => props.letterSpacing || 'initial'};
Expand Down Expand Up @@ -250,7 +249,7 @@ export const DashBoardContainer = styled(ItemVV2)`
export const Text = styled.p<TextType>`
font-size: ${(props) => props.size || '15px'};
font-weight: ${(props) => props.weight || 400};
font-family: 'Strawford', Helvetica, sans-serif;
font-family: var(--font-family);
color: ${(props) => props.color || props.theme.text.primary};
margin-top: ${(props) => props.marginTop || '0px'};
margin-bottom: ${(props) => props.marginBottom || '0px'};
Expand Down
Binary file removed public/static/fonts_old/Strawford-Black.eot
View file
Open in desktop
Binary file not shown.
Loading
Loading