diff --git a/index.html b/index.html index 24a9ef36..525634c5 100644 --- a/index.html +++ b/index.html @@ -1,7 +1,7 @@ - - + diff --git a/public/assets/css/core-extend.css b/public/assets/css/core-extend.css index b05f71c1..127de638 100644 --- a/public/assets/css/core-extend.css +++ b/public/assets/css/core-extend.css @@ -11,6 +11,18 @@ top: var(--sticky-top, 0px) !important; z-index: 1025; } +.form-control-md { + min-height: calc(1.6em + 0.65rem + calc(var(--bs-border-width) * 2)); + padding: 0.18rem 0.60rem; + font-size: 0.875rem; /* ~14px */ + border-radius: var(--bs-border-radius); +} + +.form-control-md::file-selector-button { + padding: 0.32rem 0.75rem; + margin: -0.32rem -0.75rem; + margin-inline-end: 0.75rem; +} /* ===========================% Background_Colors %========================================================== */ diff --git a/public/assets/css/default.css b/public/assets/css/default.css index 8503dc87..6e2cafb7 100644 --- a/public/assets/css/default.css +++ b/public/assets/css/default.css @@ -31,7 +31,7 @@ } .app-brand-text { - font-size: 1.75rem; + font-size: 1rem; letter-spacing: -0.5px; /* text-transform: lowercase; */ } diff --git a/public/assets/js/main.js b/public/assets/js/main.js index cc356fa7..272f0369 100644 --- a/public/assets/js/main.js +++ b/public/assets/js/main.js @@ -148,5 +148,41 @@ function Main () { wheelPropagation: false }); } + }; +document.addEventListener("DOMContentLoaded", function () { + const html = document.documentElement; + + /****************************** + * SIDEBAR HOVER BEHAVIOR + ******************************/ + document.addEventListener("mouseover", function (e) { + const isInsideSidebar = e.target.closest("#layout-menu"); + + if (isInsideSidebar && html.classList.contains("layout-menu-collapsed")) { + html.classList.add("layout-menu-hover"); + } + }); + + document.addEventListener("mouseout", function (e) { + const leftSidebar = !e.relatedTarget || !e.relatedTarget.closest("#layout-menu"); + + if (leftSidebar) { + html.classList.remove("layout-menu-hover"); + } + }); + + /****************************** + * TOGGLE MENU BUTTON OVERRIDE + ******************************/ + document.body.addEventListener("click", function (e) { + const btn = e.target.closest(".layout-menu-toggle"); + if (!btn) return; + + e.preventDefault(); + + html.classList.toggle("layout-menu-collapsed"); + html.classList.remove("layout-menu-hover"); + }); +}); diff --git a/src/components/Layout/Sidebar.jsx b/src/components/Layout/Sidebar.jsx index 4fa7cd9f..c169859a 100644 --- a/src/components/Layout/Sidebar.jsx +++ b/src/components/Layout/Sidebar.jsx @@ -25,20 +25,28 @@ const Sidebar = () => { /> */} - - - + + OnFieldWork logo - OnField - Work - .com - + + + OnField + Work + .com + + - - + diff --git a/src/components/ServiceProject/Jobs.jsx b/src/components/ServiceProject/Jobs.jsx index f0e1cb1e..edec54d1 100644 --- a/src/components/ServiceProject/Jobs.jsx +++ b/src/components/ServiceProject/Jobs.jsx @@ -62,15 +62,27 @@ const Jobs = () => {
- {/* LEFT — Tabs */} + {/* LEFT — Archive / Unarchive Toggle */}
- +
+ + + +
{/* RIGHT — New Job button */} @@ -79,9 +91,10 @@ const Jobs = () => { className="btn btn-sm btn-primary" onClick={() => setManageJob({ isOpen: true, jobId: null })} > - New Job + New Job
+
{/* Job List */} diff --git a/src/components/ServiceProject/ServiceProjectJob/ManageJob.jsx b/src/components/ServiceProject/ServiceProjectJob/ManageJob.jsx index 94ced5c3..d0c1eec8 100644 --- a/src/components/ServiceProject/ServiceProjectJob/ManageJob.jsx +++ b/src/components/ServiceProject/ServiceProjectJob/ManageJob.jsx @@ -173,6 +173,20 @@ const ManageJob = ({ Job }) => {
+
+ setValue("projectBranchId", val)} + valueKey="id" + labelKey="branchName" + hookParams={[projectId, true, 10, 1]} + useFetchHook={useBranches} + isMultiple={false} + disabled={Job} + /> +
{ placeholder="Enter Tag" />
-
- setValue("projectBranchId", val)} - valueKey="id" - labelKey="branchName" - hookParams={[projectId, true, 10, 1]} - useFetchHook={useBranches} - isMultiple={false} - disabled={Job} - /> -
+