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

feat(ui): updated merge conflicts in layout with new design

Browse Source
This commit is contained in:
akhilmhdh
2023-02-10 22:09:22 +05:30
parent 03c72ea00f
commit b5bcd0a308
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/src/layouts/AppLayout/AppLayout.tsx
+5 -3
View File
@@ -210,7 +210,7 @@ export const AppLayout = ({ children }: LayoutProps) => {
return ( return (
<> <>
<div className="flex h-screen w-full flex-col overflow-x-hidden"> <div className="hidden h-screen w-full flex-col overflow-x-hidden md:flex">
<Navbar /> <Navbar />
<div className="flex flex-grow flex-col overflow-y-hidden md:flex-row"> <div className="flex flex-grow flex-col overflow-y-hidden md:flex-row">
<aside className="w-full border-r border-mineshaft-500 bg-mineshaft-800 md:w-60"> <aside className="w-full border-r border-mineshaft-500 bg-mineshaft-800 md:w-60">
@@ -417,10 +417,12 @@ export const AppLayout = ({ children }: LayoutProps) => {
</form> </form>
</ModalContent> </ModalContent>
</Modal> </Modal>
<main className="flex-1 overflow-y-auto overflow-x-hidden bg-bunker-800">{children}</main> <main className="flex-1 overflow-y-auto overflow-x-hidden bg-bunker-800 dark:[color-scheme:dark]">
{children}
</main>
</div> </div>
</div> </div>
<div className="flex h-screen w-screen flex-col items-center justify-center bg-bunker-800 md:hidden"> <div className="z-[200] flex h-screen w-screen flex-col items-center justify-center bg-bunker-800 md:hidden">
<FontAwesomeIcon icon={faMobile} className="mb-8 text-7xl text-gray-300" /> <FontAwesomeIcon icon={faMobile} className="mb-8 text-7xl text-gray-300" />
<p className="max-w-sm px-6 text-center text-lg text-gray-200"> <p className="max-w-sm px-6 text-center text-lg text-gray-200">
{` ${t('common:no-mobile')} `} {` ${t('common:no-mobile')} `}