From 04a5e048aaceb0e559a372d9d1277484f374da25 Mon Sep 17 00:00:00 2001 From: talksik Date: Sat, 28 May 2022 01:08:59 -0500 Subject: [PATCH] fab and containers and stuff --- packages/desktop/src/components/Terminal.tsx | 32 ++++++++++++++++---- packages/desktop/src/mui/NirvanaTheme.ts | 16 +++++++++- 2 files changed, 41 insertions(+), 7 deletions(-) diff --git a/packages/desktop/src/components/Terminal.tsx b/packages/desktop/src/components/Terminal.tsx index 336093e..ffac62d 100644 --- a/packages/desktop/src/components/Terminal.tsx +++ b/packages/desktop/src/components/Terminal.tsx @@ -6,6 +6,7 @@ import { Badge, Box, Divider, + Fab, Grid, IconButton, Input, @@ -20,7 +21,7 @@ import { } from '@mui/material'; import NirvanaLogo from './NirvanaLogo'; import { blueGrey } from '@mui/material/colors'; -import { FiActivity, FiInbox, FiMoreVertical, FiSearch } from 'react-icons/fi'; +import { FiActivity, FiInbox, FiMoreVertical, FiSearch, FiSun } from 'react-icons/fi'; import KeyboardShortcutLabel from './KeyboardShortcutLabel'; import { useSnackbar } from 'notistack'; import { useKey } from 'react-use'; @@ -184,7 +185,7 @@ export default function Terminal() { - + - + {'Viet Phan'} @@ -208,6 +206,28 @@ export default function Terminal() { + + + + + yesterday + + + + + + + + + ); diff --git a/packages/desktop/src/mui/NirvanaTheme.ts b/packages/desktop/src/mui/NirvanaTheme.ts index a978156..54b197c 100644 --- a/packages/desktop/src/mui/NirvanaTheme.ts +++ b/packages/desktop/src/mui/NirvanaTheme.ts @@ -1,4 +1,4 @@ -import { createTheme } from '@mui/material'; +import { createTheme, experimental_sx as sx } from '@mui/material'; import { blueGrey } from '@mui/material/colors'; export const NirvanaTheme = createTheme({ @@ -19,6 +19,7 @@ export const NirvanaTheme = createTheme({ main: '#FFB6B6', }, }, + components: { // Name of the component MuiButtonBase: { @@ -28,6 +29,11 @@ export const NirvanaTheme = createTheme({ }, }, MuiAvatar: { + styleOverrides: { + root: sx({ + boxShadow: 1, + }), + }, defaultProps: { variant: 'rounded', }, @@ -78,5 +84,13 @@ export const NirvanaTheme = createTheme({ }, }, }, + + MuiFab: { + styleOverrides: { + root: { + borderRadius: 5, + }, + }, + }, }, });