Compare commits

..

No commits in common. "1a59ad96189c7cb33dd9c5ecda542b00cc1cd36e" and "bbf21a3bb10f95c6ab0e1bd171cdfad9ef247d11" have entirely different histories.

6 changed files with 9 additions and 117 deletions

View File

@ -236,59 +236,3 @@ body {
.farmcontrol-splitter > .ant-splitter-bar { .farmcontrol-splitter > .ant-splitter-bar {
margin: 8px margin: 8px
} }
.dark-mode {
--sb-track-color: #1d1d1d;
--sb-thumb-color: #848484;
--sb-size: 8px;
}
.light-mode {
--sb-thumb-color: #87878718;
--sb-size: 8px;
}
::-webkit-scrollbar {
width: 10px;
border-radius: 34px;
}
/* Track */
::-webkit-scrollbar-track {
background: transparent;
}
/* Handle */
::-webkit-scrollbar-thumb {
background: #8888881a;
border: 4px solid rgba(0, 0, 0, 0);
background-clip: padding-box;
transition: all 1s;
-moz-transition: all 1s;
-webkit-transition: all 1s;
}
::-webkit-scrollbar-thumb:vertical {
border-left: none;
}
::-webkit-scrollbar-thumb:horizontal {
border-top: none;
}
/* Handle on hover */
::-webkit-scrollbar-thumb:hover {
background: #5555551f;
border: 4px solid rgba(0, 0, 0, 0);
background-clip: padding-box;
}
::-webkit-scrollbar-thumb:vertical:hover {
border-left: none;
}
::-webkit-scrollbar-thumb:horizontal:hover {
border-top: none;
}

View File

@ -1,28 +0,0 @@
body {
--sb-track-color: #1d1d1d;
--sb-thumb-color: #848484;
--sb-size: 8px;
}
body::-webkit-scrollbar {
width: var(--sb-size)
}
body::-webkit-scrollbar-track {
background: var(--sb-track-color);
border-radius: 4px;
}
body::-webkit-scrollbar-thumb {
background: var(--sb-thumb-color);
border-radius: 4px;
}
@supports not selector(::-webkit-scrollbar) {
body {
scrollbar-color: var(--sb-thumb-color)
var(--sb-track-color);
}
}

View File

@ -147,12 +147,6 @@
}, },
"linux": { "linux": {
"target": "AppImage" "target": "AppImage"
},
"nsis": {
"oneClick": false,
"allowToChangeInstallationDirectory": true,
"include": "scripts/installer.nsh",
"perMachine": true
} }
} }
} }

View File

@ -1,10 +0,0 @@
!macro customInstall
DetailPrint "Register farmcontrol URI Handler"
DeleteRegKey HKCR "farmcontrol"
WriteRegStr HKCR "farmcontrol" "" "URL:farmcontrol"
WriteRegStr HKCR "farmcontrol" "URL Protocol" ""
WriteRegStr HKCR "farmcontrol\DefaultIcon" "" "$INSTDIR\${APP_EXECUTABLE_FILENAME}"
WriteRegStr HKCR "farmcontrol\shell" "" ""
WriteRegStr HKCR "farmcontrol\shell\Open" "" ""
WriteRegStr HKCR "farmcontrol\shell\Open\command" "" "$INSTDIR\${APP_EXECUTABLE_FILENAME} %1"
!macroend

View File

@ -8,7 +8,6 @@ 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 DeveloperSidebar from './Developer/DeveloperSidebar' import DeveloperSidebar from './Developer/DeveloperSidebar'
import { useThemeContext } from './context/ThemeContext'
const { Content } = Layout const { Content } = Layout
@ -19,13 +18,8 @@ const DashboardLayout = ({ children }) => {
const isManagement = location.pathname.startsWith('/dashboard/management') const isManagement = location.pathname.startsWith('/dashboard/management')
const isDeveloper = location.pathname.startsWith('/dashboard/developer') const isDeveloper = location.pathname.startsWith('/dashboard/developer')
const { isDarkMode } = useThemeContext()
return ( return (
<Layout <Layout style={{ height: 'var(--unit-100vh)' }}>
style={{ height: 'var(--unit-100vh)' }}
className={isDarkMode ? 'dark-mode' : 'light-mode'}
>
<DashboardNavigation /> <DashboardNavigation />
<Layout> <Layout>
{isProduction ? ( {isProduction ? (

View File

@ -93,16 +93,14 @@ const DashboardSidebar = ({
vertical vertical
className='ant-menu-root ant-menu-inline ant-menu-light' className='ant-menu-root ant-menu-inline ant-menu-light'
> >
<div style={{ maxHeight: '100%', overflowY: 'auto' }}> <Menu
<Menu mode='inline'
mode='inline' selectedKeys={[selectedKey]}
selectedKeys={[selectedKey]} items={_items}
items={_items} className={isElectron ? 'electron-sidebar' : null}
className={isElectron ? 'electron-sidebar' : null} style={{ flexGrow: 1, border: 'none' }}
style={{ flexGrow: 1, border: 'none' }} _internalDisableMenuItemTitleTooltip
_internalDisableMenuItemTitleTooltip />
/>
</div>
<Flex style={{ padding: '4px', width: '100%' }}> <Flex style={{ padding: '4px', width: '100%' }}>
<Button <Button
size='large' size='large'