awatertrevi/infisical
1
0
Fork 0
mirror of https://github.com/awatertrevi/infisical.git synced 2026-10-07 19:28:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feat/suborg-scope-support' of https://github.com/Infisical/infisical into feat/suborg-scope-support

Browse Source
This commit is contained in:
Piyush Gupta
2025-12-01 18:32:50 +05:30
parent 2bfb1f37f4 d990771f22
commit 3a7278c48e
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/src/layouts/OrganizationLayout/components/NavBar/Navbar.tsx
+1 -1
View File
@@ -532,7 +532,7 @@ export const Navbar = () => {
{/* scott: the below is used to hide the top border from the org nav bar */} {/* scott: the below is used to hide the top border from the org nav bar */}
{!isProjectScope && isSubOrganization && ( {!isProjectScope && isSubOrganization && (
<div className="absolute -bottom-px left-0 h-px w-full bg-mineshaft-900"> <div className="absolute -bottom-px left-0 h-px w-full bg-mineshaft-900">
<div className="h-full bg-org/[0.075]" /> <div className="h-full bg-sub-org/[0.075]" />
</div> </div>
)} )}
<DropdownMenu modal={false}> <DropdownMenu modal={false}>
frontend/src/layouts/OrganizationLayout/components/OrgNavBar/OrgNavBar.tsx
+9 -1
View File
@@ -1,5 +1,6 @@
import { Link, useLocation } from "@tanstack/react-router"; import { Link, useLocation } from "@tanstack/react-router";
import { motion } from "framer-motion"; import { motion } from "framer-motion";
import { twMerge } from "tailwind-merge";
import { CreateOrgModal } from "@app/components/organization/CreateOrgModal"; import { CreateOrgModal } from "@app/components/organization/CreateOrgModal";
import { Tab, TabList, Tabs } from "@app/components/v2"; import { Tab, TabList, Tabs } from "@app/components/v2";
@@ -21,7 +22,14 @@ export const OrgNavBar = ({ isHidden }: Props) => {
return ( return (
<div className="bg-mineshaft-900"> <div className="bg-mineshaft-900">
{!isHidden && ( {!isHidden && (
<div className="dark flex w-full flex-col overflow-x-hidden border-y border-t-org/15 border-b-org/5 bg-gradient-to-b from-org/[0.075] to-org/[0.025] px-4 pt-0.5"> <div
className={twMerge(
"dark flex w-full flex-col overflow-x-hidden border-y bg-gradient-to-b px-4 pt-0.5",
isRootOrganization
? "border-t-org/15 border-b-org/5 from-org/[0.075] to-org/[0.025]"
: "border-t-sub-org/15 border-b-sub-org/5 from-sub-org/[0.075] to-sub-org/[0.025]"
)}
>
<motion.div <motion.div
key="menu-org-items" key="menu-org-items"
initial={{ x: -150 }} initial={{ x: -150 }}