From 48f70037c9d921979a1abb4b8f3dfb58fc96855c Mon Sep 17 00:00:00 2001 From: minuk926 Date: Thu, 28 Apr 2022 13:22:45 +0900 Subject: [PATCH] =?UTF-8?q?fix:=20=EB=94=94=EC=9E=90=EC=9D=B8=20=EB=B0=98?= =?UTF-8?q?=EC=98=81=20merge?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/scss/style.scss | 113 +++++++++++++++++++++ src/ui-component/extended/Breadcrumbs.js | 10 +- src/views/biz/board/PublicBoard.jsx | 6 +- src/views/cmm/CmmModal.jsx | 2 +- src/views/cmm/mui-grid/CustomPagination.js | 22 +++- src/views/cmm/mui-grid/MuiDataGrid.jsx | 19 +++- 6 files changed, 161 insertions(+), 11 deletions(-) diff --git a/src/assets/scss/style.scss b/src/assets/scss/style.scss index 77dfac1..155cdee 100755 --- a/src/assets/scss/style.scss +++ b/src/assets/scss/style.scss @@ -6,6 +6,11 @@ @import '~slick-carousel/slick/slick.css'; @import '~slick-carousel/slick/slick-theme.css'; +//webFont +@import url('https://fonts.googleapis.com/css2?family=Noto+Sans+KR:wght@300;400;500&display=swap'); + + + // ==============================|| LIGHT BOX ||============================== // .slick-arrow:before { color: $grey500; @@ -133,3 +138,111 @@ transform: translateX(10px); } } + + + + + +/*2022.04.25 박소영 추가*/ +*{ + font-family: 'Noto Sans KR' !important; +} +// 전체적인 버튼 높이 통일 +.css-1kmsfjc-MuiButtonBase-root-MuiButton-root{ + height:37px; +} +.css-a5rdam-MuiGrid-root{ + align-items:center; +} +.css-13i4rnv-MuiGrid-root>.css-9m7a0r-MuiTypography-root{ + border:1px solid red; + margin:0px; + padding:0px; + color:#bdc8f0 !important; +} + +//MuiPaper-root 해당 배경 디자인 변경 +.css-7uac63-MuiPaper-root-MuiCard-root{ + border: 1px solid pink; + background-color: #1a223f; + border: none; + margin-top: -22px; + +} +/* +.css-7uac63-MuiPaper-root-MuiCard-root { + background-color: #212946; + color: #bdc8f0; + transition: box-shadow 300ms cubic-bezier(0.4, 0, 0.2, 1) 0ms; + border-radius: 4px; + box-shadow: none; + background-image: linear-gradient(rgba(255, 255, 255, 0), rgba(255, 255, 255, 0)); + background-image: none; + border-radius: 4px; + overflow: hidden; + border: 1px solid; + border-color: #111936; +}*/ + +// modal 클릭 시 그 외에 화면 어둡게 설정 +.css-79ws1d-MuiModal-root { + position: fixed; + z-index: 9999; + right: 0; + bottom: 0; + top: 0; + left: 0; + width: 100%; + height: 100%; + background: rgba(0,0,0,0.7); + position: absolute; +} +// 모달창 파일업로드칸 높이 수정 +.css-fdedq5-MuiInputBase-root-MuiOutlinedInput-root{ + /* height: 43px;*/ + height: 41px; +} +// 모달창 파일업로드 버튼 세부 수정 +.css-140pblg-MuiGrid-root>.MuiGrid-item:nth-child(2){ + display: flex; + margin-left: -25px; + padding-top: 5px; +} +// 모달창 해당파일 이름 칸 세부 수정 +.css-6dzwqk-MuiGrid-root { + border: 0px solid yellow; + padding-left: 0px !important; +} + + + +//심의목록 텍스트 칸 배경설정 +//클릭했을 때 파란 선이 텍스트 위로 설정되어 눈에 거슬림 +.css-1kuwsse-MuiFormLabel-root-MuiInputLabel-root{ + background: #1a223f; +} +// 심의목록 모달창 셀렉터 박스 수정_01 +.MuiOutlinedInput-root>.MuiSelect-select{ + padding:10px 10px 10px 14px; +} +//심의목록 모달창 셀렉터 박스 수정_02 +.css-1ikyx9c-MuiFormLabel-root-MuiInputLabel-root.Mui-focused{ + background-color:#212946; +} +//심의목록 모달창 조회버튼 수정 +.MuiGrid-root>.css-1uxpv00-MuiGrid-root{ + margin: 0px; +} +// 심의 등록 체크할 때 3행과 22건 겹치길래 수정 +.MuiGrid-root > .css-9m7a0r-MuiTypography-root{ + border: 1px solid #535353; + border-width: 0px 1px 0px 0px; + margin: -2px 80px 0px 0px; + padding-right: 20px; + color: #35a6ff !important; +} +// 심의 등록 저장,엑셀다운로드 우측으로 정렬 +.MuiGrid-root:nth-child(4){ + border:0px solid red; + margin-left: auto; +} diff --git a/src/ui-component/extended/Breadcrumbs.js b/src/ui-component/extended/Breadcrumbs.js index de37df2..05555ac 100755 --- a/src/ui-component/extended/Breadcrumbs.js +++ b/src/ui-component/extended/Breadcrumbs.js @@ -122,7 +122,13 @@ const Breadcrumbs = ({ card, divider, icon, icons, maxItems, navigation, rightAl }} {...others} > - + {title && !titleBottom && ( - + {item.title} diff --git a/src/views/biz/board/PublicBoard.jsx b/src/views/biz/board/PublicBoard.jsx index afb00d6..4f65263 100644 --- a/src/views/biz/board/PublicBoard.jsx +++ b/src/views/biz/board/PublicBoard.jsx @@ -1,7 +1,7 @@ import { useCallback, useEffect, useState } from 'react'; // material-ui -import { Button, Divider, Grid, Link } from '@mui/material'; +import { Button, Grid, Link } from '@mui/material'; // assets import { IconFileText } from '@tabler/icons'; @@ -132,9 +132,9 @@ const PublicBoard = () => { - + {/* - + */} +
{/* */} { @@ -11,7 +10,22 @@ const CustomPagination = ({ totalCount, numSelected }) => { const pageCount = useGridSelector(apiRef, gridPageCountSelector); return ( - + {pageCount > 1 && ( ({ padding: theme.spacing(1.5, 0) })} @@ -35,7 +49,7 @@ const CustomPagination = ({ totalCount, numSelected }) => { {numSelected}행 선택 )} - {pageCount > 1 && ( + {/* {pageCount > 1 && ( { color: '#4caf50' }} /> - )} + )} */} {/* 전체 {totalCount} 건 현재페이지 {pageCount > 1 ? `${page * pageSize + 1} / ${totalCount} 건` : `${totalCount}`} */} {totalCount > 0 ? `전체 ${totalCount} 건 ` : ``} diff --git a/src/views/cmm/mui-grid/MuiDataGrid.jsx b/src/views/cmm/mui-grid/MuiDataGrid.jsx index 6d0330a..f595922 100644 --- a/src/views/cmm/mui-grid/MuiDataGrid.jsx +++ b/src/views/cmm/mui-grid/MuiDataGrid.jsx @@ -141,17 +141,34 @@ const MuiDataGrid = ({ sx={{ height: 670, width: '100%', + marginTop: '10px', '& .MuiDataGrid-root': { border: 'none', '& .MuiDataGrid-cell': { - borderColor: theme.palette.mode === 'dark' ? theme.palette.text.primary + 15 : 'grey.200' + borderRight: '1px solid', + borderColor: theme.palette.mode === 'dark' ? theme.palette.text.primary + 15 : 'grey.200', + fontWeight: '100' }, '& .MuiDataGrid-columnsContainer': { color: theme.palette.mode === 'dark' ? 'grey.600' : 'grey.900', borderColor: theme.palette.mode === 'dark' ? theme.palette.text.primary + 15 : 'grey.200' }, '& .MuiDataGrid-columnSeparator': { + display: 'none', color: theme.palette.mode === 'dark' ? theme.palette.text.primary + 15 : 'grey.200' + }, + '& .MuiDataGrid-columnHeaders': { + border: '1px solid', + borderWidth: '1px 0px 1px 0px', + borderRadius: '0px', + borderColor: theme.palette.mode === 'dark' ? theme.palette.text.primary + 15 : 'grey.200' + }, + '& .MuiDataGrid-columnHeader': { + borderRight: '1px solid', + borderColor: theme.palette.mode === 'dark' ? theme.palette.text.primary + 15 : 'grey.200' + }, + '& .MuiDataGrid-columnHeaderTitle': { + fontWeight: '400' } }, '& .MuiPagination-root': {