farmcontrol/farmcontrol-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added font styles for typography components, removed unused CSS files, and updated session button text for clarity. Enhanced layout styles for collapsible components and adjusted sidebar dimensions.

Browse Source
This commit is contained in:
Tom Butcher 2025-06-28 15:06:25 +01:00
parent 4545550ab8
commit c4ba3ae91c
45 changed files with 203 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
public/fonts/DMMono-Italic.ttf Normal file
View File

Binary file not shown.

BIN
public/fonts/DMMono-Italic.woff Normal file
View File

Binary file not shown.

BIN
public/fonts/DMMono-Italic.woff2 Normal file
View File

Binary file not shown.

BIN
public/fonts/DMMono-Light.ttf Normal file
View File

Binary file not shown.

BIN
public/fonts/DMMono-Light.woff Normal file
View File

Binary file not shown.

BIN
public/fonts/DMMono-Light.woff2 Normal file
View File

Binary file not shown.

BIN
public/fonts/DMMono-LightItalic.ttf Normal file
View File

Binary file not shown.

BIN
public/fonts/DMMono-LightItalic.woff Normal file
View File

Binary file not shown.

BIN
public/fonts/DMMono-LightItalic.woff2 Normal file
View File

Binary file not shown.

BIN
public/fonts/DMMono-Medium.ttf Normal file
View File

Binary file not shown.

BIN
public/fonts/DMMono-Medium.woff Normal file
View File

Binary file not shown.

BIN
public/fonts/DMMono-Medium.woff2 Normal file
View File

Binary file not shown.

BIN
public/fonts/DMMono-MediumItalic.ttf Normal file
View File

Binary file not shown.

BIN
public/fonts/DMMono-MediumItalic.woff Normal file
View File

Binary file not shown.

BIN
public/fonts/DMMono-MediumItalic.woff2 Normal file
View File

Binary file not shown.

BIN
public/fonts/DMMono-Regular.ttf Normal file
View File

Binary file not shown.

BIN
public/fonts/DMMono-Regular.woff Normal file
View File

Binary file not shown.

BIN
public/fonts/DMMono-Regular.woff2 Normal file
View File

Binary file not shown.

BIN
public/fonts/DMSans-Bold.ttf Normal file
View File

Binary file not shown.

BIN
public/fonts/DMSans-Bold.woff Normal file
View File

Binary file not shown.

BIN
public/fonts/DMSans-Bold.woff2 Normal file
View File

Binary file not shown.

BIN
public/fonts/DMSans-BoldItalic.ttf Normal file
View File

Binary file not shown.

BIN
public/fonts/DMSans-BoldItalic.woff Normal file
View File

Binary file not shown.

BIN
public/fonts/DMSans-BoldItalic.woff2 Normal file
View File

Binary file not shown.

BIN
public/fonts/DMSans-Italic.ttf Normal file
View File

Binary file not shown.

BIN
public/fonts/DMSans-Italic.woff Normal file
View File

Binary file not shown.

BIN
public/fonts/DMSans-Italic.woff2 Normal file
View File

Binary file not shown.

BIN
public/fonts/DMSans-Medium.ttf Normal file
View File

Binary file not shown.

BIN
public/fonts/DMSans-Medium.woff Normal file
View File

Binary file not shown.

BIN
public/fonts/DMSans-Medium.woff2 Normal file
View File

Binary file not shown.

BIN
public/fonts/DMSans-MediumItalic.ttf Normal file
View File

Binary file not shown.

BIN
public/fonts/DMSans-MediumItalic.woff Normal file
View File

Binary file not shown.

BIN
public/fonts/DMSans-MediumItalic.woff2 Normal file
View File

Binary file not shown.

BIN
public/fonts/DMSans-Regular.ttf Normal file
View File

Binary file not shown.

BIN
public/fonts/DMSans-Regular.woff Normal file
View File

Binary file not shown.

BIN
public/fonts/DMSans-Regular.woff2 Normal file
View File

Binary file not shown.

119
public/fonts/fonts.css Normal file
View File

@ -0,0 +1,119 @@
@font-face {
font-family: 'DM Sans';
src:
url('./DMSans-Regular.woff2') format('woff2'),
url('./DMSans-Regular.woff') format('woff');
font-weight: 400;
font-style: normal;
font-display: swap;
}
@font-face {
font-family: 'DM Sans';
src:
url('./DMSans-Bold.woff2') format('woff2'),
url('./DMSans-Bold.woff') format('woff');
font-weight: 700;
font-style: normal;
font-display: swap;
}
@font-face {
font-family: 'DM Sans';
src:
url('./DMSans-Italic.woff2') format('woff2'),
url('./DMSans-Italic.woff') format('woff');
font-weight: 400;
font-style: italic;
font-display: swap;
}
@font-face {
font-family: 'DM Sans';
src:
url('./DMSans-Medium.woff2') format('woff2'),
url('./DMSans-Medium.woff') format('woff');
font-weight: 500;
font-style: normal;
font-display: swap;
}
@font-face {
font-family: 'DM Sans';
src:
url('./DMSans-MediumItalic.woff2') format('woff2'),
url('./DMSans-MediumItalic.woff') format('woff');
font-weight: 500;
font-style: italic;
font-display: swap;
}
@font-face {
font-family: 'DM Sans';
src:
url('./DMSans-BoldItalic.woff2') format('woff2'),
url('./DMSans-BoldItalic.woff') format('woff');
font-weight: 700;
font-style: italic;
font-display: swap;
}
@font-face {
font-family: 'DM Mono';
src:
url('./DMMono-Regular.woff2') format('woff2'),
url('./DMMono-Regular.woff') format('woff');
font-weight: 400;
font-style: normal;
font-display: swap;
}
@font-face {
font-family: 'DM Mono';
src:
url('./DMMono-Medium.woff2') format('woff2'),
url('./DMMono-Medium.woff') format('woff');
font-weight: 500;
font-style: normal;
font-display: swap;
}
@font-face {
font-family: 'DM Mono';
src:
url('./DMMono-MediumItalic.woff2') format('woff2'),
url('./DMMono-MediumItalic.woff') format('woff');
font-weight: 500;
font-style: italic;
font-display: swap;
}
@font-face {
font-family: 'DM Mono';
src:
url('./DMMono-Light.woff2') format('woff2'),
url('./DMMono-Light.woff') format('woff');
font-weight: 300;
font-style: normal;
font-display: swap;
}
@font-face {
font-family: 'DM Mono';
src:
url('./DMMono-LightItalic.woff2') format('woff2'),
url('./DMMono-LightItalic.woff') format('woff');
font-weight: 300;
font-style: italic;
font-display: swap;
}
@font-face {
font-family: 'DM Mono';
src:
url('./DMMono-Italic.woff2') format('woff2'),
url('./DMMono-Italic.woff') format('woff');
font-weight: 400;
font-style: italic;
font-display: swap;
}

1
public/index.html
View File

@ -24,6 +24,7 @@
work correctly both with client-side routing and a non-root public URL. work correctly both with client-side routing and a non-root public URL.
Learn how to configure a non-root public URL by running `npm run build`. Learn how to configure a non-root public URL by running `npm run build`.
--> -->
<link rel="stylesheet" href="%PUBLIC_URL%/fonts/fonts.css" />
<title>Farm Control</title> <title>Farm Control</title>
</head> </head>
<body> <body>

82
src/App.css
View File

@ -1,3 +1,35 @@
.ant-typography,
.ant-descriptions-item-label,
.ant-descriptions-item-content,
.ant-menu-title-content,
.ant-tag,
.ant-checkbox-label,
.ant-btn,
.ant-breadcrumb-link,
.ant-dropdown-menu-title-content,
.ant-notification-notice-message,
.ant-notification-notice-description,
.ant-message-custom-content,
.ant-modal-title,
.ant-modal-body,
.ant-table-column-title,
.ant-table-cell,
.ant-alert-message,
.ant-drawer-title,
.ant-tooltip-inner,
.ant-form-item-control-input-content,
.ant-form-item-control-input,
.ant-input,
.ant-input-number .ant-input-number-input,
.ant-segmented-item-label,
.ant-badge-status-text {
font-family: 'DM Sans';
}
.ant-typography code {
font-family: 'DM Mono';
}
:root { :root {
--unit-100vh: 100vh; --unit-100vh: 100vh;
} }
@ -82,3 +114,53 @@ code {
.ant-popover-inner:has(.spotlight-tooltip) { .ant-popover-inner:has(.spotlight-tooltip) {
padding: 0 !important; padding: 0 !important;
} }
/* --- Start of src/index.css --- */
body {
margin: 0;
}
.ant-modal-mask {
backdrop-filter: blur(3px);
}
.ant-spin-blur {
filter: blur(3px);
}
/* --- End of src/index.css --- */
/* --- Start of src/components/Dashboard/Layout.css --- */
.no-padding-collapse .ant-collapse-header {
padding: 0 !important;
}
.no-padding-collapse .ant-collapse-content-box {
padding: 0 !important;
}
.no-h-padding-collapse .ant-collapse-header {
padding-top: 0 !important;
padding-left: 0 !important;
padding-right: 0 !important;
padding-bottom: 4px !important;
}
.no-h-padding-collapse .ant-collapse-content-box {
padding-left: 0 !important;
padding-right: 0 !important;
padding-bottom: 0 !important;
}
.no-padding-collapse .ant-collapse-item,
.no-v-padding-collapse .ant-collapse-item {
border: none !important;
}
/* --- End of src/components/Dashboard/Layout.css --- */
/* --- Start of src/components/Dashboard/common/DashboardSidebar.css --- */
.ant-layout-sider {
width: 250px; /* Adjust the width as per your preference */
min-width: 250px; /* Ensure a minimum width to avoid collapsing */
max-width: 400px; /* Optionally set a maximum width */
}
/* --- End of src/components/Dashboard/common/DashboardSidebar.css --- */

25
src/components/Dashboard/Layout.css
View File

@ -1,25 +0,0 @@
.no-padding-collapse .ant-collapse-header {
padding: 0 !important;
}
.no-padding-collapse .ant-collapse-content-box {
padding: 0 !important;
}
.no-h-padding-collapse .ant-collapse-header {
padding-top: 0 !important;
padding-left: 0 !important;
padding-right: 0 !important;
padding-bottom: 4px !important;
}
.no-h-padding-collapse .ant-collapse-content-box {
padding-left: 0 !important;
padding-right: 0 !important;
padding-bottom: 0 !important;
}
.no-padding-collapse .ant-collapse-item,
.no-v-padding-collapse .ant-collapse-item {
border: none !important;
}

1
src/components/Dashboard/Layout.jsx
View File

@ -8,7 +8,6 @@ import InventorySidebar from './Inventory/InventorySidebar'
import ManagementSidebar from './Management/ManagementSidebar' import ManagementSidebar from './Management/ManagementSidebar'
import DashboardNavigation from './common/DashboardNavigation' import DashboardNavigation from './common/DashboardNavigation'
import DashboardBreadcrumb from './common/DashboardBreadcrumb' import DashboardBreadcrumb from './common/DashboardBreadcrumb'
import './Layout.css'
import DeveloperSidebar from './Developer/DeveloperSidebar' import DeveloperSidebar from './Developer/DeveloperSidebar'
const { Content } = Layout const { Content } = Layout

5
src/components/Dashboard/common/DashboardSidebar.css
View File

@ -1,5 +0,0 @@
.ant-layout-sider {
width: 250px; /* Adjust the width as per your preference */
min-width: 250px; /* Ensure a minimum width to avoid collapsing */
max-width: 400px; /* Optionally set a maximum width */
}

2
src/components/Dashboard/context/AuthContext.js
View File

@ -142,7 +142,7 @@ const AuthProvider = ({ children }) => {
refreshToken() refreshToken()
}} }}
> >
Extend Session Reload Session
</Button> </Button>
) )
}) })

11
src/index.css
View File

@ -1,11 +0,0 @@
body {
margin: 0;
}
.ant-modal-mask {
backdrop-filter: blur(3px);
}
.ant-spin-blur {
filter: blur(3px);
}

1
src/index.js
View File

@ -2,7 +2,6 @@ import reportWebVitals from './reportWebVitals'
import React from 'react' import React from 'react'
import ReactDOM from 'react-dom/client' import ReactDOM from 'react-dom/client'
import FarmControlApp from './App' import FarmControlApp from './App'
import './index.css'
const root = ReactDOM.createRoot(document.getElementById('root')) const root = ReactDOM.createRoot(document.getElementById('root'))
root.render( root.render(