Skip to content

D
design
Commit 4b07d503 by Jung Kwangkyu
Options

Merge branch 'feature/1.4.0_kim-ec' into 'feature/1.4.0' 

Feature/1.4.0 kim ec

See merge request !17
parents cfd24def e4fea703
Showing with 36 additions and 10 deletions
app/css/app.css
......@@ -6460,6 +6460,16 @@ template {
font-size: 1rem
}
.icon{
width: 22px;
height: 22px;
}
.icon-lg{
width: 24px;
height: 24px;
}
.lead {
font-size: 1.25rem;
font-weight: 300
......
app/img/icon_calendar.svg 0 → 100644
<svg width="35" height="39" viewBox="0 0 35 39" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M31.5 3.54545H29.75V0H26.25V3.54545H8.75V0H5.25V3.54545H3.5C1.575 3.54545 0 5.14091 0 7.09091V35.4545C0 37.4045 1.575 39 3.5 39H31.5C33.425 39 35 37.4045 35 35.4545V7.09091C35 5.14091 33.425 3.54545 31.5 3.54545ZM31.5 35.4545H3.5V12.4091H31.5V35.4545Z" fill="#343A40"/>
</svg>
app/img/icon_clear.svg 0 → 100644
<svg width="36" height="38" viewBox="0 0 36 38" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M3.04116 0.729539C3.41889 0.326626 4.03131 0.326626 4.40904 0.729539L33.8526 32.1362C34.2303 32.5391 34.2303 33.1924 33.8526 33.5953L31.4953 36.1098C31.1175 36.5127 30.5051 36.5127 30.1274 36.1098L0.683795 4.70315C0.306066 4.30024 0.306066 3.64699 0.683795 3.24407L3.04116 0.729539Z" fill="#343A40"/>
<path d="M1.30747 33.7881C0.929745 33.3852 0.929745 32.732 1.30747 32.3291L30.7511 0.922383C31.1288 0.51947 31.7412 0.51947 32.1189 0.922383L34.4763 3.43692C34.854 3.83983 34.854 4.49308 34.4763 4.896L5.03272 36.3027C4.65499 36.7056 4.04257 36.7056 3.66484 36.3027L1.30747 33.7881Z" fill="#343A40"/>
</svg>
app/img/icon_pdf.svg 0 → 100644
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 92.22 122"><defs><style>.cls-1{fill:#fff;}</style></defs><g id="レイヤー_2" data-name="レイヤー 2"><g id="レイヤー_1-2" data-name="レイヤー 1"><path class="cls-1" d="M65.82,30.22h25L62.07,1.47v25C62.07,29.17,63.12,30.22,65.82,30.22Z"/><path class="cls-1" d="M22.08,58.24a17,17,0,0,0-4.7-.4H14.59v9.83h3.17a13.74,13.74,0,0,0,4.33-.45A3.86,3.86,0,0,0,24,65.6a6,6,0,0,0,0-5.78A3.81,3.81,0,0,0,22.08,58.24Z"/><path class="cls-1" d="M50.93,59.82a5.23,5.23,0,0,0-2.72-1.67,22.2,22.2,0,0,0-4.65-.31H41V80.7h4.29a11.28,11.28,0,0,0,4-.51,4.79,4.79,0,0,0,2-1.57,9,9,0,0,0,1.31-3.31,27.32,27.32,0,0,0,.52-6,27.38,27.38,0,0,0-.53-6A8,8,0,0,0,50.93,59.82Z"/><path class="cls-1" d="M62.47,35.78a6,6,0,0,1-6-6V0H4.86A4.87,4.87,0,0,0,0,4.86V117.13A4.87,4.87,0,0,0,4.86,122H87.35a4.88,4.88,0,0,0,4.87-4.87V35.78ZM29.18,68.93a8.19,8.19,0,0,1-3.53,3.56c-1.42.68-3.85,1-7.31,1H14.59v13H8.89V52h9.19a28,28,0,0,1,6.72.5A7.57,7.57,0,0,1,29,55.91a12.53,12.53,0,0,1,1.64,6.74A12.65,12.65,0,0,1,29.18,68.93ZM58,77.42a15.71,15.71,0,0,1-2.57,5.24,9.91,9.91,0,0,1-3.75,2.91,14.11,14.11,0,0,1-5.67,1H35.26V52H45.7a15.54,15.54,0,0,1,6,.89,10,10,0,0,1,3.7,3A15.28,15.28,0,0,1,58,61.3a30.73,30.73,0,0,1,1,8.32A27,27,0,0,1,58,77.42ZM83.33,57.84H69.61V66H81.49v5.84H69.61V86.55H63.9V52H83.33Z"/></g></g></svg>
\ No newline at end of file
app/img/icon_pdf_blue.svg 0 → 100644
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 92.22 122"><defs><style>.cls-1{fill:#0053f0;}</style></defs><g id="レイヤー_2" data-name="レイヤー 2"><g id="レイヤー_1-2" data-name="レイヤー 1"><path class="cls-1" d="M65.82,30.22h25L62.07,1.47v25C62.07,29.17,63.12,30.22,65.82,30.22Z"/><path class="cls-1" d="M22.08,58.24a17,17,0,0,0-4.7-.4H14.59v9.83h3.17a13.74,13.74,0,0,0,4.33-.45A3.86,3.86,0,0,0,24,65.6a6,6,0,0,0,0-5.78A3.81,3.81,0,0,0,22.08,58.24Z"/><path class="cls-1" d="M50.93,59.82a5.23,5.23,0,0,0-2.72-1.67,22.2,22.2,0,0,0-4.65-.31H41V80.7h4.29a11.28,11.28,0,0,0,4-.51,4.79,4.79,0,0,0,2-1.57,9,9,0,0,0,1.31-3.31,27.32,27.32,0,0,0,.52-6,27.38,27.38,0,0,0-.53-6A8,8,0,0,0,50.93,59.82Z"/><path class="cls-1" d="M62.47,35.78a6,6,0,0,1-6-6V0H4.86A4.87,4.87,0,0,0,0,4.86V117.13A4.87,4.87,0,0,0,4.86,122H87.35a4.88,4.88,0,0,0,4.87-4.87V35.78ZM29.18,68.93a8.19,8.19,0,0,1-3.53,3.56c-1.42.68-3.85,1-7.31,1H14.59v13H8.89V52h9.19a28,28,0,0,1,6.72.5A7.57,7.57,0,0,1,29,55.91a12.53,12.53,0,0,1,1.64,6.74A12.65,12.65,0,0,1,29.18,68.93ZM58,77.42a15.71,15.71,0,0,1-2.57,5.24,9.91,9.91,0,0,1-3.75,2.91,14.11,14.11,0,0,1-5.67,1H35.26V52H45.7a15.54,15.54,0,0,1,6,.89,10,10,0,0,1,3.7,3A15.28,15.28,0,0,1,58,61.3a30.73,30.73,0,0,1,1,8.32A27,27,0,0,1,58,77.42ZM83.33,57.84H69.61V66H81.49v5.84H69.61V86.55H63.9V52H83.33Z"/></g></g></svg>
\ No newline at end of file
app/img/icon_scan.svg 0 → 100644
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 127 127"><defs><style>.cls-1,.cls-2{fill:none;}.cls-1{stroke:#fff;stroke-miterlimit:10;stroke-width:9px;}.cls-3{fill:#fff;}</style></defs><g id="レイヤー_2" data-name="レイヤー 2"><g id="レイヤー_2-2" data-name="レイヤー 2"><path class="cls-1" d="M45.49,4.5H17.41A13,13,0,0,0,4.5,17.41V45.49"/><path class="cls-1" d="M81.51,4.5h28.08A13,13,0,0,1,122.5,17.41V45.49"/><path class="cls-1" d="M45.49,122.5H17.41A13,13,0,0,1,4.5,109.59V81.51"/><path class="cls-1" d="M81.51,122.5h28.08a13,13,0,0,0,12.91-12.91V81.51"/><path class="cls-2" d="M81.4,59.77A15.93,15.93,0,0,0,79,60V93.58a17.68,17.68,0,0,0,2.42.19c.51,0,1,0,1.53-.07V59.86C82.44,59.81,81.93,59.77,81.4,59.77Z"/><path class="cls-2" d="M67.43,67.11V86.43c.28.39.56.78.86,1.15s.82.93,1.25,1.36V64.62A17.27,17.27,0,0,0,67.43,67.11Z"/><path class="cls-2" d="M84.8,60.13V93.42a16.87,16.87,0,0,0,4.51-1.61V61.74A16.75,16.75,0,0,0,84.8,60.13Z"/><path class="cls-2" d="M71.71,62.82V90.71A17.41,17.41,0,0,0,73.83,92V61.58A16.75,16.75,0,0,0,71.71,62.82Z"/><path class="cls-2" d="M95,66.64c-.17-.23-.32-.46-.5-.68a18.36,18.36,0,0,0-1.62-1.68v25A16.13,16.13,0,0,0,95,86.91Z"/><rect class="cls-3" x="21.05" y="31.05" width="1.85" height="64.89"/><rect class="cls-3" x="25" y="31.05" width="2.48" height="64.89"/><rect class="cls-3" x="29.59" y="31.05" width="4.61" height="64.89"/><rect class="cls-3" x="38.05" y="31.05" width="7.24" height="64.89"/><path class="cls-3" d="M51,70.74V31.05H47.4V96H51V82.84A31.38,31.38,0,0,1,51,70.74Z"/><path class="cls-3" d="M55.16,96h1.91a32.31,32.31,0,0,1-1.91-2.7Z"/><path class="cls-3" d="M64.49,75.14a16.91,16.91,0,0,0,2.94,11.29V67.11A17,17,0,0,0,64.49,75.14Z"/><path class="cls-3" d="M61.71,52.84a31,31,0,0,1,5.72-3.73V31.05H55.16V60.3A31.19,31.19,0,0,1,61.71,52.84Z"/><path class="cls-3" d="M70.61,63.65c-.38.31-.72.63-1.07,1V88.94a18.24,18.24,0,0,0,2.17,1.77V62.82C71.34,63.08,71,63.36,70.61,63.65Z"/><path class="cls-3" d="M71.71,31.05H69.54V48.14c.72-.29,1.44-.56,2.17-.8Z"/><path class="cls-3" d="M73.83,61.58V92A16.89,16.89,0,0,0,79,93.58V60A16.89,16.89,0,0,0,73.83,61.58Z"/><path class="cls-3" d="M79,31.05H73.83V46.72A31.1,31.1,0,0,1,79,45.87Z"/><path class="cls-3" d="M83,59.86V93.7c.62-.06,1.23-.16,1.84-.28V60.13A14.06,14.06,0,0,0,83,59.86Z"/><path class="cls-3" d="M84.8,31.05H83V45.81c.62,0,1.23.08,1.84.15Z"/><path class="cls-3" d="M89.31,61.74V91.81a16.83,16.83,0,0,0,2.91-1.92c.25-.2.47-.42.7-.64v-25A16.69,16.69,0,0,0,89.31,61.74Z"/><path class="cls-3" d="M92.92,31.05H89.31V46.8A29.85,29.85,0,0,1,92.92,48Z"/><path class="cls-3" d="M100.91,31.05H95V48.92a30.8,30.8,0,0,1,5.87,3.76Z"/><path class="cls-3" d="M95,66.64V86.91A17,17,0,0,0,95,66.64Z"/><path class="cls-3" d="M106,95.92v-.2l-.07.11Z"/><path class="cls-3" d="M106,57.88V31.05H103V54.54a30.92,30.92,0,0,1,2.32,2.52C105.56,57.33,105.75,57.61,106,57.88Z"/><path class="cls-3" d="M102.26,59.61a27,27,0,1,0-5.91,39.66l12.88,15.63,4.27-3.52L100.63,95.74A27,27,0,0,0,102.26,59.61ZM94.77,93a21,21,0,1,1,2.85-29.56A21,21,0,0,1,94.77,93Z"/></g></g></svg>
\ No newline at end of file
app/img/icon_swap.svg 0 → 100644
<svg width="26" height="36" viewBox="0 0 26 36" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M0.303164 5.89907L5.88492 0.317316C6.26504 -0.0628033 6.90524 -0.0628033 7.28536 0.317316L12.8671 5.89907C13.5073 6.51927 13.0672 7.59961 12.1669 7.59961H8.58577V19.6234C8.58577 20.7237 7.68549 21.624 6.58514 21.624C5.48479 21.624 4.58451 20.7237 4.58451 19.6234V7.59961H1.00338C0.103101 7.59961 -0.337037 6.51927 0.303164 5.89907ZM20.59 15.6219V27.6457H24.1911C25.0714 27.6457 25.5315 28.726 24.8913 29.3462L19.3096 34.908C18.9094 35.2881 18.2893 35.2881 17.8891 34.908L12.3074 29.3462C11.6672 28.726 12.1073 27.6457 13.0076 27.6457H16.5887V15.6219C16.5887 14.5216 17.489 13.6213 18.5893 13.6213C19.6897 13.6213 20.59 14.5216 20.59 15.6219Z" fill="#343A40"/>
</svg>
app/index.html
......@@ -29,7 +29,7 @@
<span class="d-none d-md-inline fs-10 multi-lang" data-msg="buttonRefresh">更新</span>
</a>
<a class="navbar-brand lht-0 d-none" id="rfidScanButton" href="javascript:CHK.startScan();" style="margin: 0 10px 0 10px;float: right;">
<i class="fa fa-wifi fs-12 p-1"></i>
<img class="icon-lg" src="img/icon_scan.svg">
<span class="d-none d-md-inline fs-10 multi-lang" data-msg="buttonScan">スキャン</span>
</a>
</nav>
......@@ -67,8 +67,8 @@
<div class="col-1 col-md-2 duration-area">
<a href="#" class="d-inline-block text-decoration-none py-2 lht-0" data-toggle="modal" data-target="#exampleModal">
<i class="far fa-calendar text-dark"></i>
<span class="d-none d-md-inline text-black fs-10 multi-lang" data-msg="labelPeriod">
<img class="icon" src="img/icon_calendar.svg">
<span class="d-none d-md-inline text-black fs-10 align-middle multi-lang" data-msg="labelPeriod">
期間
</span>
</a>
......@@ -101,8 +101,8 @@
</div>
<div class="col-4 col-md-5 col-lg-6 text-right">
<a href="#" class="text-decoration-none py-2 lht-0" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" data-offset="-120, 0">
<i class="fa fa-sort text-dark"></i>
<span class="d-none d-md-inline text-dark fs-10 multi-lang" data-msg="labelSort">
<img class="icon" src="img/icon_swap.svg">
<span class="d-none d-md-inline text-dark fs-10 align-middle multi-lang" data-msg="labelSort">
並び替え
</span>
</a>
......@@ -114,9 +114,9 @@
<a class="dropdown-item sort-type multi-lang" data-msg="labelSortOpen" data-sort="4" onclick="CHK.changeSortType(this);">閲覧日が新しい順</a>
</div>
<a href="javascript:CHK.resetSearch();" class="text-decoration-none py-2 lht-0 d-inline-block ml-3">
<i class="fa fa-times text-dark"></i>
<span class="d-none d-md-inline text-dark fs-10 multi-lang" data-msg="labelReset">
リセット
<img class="icon" src="img/icon_clear.svg">
<span class="d-none d-md-inline text-dark fs-10 align-middle multi-lang" data-msg="labelReset">
クリア
</span>
</a>
</div>
......
app/script/check.js
......@@ -80,8 +80,8 @@ var msgMap = { // velocity?
labelSortOld: { ja: "作業期間が古い順", ko: "작업기간이 오래된순", en: "By oldest period" },
labelSortType: { ja: "報告タイプ順", ko: "보고타입순", en: "By report type" },
labelSortOpen: { ja: "閲覧日が新しい順", ko: "열람순", en: "By newest viewing date" },
labelReset: { ja: "リセット", ko: "초기화", en: "Reset" },
headerItemName: { ja: "項目名", ko: "항목명", en: "Item Name" },
labelReset: { ja: "クリア", ko: "클리어", en: "Clear" },
headerItemName: { ja: "作業名", ko: "작업명", en: "Working Name" },
headerStartDate: { ja: "開始日", ko: "시작일", en: "Start date" },
headerEndDate: { ja: "終了日", ko: "종료일", en: "End date" },
buttonHome: { ja: "ホーム", ko: "홈", en: "Home" },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment