Merge branch 'master' of https://dev.azure.com/DBNTech/ForeignAffairs/_git/ForeignAffairs
commit
25c3fc2db9
|
|
@ -199,10 +199,6 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@font-face {font-family:'GmarketSansMedium';src: url('https://cdn.jsdelivr.net/gh/projectnoonnu/noonfonts_2001@1.1/GmarketSansMedium.woff') format('woff');}
|
|
||||||
|
|
||||||
.dash-title
|
.dash-title
|
||||||
{
|
{
|
||||||
font-family: 'GmarketSansMedium';
|
font-family: 'GmarketSansMedium';
|
||||||
|
|
@ -222,6 +218,15 @@
|
||||||
top: 0px;
|
top: 0px;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@font-face {
|
||||||
|
font-family: 'GmarketSansMedium';
|
||||||
|
src: url("/img/GmarketSansTTFMedium.ttf");
|
||||||
|
font-weight: normal;
|
||||||
|
font-style: normal;
|
||||||
|
}
|
||||||
|
body {
|
||||||
|
font-family: 'GmarketSansMedium';
|
||||||
|
}
|
||||||
|
|
||||||
.titleLeft {
|
.titleLeft {
|
||||||
text-align: left !important;
|
text-align: left !important;
|
||||||
|
|
|
||||||
Binary file not shown.
|
|
@ -11,7 +11,7 @@
|
||||||
<li class="mb-1 border-bottom " th:each="firstMenu:${session.menuList}">
|
<li class="mb-1 border-bottom " th:each="firstMenu:${session.menuList}">
|
||||||
<th:block th:each="cat1Code:${session.commonCode.get('CAT1')}">
|
<th:block th:each="cat1Code:${session.commonCode.get('CAT1')}">
|
||||||
<th:block th:if="${cat1Code.itemCd eq firstMenu.cat1Cd}">
|
<th:block th:if="${cat1Code.itemCd eq firstMenu.cat1Cd}">
|
||||||
<button class="btn align-items-center rounded collapsed leftMenuItem text-light" style="font-size: 16px;"
|
<button class="btn align-items-center rounded collapsed leftMenuItem text-light" style="font-size: 17px;"
|
||||||
data-bs-toggle="collapse" aria-expanded="false" th:data-category="${cat1Code.itemCd}"
|
data-bs-toggle="collapse" aria-expanded="false" th:data-category="${cat1Code.itemCd}"
|
||||||
th:data-bs-target="'#collapse'+${cat1Code.itemCd}" th:text="${cat1Code.itemValue}">
|
th:data-bs-target="'#collapse'+${cat1Code.itemCd}" th:text="${cat1Code.itemValue}">
|
||||||
</button>
|
</button>
|
||||||
|
|
@ -23,7 +23,7 @@
|
||||||
<ul class="list-unstyled ps-0">
|
<ul class="list-unstyled ps-0">
|
||||||
<li class="mb-1">
|
<li class="mb-1">
|
||||||
<th:block th:unless="${#lists.isEmpty(secondMenu.childList)}">
|
<th:block th:unless="${#lists.isEmpty(secondMenu.childList)}">
|
||||||
<button class="btn btn-toggle3 align-items-center rounded collapsed leftMenuItem text-light" style="font-size: 15px;"
|
<button class="btn btn-toggle3 align-items-center rounded collapsed leftMenuItem colo" style="font-size: 16px; color: white"
|
||||||
data-bs-toggle="collapse" aria-expanded="false" th:data-parent="${cat1Code.itemCd}" th:data-category="${cat2Code.itemCd}"
|
data-bs-toggle="collapse" aria-expanded="false" th:data-parent="${cat1Code.itemCd}" th:data-category="${cat2Code.itemCd}"
|
||||||
th:data-bs-target="'#collapse'+${cat2Code.itemCd}" th:text="${cat2Code.itemValue}">
|
th:data-bs-target="'#collapse'+${cat2Code.itemCd}" th:text="${cat2Code.itemValue}">
|
||||||
</button>
|
</button>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue