diff --git a/src/main/java/com/dbnt/faisp/config/BaseController.java b/src/main/java/com/dbnt/faisp/config/BaseController.java index 38b73582..3e53091d 100644 --- a/src/main/java/com/dbnt/faisp/config/BaseController.java +++ b/src/main/java/com/dbnt/faisp/config/BaseController.java @@ -70,20 +70,20 @@ public class BaseController { ModelAndView mav = new ModelAndView("login/dashboard"); PublicBoard noticeParams = new PublicBoard(); noticeParams.setPublicType("PLB001"); - noticeParams.setRowCnt(8); + noticeParams.setRowCnt(7); noticeParams.setDownOrganCdList(loginUser.getDownOrganCdList()); noticeParams.setUpOrganCdList(loginUser.getUpOrganCdList()); mav.addObject("noticeList", publicBoardService.selectContentList(noticeParams)); FaRptBoard faRpt = new FaRptBoard(); faRpt.setActiveTab("receive"); - faRpt.setRowCnt(8); + faRpt.setRowCnt(7); faRpt.setStatus("DST007"); faRpt.setReceiveUserSeq(loginUser.getUserSeq()); mav.addObject("faRptList", faRptService.selectFaRptList(faRpt)); AffairBoard affair = new AffairBoard(); affair.setAffairCategory("CAT215"); affair.setRatingOrgan(loginUser.getOgCd()); - affair.setRowCnt(8); + affair.setRowCnt(7); mav.addObject("affair1List", affairService.selectAffairBoardList(affair)); affair.setAffairCategory("CAT216"); mav.addObject("affair2List", affairService.selectAffairBoardList(affair)); diff --git a/src/main/resources/static/css/common.css b/src/main/resources/static/css/common.css index 280075c0..d17d2cf7 100644 --- a/src/main/resources/static/css/common.css +++ b/src/main/resources/static/css/common.css @@ -133,9 +133,8 @@ } .bg-header{ - /*background-color: #6c87af78;*/ - /*background-color: #6885bfb0;*/ - background-color: #1650a778; + /*background-color: #1650a778;*/ + background-color: #f8f8f8; } .bg-lightB-card{ background-color: #deebff78; @@ -149,6 +148,10 @@ } .bg-leftMenu{ background-color: #253660; + z-index: 100; +} +#footer{ + z-index: 1; } .bg-label{ background-color: lightblue; @@ -156,11 +159,28 @@ .table-color{ background-color: #6c87af78; } +#footer ul { + width: 1200px; + margin-left: 550px; + display: block; +} +#footerRow{float:left;padding:0px 20px;color:#7a7a7a;line-height:1.6;font-size:12px;text-align:left; list-style: none;} +#footerSiteName{font-size:18px;color:#2f71d4;;display:block;font-weight:700;margin:0px;padding:0px;} +#footerSiteNameEng{font-size:10px;color:#989898;display:block;font-weight:300;margin:0px 0px 8px 0px;padding:0px;} .bi-square-fill{ - color:#0d49a7; - /*color: #24396c;*/ + /*color:#0d49a7;*/ + font-size: 12px; + color: #24396c; + text-align: center; } .col-form-label-sm.text-center{ background-color: #aabfe178; } +@font-face {font-family:'GmarketSansMedium';src: url('https://cdn.jsdelivr.net/gh/projectnoonnu/noonfonts_2001@1.1/GmarketSansMedium.woff') format('woff');} + +.dash-title +{ + font-family: 'GmarketSansMedium'; + font-size: 18px; +} \ No newline at end of file diff --git a/src/main/resources/static/img/ft_logo.png b/src/main/resources/static/img/ft_logo.png new file mode 100644 index 00000000..89c3b3c0 Binary files /dev/null and b/src/main/resources/static/img/ft_logo.png differ diff --git a/src/main/resources/templates/fragments/footer.html b/src/main/resources/templates/fragments/footer.html index ce82c7f8..53a87390 100644 --- a/src/main/resources/templates/fragments/footer.html +++ b/src/main/resources/templates/fragments/footer.html @@ -1,9 +1,9 @@ -