Commit @99 - jhleem/egov

Files
Commit

한선우 2022-02-18 @99

첨부파일 디자인 수정

Index: base3.10/src/main/webapp/css/user/common.css =================================================================== --- base3.10/src/main/webapp/css/user/common.css (revision 98) +++ base3.10/src/main/webapp/css/user/common.css (revision 99) @@ -456,7 +456,7 @@ .history ul li.visible::after { transform: translate(-50%, 0); opacity:1; } .history ul li.visible .history_wrap { opacity:1; transform:translate(0, -10px); transition-delay:0.2s; } .history_bg { position:absolute; top:0; left:0; z-index:0; width:100%; height:100%; background:#f4f4f4; display:block; } -.bg_text { position:absolute; top:100px; left:0; z-index:0; width:100%; font-size:10em; text-align:center; font-weight:900; color:#fff; text-transform:uppercase; } +.bg_text { position:absolute; top:100px; left:0; z-index:0; width:100%; font-size:10em; text-align:center; font-weight:900; color:rgba(244,244,244,1); text-transform:uppercase; } /*편집인*/ .editor_info ul { display:flex; flex-wrap:wrap; margin:0 -30px; } Index: base3.10/src/main/webapp/css/user/style.css =================================================================== --- base3.10/src/main/webapp/css/user/style.css (revision 98) +++ base3.10/src/main/webapp/css/user/style.css (revision 99) @@ -194,18 +194,14 @@ .file_up label:hover { box-shadow:0 0 5px 0 rgba(0,0,0,0.3); border-color:#666; } .btn_file_up span { margin-left:10px; } -/*첨부파일 리스트*/ -.file_list { margin:5px -2.5px 0; display:inline-block; display: -webkit-box; display: -webkit-flex; display: -moz-box; display: -ms-flexbox; display:flex; align-items:flex-start; flex-direction:column; flex-direction:row; flex-wrap:wrap; } -.file_list li:first-child { } -.file_list li { margin:2.5px; } -.board_view .file_list { margin-top:0; } - /*일반파일*/ -.file_list { margin:10px -2px -2px; } +.file_list { margin:10px -2px -2px; display:inline-block; display: -webkit-box; display: -webkit-flex; display: -moz-box; display: -ms-flexbox; display:flex; align-items:flex-start; flex-direction:column; flex-direction:row; flex-wrap:wrap; } +.file_list li { margin:2.5px; } .file_list .file_box { display:flex; width:auto; align-items:center; padding:5px 7px 5px 15px; border:1px solid #ccc; border-radius:50px; margin:2px; background-color:#fff; transition:all .2s ease-in-out; } .file_list .file_box:hover { box-shadow:0 0 10px 0 rgba(0,0,0,0.1); border-color:#666; } .file_list .file_box p { display:inline-block; min-width:100px; max-width:300px; font-size:0.9em; letter-spacint:-0.5em; overflow:hidden; text-overflow:ellipsis; white-space:nowrap; padding-right:20px; position:relative; } .file_list .file_box p::after { width:1px; height:15px; content:''; display:inline-block; background:#ccc; position:absolute; top:5px; right:6px; } +.board_view .file_list { margin-top:0; } /*이미지파일*/ .file_list.img_type { margin:10px -2px -2px; } Index: base3.10/src/main/webapp/css/admin/admin.css =================================================================== --- base3.10/src/main/webapp/css/admin/admin.css (revision 98) +++ base3.10/src/main/webapp/css/admin/admin.css (revision 99) @@ -30,13 +30,13 @@ .flex_start { justify-content:flex-start; display: -webkit-box; display: -webkit-flex; display: -moz-box; display: -ms-flexbox; display:flex; } /*top bar*/ -.logo { width:300px; height:175px; position:absolute; top:0; left:0; z-index:9; background: url(../../images/user/logo_fff.svg) 50% 50% no-repeat; background-size:240px; text-indent:-5000px; transition:all 0.3s;} +.logo { width:300px; height:140px; position:absolute; top:0; left:0; z-index:9; background: url(../../images/user/logo_v_fff.svg) 50% 60% no-repeat; background-size:150px; text-indent:-5000px; transition:all 0.3s;} .logo a { width:100%; height:100%; display:block; text-indent:-5000px;} .topBar { width:calc(100% - 300px); float:right; height:85px; padding:43px 30px 0 0; z-index:99999; display: -webkit-box; display: -webkit-flex; display: -moz-box; display: -ms-flexbox; display:flex; justify-content:space-between; } .topBar .fl a { font-size:1em; color:#fff; } .topBar .member { display: -webkit-box; display: -webkit-flex; display: -moz-box; display: -ms-flexbox; display:flex; justify-content:flex-end; align-items:flex-start; position:fixed; top:20px; right:30px; margin-top:0; font-size:0.8em; } -.topBar .member li { line-height:1em; padding-left:20px; margin-left:20px; color:#ccc; border-left:1px solid #717171; } +.topBar .member li { line-height:1em; padding-left:10px; margin-left:10px; color:#ccc; border-left:1px solid #717171; } .topBar .member li:first-child { border-left:none; padding-left:0; margin-left:0; } .topBar .member li a { color:#ccc; font-size:12px; position:relative; display:inline-block; } .topBar .member li a::before { transition:all 0.3s; content:''; display:inline-block; width:0; height:1px; background:#fff; position:absolute; bottom:-5px; left:50%; transform:translateX(-50%); } @@ -45,6 +45,11 @@ .topBar .member li a:hover { text-decoration:none; color:#fff; } .topBar .member p a { color:#ccc; line-height:35px; } .topBar .member span { color:#fff;font-weight:600; } +.topBar .member .time_wrap { position:relative; padding-right:65px; } +.topBar .member .btn_time { border:1px solid #fff; padding:5px 5px; position:absolute; top:50%; right:0; transform:translateY(-50%); border-radius:5px; } +.topBar .member .btn_time:hover { background:#fff; color:#112b53; } +.topBar .member .btn_time::before { display:none; } + .topBar .gnb { display: -webkit-box; display: -webkit-flex; display: -moz-box; display: -ms-flexbox; display:flex; justify-content: flex-start; font-size:1.2em; } .topBar .gnb > li { position:relative; margin-right:30px; padding:0; cursor:pointer; z-index:2; transition:all 0.3s; } @@ -814,7 +819,7 @@ .modal_wrap .board_write .board_label { width:100%; font-size:.9em; margin-bottom:8px; } /*파일업로드*/ -.file_box {width:calc(100% - 40px); margin:0 20px; height:150px; border-radius:10px; text-align:center; border:1px dashed #b1bece; background:#edf6fb; padding:20px; display: -webkit-box; display: -webkit-flex; display: -moz-box; display: -ms-flexbox; display:flex; cursor:pointer;justify-content:center; align-items: center; transition:all 0.3s; } +/* .file_box {width:calc(100% - 40px); margin:0 20px; height:150px; border-radius:10px; text-align:center; border:1px dashed #b1bece; background:#edf6fb; padding:20px; display: -webkit-box; display: -webkit-flex; display: -moz-box; display: -ms-flexbox; display:flex; cursor:pointer;justify-content:center; align-items: center; transition:all 0.3s; } .file_box em.letter { background:url(../../images/admin/icon_fileup_on.svg) 50% 0% no-repeat; color:#005c8f; font-weight:400; background-size:20px; padding-top:25px; opacity:1; pointer-events:none; transition:all 0.3s;} .file_box:hover { border:1px dashed #0a52ad; text-decoration:none; } .file_box:hover em { } @@ -841,7 +846,7 @@ .file_box_wrap .file_list li.file_word { background:url(../../images/admin/file_word.svg) 0 20px no-repeat; background-size:13px; } .file_box_wrap .file_list li.file_zip { background:url(../../images/admin/file_zip.svg) 0 20px no-repeat; background-size:13px; } .file_box_wrap .file_list li.file_hwp { background:url(../../images/admin/file_hwp.svg) 0 20px no-repeat; background-size:13px; } - + */ .modal_content.overshow { overflow:visible; } .modal_content .dataTables_wrapper { height:100%; } Index: base3.10/src/main/webapp/css/admin/font.css =================================================================== --- base3.10/src/main/webapp/css/admin/font.css (nonexistent) +++ base3.10/src/main/webapp/css/admin/font.css (revision 99) @@ -0,0 +1,155 @@ +@charset "UTF-8"; +/* CSS Document */ + +/*font*/ +@font-face{font-family:notoSans;src:url(../../fonts/NotoSansKR-Thin.woff);font-style:normal;font-weight:100;} +@font-face{font-family:notoSans;src:url(../../fonts/NotoSansKR-Light.woff);font-style:normal;font-weight:300;} +@font-face{font-family:notoSans;src:url(../../fonts/NotoSansKR-Regular.woff);font-style:normal;font-weight:400;} +@font-face{font-family:notoSans;src:url(../../fonts/NotoSansKR-Medium.woff);font-style:normal;font-weight:500;} +@font-face{font-family:notoSans;src:url(../../fonts/NotoSansKR-Bold.woff);font-style:normal;font-weight:700;} +@font-face{font-family:notoSans;src:url(../../fonts/NotoSansKR-Black.woff);font-style:normal;font-weight:900;} + +/*sign*/ +@font-face{font-family:sign; + src:url(../../fonts/sign.ttf), + url(../../fonts/sign.eot), + url(../../fonts/sign.woff);} + +@font-face { + font-family: 'icomoon'; + src: url('../../fonts/icomoon.eot?jsc8cs'); + src: url('../../fonts/icomoon.eot?jsc8cs#iefix') format('embedded-opentype'), + url('../../fonts/icomoon.ttf?jsc8cs') format('truetype'), + url('../../fonts/icomoon.woff?jsc8cs') format('woff'), + url('../../fonts/icomoon.svg?jsc8cs#icomoon') format('svg'); + font-weight: normal; + font-style: normal; + font-display: block; +} + +[class^="icon-"], [class*=" icon-"] { + /* use !important to prevent issues with browser extensions that change fonts */ + font-family: 'icomoon' !important; + speak: never; + font-style: normal; + font-weight: normal; + font-variant: normal; + text-transform: none; + line-height: 1; + + /* Better Font Rendering =========== */ + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; +} + +.icon-lock:before { + content: "\e919"; +} +.icon-say:before { + content: "\e918"; +} +.icon-people:before { + content: "\e91a"; +} +.icon-file-excel:before { + content: "\e90d"; +} +.icon-file-img:before { + content: "\e90e"; +} +.icon-file-pdf:before { + content: "\e90f"; +} +.icon-file-ppt:before { + content: "\e910"; +} +.icon-file-reg:before { + content: "\e911"; +} +.icon-file-word:before { + content: "\e912"; +} +.icon-file-zip:before { + content: "\e913"; +} +.icon-cal:before { + content: "\e914"; +} +.icon-delete:before { + content: "\e915"; +} +.icon-file:before { + content: "\e916"; +} +.icon-minus:before { + content: "\e90b"; +} +.icon-plus:before { + content: "\e90c"; +} +.icon-file-down:before { + content: "\e900"; +} +.icon-file-up:before { + content: "\e901"; +} +.icon-blank:before { + content: "\e902"; +} +.icon-close:before { + content: "\e903"; +} +.icon-arrow-b:before { + content: "\e904"; +} +.icon-arrow-t:before { + content: "\e905"; +} +.icon-arrow-dl:before { + content: "\e906"; +} +.icon-arrow-dr:before { + content: "\e907"; +} +.icon-arrow-l:before { + content: "\e908"; +} +.icon-arrow-r:before { + content: "\e909"; +} +.icon-search:before { + content: "\e90a"; +} +.icon-pencil:before { + content: "\e917"; +} +.icon-forward:before { + content: "\e969"; +} +.icon-cog:before { + content: "\e994"; +} +.icon-arrow-thin-u:before { + content: "\ea3a"; +} +.icon-arrow-thin-r:before { + content: "\ea3c"; +} +.icon-arrow-thin-d:before { + content: "\ea3e"; +} +.icon-arrow-thin-l:before { + content: "\ea40"; +} +.icon-circle-up:before { + content: "\ea41"; +} +.icon-circle-right:before { + content: "\ea42"; +} +.icon-circle-down:before { + content: "\ea43"; +} +.icon-circle-left:before { + content: "\ea44"; +} Property changes on: base3.10/src/main/webapp/css/admin/font.css ___________________________________________________________________ Added: svn:mime-type + text/plain Index: base3.10/src/main/webapp/css/admin/style.css =================================================================== --- base3.10/src/main/webapp/css/admin/style.css (revision 98) +++ base3.10/src/main/webapp/css/admin/style.css (revision 99) @@ -54,20 +54,6 @@ .must_text { color:#d70000; margin-bottom:10px; font-size:0.9em; float:right; } .must_text::after { display:block; content:''; clear:both; } -/*font*/ -@font-face{font-family:notoSans;src:url(../../fonts/NotoSansKR-Thin.woff);font-style:normal;font-weight:100;} -@font-face{font-family:notoSans;src:url(../../fonts/NotoSansKR-Light.woff);font-style:normal;font-weight:300;} -@font-face{font-family:notoSans;src:url(../../fonts/NotoSansKR-Regular.woff);font-style:normal;font-weight:400;} -@font-face{font-family:notoSans;src:url(../../fonts/NotoSansKR-Medium.woff);font-style:normal;font-weight:500;} -@font-face{font-family:notoSans;src:url(../../fonts/NotoSansKR-Bold.woff);font-style:normal;font-weight:700;} -@font-face{font-family:notoSans;src:url(../../fonts/NotoSansKR-Black.woff);font-style:normal;font-weight:900;} - -/*sign*/ -@font-face{font-family:sign; - src:url(../../fonts/sign.ttf), - url(../../fonts/sign.eot), - url(../../fonts/sign.woff);} - /*색상속성****************************************************************************************************************************************/ /*font color*/ .color_orange { color:#e47916 !important; } @@ -134,8 +120,8 @@ .btn_update:hover { border-color:#666; background:url(../../images/admin/icon_update_on.svg) 50% 50% no-repeat #fff; background-size:16px; } /*파일다운*/ -.btn_filedown, a.btn_filedown { width:24px; height:24px; display:inline-block; border:1px solid #bbb; border-radius:3px; text-indent:-5000px; background:url(../../images/admin/icon_filedown.svg) 50% 50% no-repeat; background-size:14px 13px !important; transition:all .2s, background 0s; } -.btn_filedown:hover { box-shadow:0 0 5px 0 rgba(0,0,0,0.3); border-color:#666; background:url(../../images/admin/icon_filedown_on.svg) 50% 50% no-repeat; background-size:14px 13px !important;} +.btn_filedown, a.btn_filedown { width:24px; height:24px; display:inline-block; border:none; border-radius:3px; text-indent:-5000px; background:url(../../images/admin/icon_filedown.svg) 50% 50% no-repeat; background-size:14px 13px !important; transition:all .2s, background 0s; } +.btn_filedown:hover { background:url(../../images/admin/icon_filedown_on.svg) 50% 50% no-repeat; background-size:14px 13px !important;} .btn_wrap .btn_delete { margin-left:5px; } .btn_excel { background:url(../../images/admin/icon_excel.svg) 10px 50% no-repeat; background-size:15px; padding-left:30px; } @@ -234,14 +220,54 @@ .selectText:hover, .select:hover { border-color:#666; } /*file 디자인****************************************************************************************************************************************/ -.file_up { width:100%; display:-webkit-box; display:-webkit-flex; display:-moz-box; display:-ms-flexbox; display:flex; flex-direction:row; align-items:flex-start; } +/*첨부파일*/ +.file_up { position:relative; } +.file_up input[type="file"] { position: absolute; width:120px; height:45px; border-radius:5px; padding:0; margin:0; border:0; z-index:0; } +.file_up label {border:1px solid #ccc; padding:10px; width:120px; height:45px; background:#fff; border-radius:5px; position:relative; z-index:1; box-shadow:none; display:inline-block; transition:0.3s ease-in-out; } +.file_up label:hover { box-shadow:0 0 5px 0 rgba(0,0,0,0.3); border-color:#666; } +.btn_file_up span { margin-left:10px; } + +/*일반파일*/ +.file_list { margin:10px -2px -2px; display:inline-block; display: -webkit-box; display: -webkit-flex; display: -moz-box; display: -ms-flexbox; display:flex; align-items:flex-start; flex-direction:column; flex-direction:row; flex-wrap:wrap; } +.file_list li { margin:2.5px; } +.file_list .file_box { display:flex; width:auto; align-items:center; padding:5px 7px 5px 15px; border:1px solid #ccc; border-radius:5px; margin:2px; background-color:#fff; transition:all .2s ease-in-out; } +.file_list .file_box:hover { box-shadow:0 0 10px 0 rgba(0,0,0,0.1); border-color:#666; } +.file_list .file_box p { display:inline-block; min-width:100px; max-width:300px; font-size:0.9em; letter-spacint:-0.5em; overflow:hidden; text-overflow:ellipsis; white-space:nowrap; padding-right:20px; position:relative; } +.file_list .file_box p::after { width:1px; height:15px; content:''; display:inline-block; background:#ccc; position:absolute; top:5px; right:6px; } +.board_view .file_list { margin-top:0; } +.ml_filelist .file_list { margin-top:0; } + +.file_img { background:url(../../images/admin/file_img.svg) 10px 50% no-repeat #fff; background-size:13px; padding-left:35px !important; } +.file_ppt { background:url(../../images/admin/file_ppt.svg) 10px 50% no-repeat #fff; background-size:13px; padding-left:35px !important; } +.file_pdf { background:url(../../images/admin/file_pdf.svg) 10px 50% no-repeat #fff; background-size:13px; padding-left:35px !important; } +.file_word { background:url(../../images/admin/file_word.svg) 10px 50% no-repeat #fff; background-size:13px; padding-left:35px !important; } +.file_reg { background:url(../../images/admin/file_reg.svg) 10px 50% no-repeat #fff; background-size:13px; padding-left:35px !important; } +.file_excel { background:url(../../images/admin/file_excel.svg) 10px 50% no-repeat #fff; background-size:13px; padding-left:35px !important; } +.file_zip { background:url(../../images/admin/file_zip.svg) 10px 50% no-repeat #fff; background-size:13px; padding-left:35px !important; } +.file_hwp { background:url(../../images/admin/file_hwp.svg) 10px 50% no-repeat #fff; background-size:13px; padding-left:35px !important; } + +/*이미지파일*/ +.file_list.img_type { margin:10px -2px -2px; } +.file_list.img_type .file_box { display:flex; align-items:center; padding:5px 7px 5px 15px; border:1px solid #ccc; width:100px; height:100px; border-radius:20px; margin:2px; transition:all .2s ease-in-out; position:relative; } +.file_list.img_type .btn_wrap { position:absolute; background:rgba(255,255,255,0.3); backdrop-filter:blur(10px); bottom:-100%; left:0; width:100%; text-align:center; padding:5px 0;transition:all .2s ease-in-out; } +.file_list.img_type .file_box:hover { box-shadow:0 0 10px 0 rgba(0,0,0,0.1); border-color:#666; } +.file_list.img_type .file_box:hover .btn_wrap { bottom:0; } +.file_list.img_type .file_box .btn_wrap button { color:#ccc; } +.file_list.img_type .file_box .btn_wrap button:hover { color:#fff; } + +.btn_inner { width:24px; height:24px; background:transparent; border:none; padding:0; color:#333; font-size:1em; border-radius:50px; } +.btn_inner:hover { box-shadow:none; border:none; color:#1d69db; } +.btn_inner .icon-file-down { } +.btn_inner.widthauto { font-size:0.8em; } + +/* .file_up { width:100%; display:-webkit-box; display:-webkit-flex; display:-moz-box; display:-ms-flexbox; display:flex; flex-direction:row; align-items:flex-start; } .file_up input[type="file"] { position: absolute; width:1px; height:1px; padding: 0; margin: -1px; overflow: hidden; clip:rect(0,0,0,0); border: 0; } .file_up label, .file_up .inputFile {border:1px solid #ccc; margin-right:3px; text-align:left; padding:7px 25px 6px 20px; min-width:105px; background:url(../../images/admin/icon_fileup.svg) calc(100% - 10px) 50% no-repeat #fff; background-size:11px 11px; border-radius:2px; box-shadow:none; display:inline-block; transition:0.3s ease-in-out; } .file_up label:hover, .file_up .inputFile:hover { box-shadow:0 0 5px 0 rgba(0,0,0,0.3); border-color:#666; } .upload-name { visibility:hidden; width:calc(100% - 100px); padding:0 10px; height:35px; } .file_up label.withname { height:35px; padding:7px 20px 6px 10px; min-width:85px; } -/*첨부파일 가로 정렬*/ +첨부파일 가로 정렬 .file_list.sortR { flex-direction:row; flex-wrap:wrap; justify-content:flex-start; } .file_list.sortR li { margin:2.5px !important; } @@ -259,7 +285,7 @@ .addFileSize.file_list .file_wrap p { display:inline-block; min-width:0; } .addFileSize.file_list strong { margin-right:10px; max-width:300px; font-weight:400; } -/*일반파일*/ +일반파일 .file_list .file_wrap { display:-webkit-box; display:-webkit-flex; display:-moz-box; display:-ms-flexbox; display:flex; width:auto; align-items:center; padding:3px 7px 3px 15px; border:1px solid #ccc; border-radius:2px; background:#fff; transition:border .2s ease-in-out, box-shadow .2s ease-in-out;} .file_list .file_wrap:hover { box-shadow:0 0 10px 0 rgba(0,0,0,0.1); border-color:#666; } .file_list .file_wrap p { display:inline-block; min-width:100px; max-width:300px; font-size:0.9em; overflow:hidden; text-overflow:ellipsis; white-space:nowrap; padding-right:20px; position:relative; } @@ -280,7 +306,7 @@ .file_zip .file_wrap { background:url(../../images/admin/file_zip.svg) 10px 50% no-repeat #fff; background-size:13px; padding-left:35px; } .file_hwp .file_wrap { background:url(../../images/admin/file_hwp.svg) 10px 50% no-repeat #fff; background-size:13px; padding-left:35px; } -/*업로드파일이 이미지일 경우*/ +업로드파일이 이미지일 경우 .file_img { display:-webkit-box; display:-webkit-flex; display:-moz-box; display:-ms-flexbox; display:flex; justify-content:flex-start; } .file_img li { width:80px;height:80px; background-size:contain !important; position:relative; overflow:hidden; margin:10px 10px 0 0; border-radius:10px; border:1px solid #eaeaea; transition:border .2s ease-in-out, box-shadow .2s ease-in-out; } .file_img li:last-child { margin-right:0; } @@ -293,7 +319,7 @@ .file_img li:hover::after { opacity:0.5; } .file_img li img { width:100%; height:auto; position:absolute; top:50%; left:50%; transform:translate(-50%, -50%); pointer-events:none; } - + */ /*scrollbar 디자인****************************************************************************************************************************************/ ::-webkit-scrollbar {width: 8px; height: 8px; } ::-webkit-scrollbar-track {background: transparent; } Index: base3.10/src/main/webapp/css/admin/board.css =================================================================== --- base3.10/src/main/webapp/css/admin/board.css (revision 98) +++ base3.10/src/main/webapp/css/admin/board.css (revision 99) @@ -31,6 +31,7 @@ .table_list td a.calc10 { width: calc(100% - 10px); float:left; } .score { padding:0px 7px; font-weight:400; border-radius:5px; background:#0081c8; margin-left:5px; color:#fff; font-size:0.8em; display:inline-block; transform:translateY(-2px); } .exp.filenote { font-size:0.9em; margin-top:5px; display:inline-block; } +.table_list th .check2, .table_list td .check2 { display:inline-block; } /*게시판write style1*/ .table_write { width:100%; font-size:14px; border-top:2px solid #224173; border-collapse:initial; table-layout:fixed;} Index: base3.10/src/main/webapp/WEB-INF/tiles/template/adminHeader.jsp =================================================================== --- base3.10/src/main/webapp/WEB-INF/tiles/template/adminHeader.jsp (revision 98) +++ base3.10/src/main/webapp/WEB-INF/tiles/template/adminHeader.jsp (revision 99) @@ -30,6 +30,7 @@ <script type="text/javascript" src="<c:url value='/js/com/jquery.blockUI.js'/>" ></script> <script type="text/javascript" src="<c:url value='/js/com/html2pdf.bundle.js'/>" ></script> <script type="text/javascript" src="<c:url value='/js/com/fileUpload.js'/>"></script> +<link rel="stylesheet" type="text/css" href="<c:url value='/css/admin/font.css'/>" /> <link rel="stylesheet" type="text/css" href="<c:url value='/css/admin/style.css'/>" /> <link rel="stylesheet" type="text/css" href="<c:url value='/css/admin/board.css'/>" /> <link rel="stylesheet" type="text/css" href="<c:url value='/css/admin/admin.css'/>" /> Index: base3.10/src/main/webapp/WEB-INF/tiles/template/adminMenu.jsp =================================================================== --- base3.10/src/main/webapp/WEB-INF/tiles/template/adminMenu.jsp (revision 98) +++ base3.10/src/main/webapp/WEB-INF/tiles/template/adminMenu.jsp (revision 99) @@ -73,8 +73,7 @@ <c:choose> <c:when test="${loginVO != null}"> <li><span><b>${loginVO.name }</b></span> 님 환영합니다.</li> - <li><spring:message code="comCmm.top.leftSessionTime"/> - <span id="leftTimeInfo">00:00:00</span></li> - <li><a id="addSessionTerm" class="btn02" href="#"><spring:message code="comCmm.top.incSessionTime"/></a></li> + <li class="time_wrap"><spring:message code="comCmm.top.leftSessionTime"/> - <span id="leftTimeInfo">00:00:00</span><a id="addSessionTerm" class="btn_time" href="#"><spring:message code="comCmm.top.incSessionTime"/></a></li> <li class="icon_home"><a href="<c:url value="/index.do"/>">home</a></li> <li class="icon_logout"><a href="<c:url value="/uat/uia/actionLogout.do"/>">logout</a></li> </c:when> Index: base3.10/src/main/webapp/WEB-INF/jsp/egovframework/cross/content/about.jsp =================================================================== --- base3.10/src/main/webapp/WEB-INF/jsp/egovframework/cross/content/about.jsp (revision 98) +++ base3.10/src/main/webapp/WEB-INF/jsp/egovframework/cross/content/about.jsp (revision 99) @@ -176,17 +176,23 @@ //about var controller = new ScrollMagic.Controller(); var gray = TweenMax.to(".history", 0.5, {background: "rgba(244,244,244,1)"}); -var window = $(window).outerHeight(); -var history = $(".history").outerHeight() / 2; +var text = TweenMax.to(".bg_text", 0.5, {color: "rgba(255,255,255,1)"}); // slide -var bgGray = new ScrollMagic.Scene({triggerElement: ".history", triggerHook:'.5'}) - .setTween(gray) - .offset(100) - .duration(400) - .addTo(controller) - //.addIndicators({name: "bgGray"}); +var bgGray = new ScrollMagic.Scene({triggerElement: ".history", triggerHook:'.7'}) + .setTween(gray) + .offset(100) + .duration(400) + .addTo(controller) + //.addIndicators({name: "bgGray"}); +var textcolor = new ScrollMagic.Scene({triggerElement: ".history", triggerHook:'.5'}) + .setTween(text) + .offset(100) + .duration("100%") + .addTo(controller) + //.addIndicators({name: "text"}); + var bgText = new ScrollMagic.Scene({triggerElement: ".history", triggerHook:'.5'}) .setPin(".bg_text") .offset(100) Index: base3.10/src/main/webapp/WEB-INF/jsp/egovframework/com/cmm/fms/EgovFileList.jsp =================================================================== --- base3.10/src/main/webapp/WEB-INF/jsp/egovframework/com/cmm/fms/EgovFileList.jsp (revision 98) +++ base3.10/src/main/webapp/WEB-INF/jsp/egovframework/com/cmm/fms/EgovFileList.jsp (revision 99) @@ -80,26 +80,26 @@ <c:choose> <c:when test="${authorType eq 'user'}"> - <li> + <li class="file_box">  - <div class="file_box"> + <p class="file_name"> <em class="blind">첨부파일명</em><c:out value="${item.originFileNm}" /> </p>  <button onClick="location.href='${item.link }'" class="btn_inner" title="<c:out value="${item.originFileNm}" /> 다운받기"><span class="icon-file-down"></span><em class="blind">첨부파일다운로드</em></button> - </div> + </li> </c:when> <c:otherwise> - <li class="${fileIcon}"> - <div class="file_box"> + <li class="${fileIcon} file_box"> + <p class="file_name"> <em class="blind">첨부파일명</em><c:out value="${item.originFileNm}" /> </p> <%-- <em><fmt:formatNumber value="${fileSize}" pattern="0.00" />${fileUnit}</em> --%> - <a href="${item.link}"><button type="button" class="btn_filedown btn_sq_s" title="<c:out value="${item.originFileNm}" /> 다운받기">다운</button></a> - </div> + <button onclick="location.href='${item.link}'" class="btn_inner" title="<c:out value="${item.originFileNm}" /> 다운받기"><span class="icon-file-down"></span><em class="blind">첨부파일다운로드</em></button> + <%-- <a href="${item.link}"><button type="button" class="btn_inner" title="<c:out value="${item.originFileNm}" /> 다운받기">다운</button></a> --%> </li> </c:otherwise> </c:choose> Index: base3.10/src/main/webapp/WEB-INF/jsp/egovframework/com/uss/umt/EgovEntrprsMberManage.jsp =================================================================== --- base3.10/src/main/webapp/WEB-INF/jsp/egovframework/com/uss/umt/EgovEntrprsMberManage.jsp (revision 98) +++ base3.10/src/main/webapp/WEB-INF/jsp/egovframework/com/uss/umt/EgovEntrprsMberManage.jsp (revision 99) @@ -145,20 +145,20 @@ <table class="table_list"> <caption>${pageTitle} <spring:message code="title.list" /></caption> <colgroup> - <col class="width100"> + <col class="width80"> <col class="width50"> <col class="width150"> <col class="width150"> + <col class="width150"> + <col class="widthauto"> + <col class="width150"> <col class="width100"> <col class="width200"> - <col class="width100"> - <col class="width100"> - <col class="width100"> </colgroup> <thead> <tr> <th><spring:message code="table.num" /></th> - <th><input type="checkbox" name="checkAll" class="check2" onclick="javascript:fncCheckAll()" title="<spring:message code="input.selectAll.title" />"></th> + <th><input type="checkbox" name="checkAll" onclick="javascript:fncCheckAll()" title="<spring:message code="input.selectAll.title" />"></th> <th class="board_th_link"><spring:message code="comUssUmt.entrprsUserManageList.id" /></th> <th><spring:message code="comUssUmt.entrprsUserManageList.company" /></th> <th><spring:message code="comUssUmt.entrprsUserManageList.name" /></th> @@ -179,7 +179,7 @@ <tr> <td><c:out value="${status.count}"/></td> <td> - <input type="checkbox" name="checkField" class="check2" title="선택"/> + <input type="checkbox" name="checkField" title="선택"/> <input name="checkId" type="hidden" value="<c:out value='${result.userTy}'/>:<c:out value='${result.uniqId}'/>"/> </td> <td><a href="<c:url value='/uss/umt/EgovEntrprsMberSelectUpdtView.do'/>?selectedId=<c:out value="${result.uniqId}"/>" onclick="javascript:fnSelectUser('<c:out value="${result.userTy}"/>:<c:out value="${result.uniqId}"/>'); return false;"><c:out value="${result.userId}"/></a></td> Index: base3.10/src/main/webapp/WEB-INF/jsp/egovframework/com/uss/umt/EgovUserManage.jsp =================================================================== --- base3.10/src/main/webapp/WEB-INF/jsp/egovframework/com/uss/umt/EgovUserManage.jsp (revision 98) +++ base3.10/src/main/webapp/WEB-INF/jsp/egovframework/com/uss/umt/EgovUserManage.jsp (revision 99) @@ -165,7 +165,7 @@ <thead> <tr> <th><spring:message code="table.num" /></th> - <th><input type="checkbox" name="checkAll" class="check2" onclick="javascript:fncCheckAll()" title="<spring:message code="input.selectAll.title" />"></th> + <th><input type="checkbox" name="checkAll" onclick="javascript:fncCheckAll()" title="<spring:message code="input.selectAll.title" />"></th> <th class="board_th_link"><spring:message code="comUssUmt.userManageList.id" /></th> <th><spring:message code="comUssUmt.userManageList.name" /></th> <th>권한</th> @@ -186,7 +186,7 @@ <tr> <td><c:out value="${status.count}"/></td> <td> - <input type="checkbox" name="checkField" class="check2" title="선택"/> + <input type="checkbox" name="checkField" title="선택"/> <input name="checkId" type="hidden" value="<c:out value='${result.userTy}'/>:<c:out value='${result.uniqId}'/>"/> </td> <td><a href="<c:url value='/uss/umt/EgovMberSelectUpdtView.do'/>?selectedId=<c:out value="${result.uniqId}"/>" onclick="javascript:fnSelectUser('<c:out value="${result.userTy}"/>:<c:out value="${result.uniqId}"/>'); return false;"><c:out value="${result.userId}"/></a></td> Index: base3.10/src/main/webapp/images/user/logo_v_fff.svg =================================================================== --- base3.10/src/main/webapp/images/user/logo_v_fff.svg (nonexistent) +++ base3.10/src/main/webapp/images/user/logo_v_fff.svg (revision 99) @@ -0,0 +1,51 @@ +<?xml version="1.0" encoding="utf-8"?> + +<svg version="1.1" id="레이어_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" + y="0px" viewBox="0 0 99.4 24.1" style="enable-background:new 0 0 99.4 24.1;" xml:space="preserve"> +<style type="text/css"> + .st0{fill:#FFFFFF;} +</style> +<g> + <g> + <path class="st0" d="M0,5.1C0,1.8,2.2,0,4.6,0c1.3,0,2.3,0.6,2.9,1.3L6.3,2.7C5.9,2.3,5.3,2,4.7,2C3.4,2,2.4,3.1,2.4,5 + s0.9,3,2.2,3C5.4,8,6,7.6,6.5,7.2l1.2,1.5C6.9,9.6,5.8,10,4.5,10C2.1,10,0,8.3,0,5.1z"/> + <path class="st0" d="M14.5,9.9l-1.8-3.4h-1.1v3.4H9.2V0.2h3.5c2.1,0,3.8,0.7,3.8,3c0,1.4-0.7,2.3-1.7,2.8L17,9.8L14.5,9.9 + L14.5,9.9z M11.6,4.6h1c1.1,0,1.7-0.5,1.7-1.4S13.7,2,12.6,2h-1V4.6z"/> + <path class="st0" d="M18.1,5c0-3.2,1.8-5,4.4-5C25.2,0,27,1.8,27,5s-1.8,5.1-4.4,5.1C19.9,10,18.1,8.1,18.1,5z M24.6,5 + c0-1.9-0.8-3-2.1-3c-1.3,0-2.1,1.1-2.1,3s0.8,3.1,2.1,3.1C23.8,8,24.6,6.9,24.6,5z"/> + <path class="st0" d="M28.3,8.6L29.6,7c0.7,0.6,1.6,1,2.4,1c0.9,0,1.3-0.3,1.3-0.8c0-0.6-0.5-0.7-1.4-1.1l-1.2-0.5 + c-1-0.4-2-1.2-2-2.7c0-1.6,1.5-2.9,3.5-2.9c1.1,0,2.3,0.4,3.1,1.3l-1.2,1.5c-0.6-0.5-1.2-0.7-2-0.7C31.5,2,31,2.3,31,2.8 + s0.6,0.7,1.5,1.1l1.2,0.5c1.2,0.5,1.9,1.3,1.9,2.7c0,1.6-1.4,3-3.7,3C30.7,10,29.3,9.6,28.3,8.6z"/> + <path class="st0" d="M36.5,8.6L37.8,7c0.7,0.6,1.6,1,2.4,1c0.9,0,1.3-0.3,1.3-0.8c0-0.6-0.5-0.7-1.4-1.1l-1.2-0.5 + c-1-0.4-2-1.2-2-2.7c0-1.6,1.5-2.9,3.5-2.9c1.1,0,2.3,0.4,3.1,1.3l-1.2,1.5c-0.6-0.5-1.2-0.7-2-0.7c-0.7,0-1.2,0.3-1.2,0.8 + s0.6,0.7,1.5,1.1l1.2,0.5C43,5,43.7,5.8,43.7,7.2c0,1.6-1.4,3-3.7,3C38.8,10,37.5,9.6,36.5,8.6z"/> + <path class="st0" d="M50.7,9.9L49,6.4h-1.1v3.4h-2.3V0.2h3.5c2.1,0,3.8,0.7,3.8,3c0,1.4-0.7,2.3-1.7,2.8l2.2,3.8L50.7,9.9 + L50.7,9.9z M47.8,4.6h1c1.1,0,1.7-0.5,1.7-1.4S50,2,48.9,2h-1v2.6H47.8z"/> + <path class="st0" d="M54.4,5c0-3.2,1.8-5,4.4-5s4.4,1.8,4.4,5s-1.8,5.1-4.4,5.1S54.4,8.1,54.4,5z M60.9,5c0-1.9-0.8-3-2.1-3 + s-2.1,1.1-2.1,3s0.8,3.1,2.1,3.1C60.1,8,60.9,6.9,60.9,5z"/> + <path class="st0" d="M69.6,7.6h-2.9l-0.6,2.2h-2.4l3-9.7h2.8l3,9.7h-2.4L69.6,7.6z M69.2,5.8L69,5c-0.3-1-0.5-2.1-0.8-3.1h-0.1 + c-0.2,1-0.5,2.1-0.7,3.1l-0.2,0.8H69.2z"/> + <path class="st0" d="M79,9.9l-1.8-3.4h-1.1v3.4h-2.3V0.2h3.5c2.1,0,3.8,0.7,3.8,3c0,1.4-0.7,2.3-1.7,2.8l2.2,3.8L79,9.9L79,9.9z + M76.1,4.6h1c1.1,0,1.7-0.5,1.7-1.4S78.2,2,77.1,2h-1V4.6z"/> + <path class="st0" d="M83.1,0.2h2.8c3,0,4.9,1.4,4.9,4.8s-2,4.9-4.8,4.9h-2.9V0.2z M85.7,8c1.6,0,2.7-0.7,2.7-3s-1.1-3-2.7-3h-0.3 + v6H85.7z"/> + <path class="st0" d="M92.1,8.6L93.4,7c0.7,0.6,1.6,1,2.4,1C96.6,8,97,7.7,97,7.2c0-0.6-0.5-0.7-1.4-1.1l-1.2-0.5 + c-1-0.4-2-1.2-2-2.7C92.4,1.3,93.9,0,96,0c1.1,0,2.3,0.4,3.1,1.3l-1.2,1.5C97.3,2.2,96.7,2,96,2s-1.2,0.3-1.2,0.8s0.6,0.7,1.5,1.1 + l1.2,0.5c1.2,0.5,1.9,1.3,1.9,2.7c0,1.6-1.4,3-3.7,3C94.4,10,93.1,9.6,92.1,8.6z"/> + </g> + <g> + <path class="st0" d="M21.2,14.4h1.6l0.9,5l0.5,3.1h0.1c0.2-1,0.4-2.1,0.6-3.1l1.2-5h1.3l1.2,5c0.2,1,0.4,2,0.7,3.1h0.1 + c0.2-1,0.3-2.1,0.5-3.1l0.9-5h1.4l-2,9.6h-1.9L27,18.7c-0.2-0.8-0.3-1.5-0.4-2.2h-0.1c-0.1,0.7-0.3,1.4-0.4,2.2L24.8,24H23 + L21.2,14.4z"/> + <path class="st0" d="M33.8,14.4h5.7v1.3h-4.1v2.7h3.5v1.3h-3.5v3.1h4.3v1.3h-5.8L33.8,14.4L33.8,14.4z"/> + <path class="st0" d="M41.8,14.4h3c2,0,3.4,0.6,3.4,2.4c0,0.9-0.5,1.8-1.4,2.1V19c1.1,0.2,1.9,1,1.9,2.3c0,1.9-1.5,2.8-3.7,2.8 + h-3.2V14.4z M44.6,18.4c1.5,0,2.1-0.5,2.1-1.4c0-1-0.7-1.4-2-1.4h-1.4v2.8H44.6z M44.8,22.8c1.5,0,2.4-0.5,2.4-1.7 + c0-1.1-0.8-1.5-2.4-1.5h-1.5v3.2H44.8z"/> + <path class="st0" d="M49.9,23l4.8-7.4h-4.4v-1.2h6.2v0.9l-4.8,7.4h4.8V24h-6.7v-1H49.9z"/> + <path class="st0" d="M58.6,14.4h1.5V24h-1.5V14.4z"/> + <path class="st0" d="M62.6,14.4h1.5l3.2,5.6l1,2h0.1c-0.1-1-0.2-2.1-0.2-3.2v-4.4h1.4V24h-1.5l-3.2-5.6l-1-2h-0.1 + c0.1,1,0.2,2.1,0.2,3.1V24h-1.4V14.4z"/> + <path class="st0" d="M72.4,14.4h5.7v1.3H74v2.7h3.5v1.3H74v3.1h4.3v1.3h-5.8L72.4,14.4L72.4,14.4z"/> + </g> +</g> +</svg> Index: base3.10/src/main/webapp/js/admin/designJS.js =================================================================== --- base3.10/src/main/webapp/js/admin/designJS.js (revision 98) +++ base3.10/src/main/webapp/js/admin/designJS.js (revision 99) @@ -268,6 +268,25 @@ $(".star_fill").width(starFill + '%'); } } + + //icon + var icon = { + //icon + 'icon' : function() { + + if (!('boxShadow' in document.body.style)) { + document.body.setAttribute('class', 'noBoxShadow'); + } + + document.body.addEventListener("click", function(e) { + var target = e.target; + if (target.tagName === "INPUT" && + target.getAttribute('class').indexOf('liga') === -1) { + target.select(); + } + }); + } + }; $(document).ready(function() { @@ -294,6 +313,7 @@ popup.open() popup.close() inputFocus(); + icon.icon(); }); }) (); \ No newline at end of file Index: base3.10/src/main/webapp/resource/editor/js/froala_editor_script_custom.js =================================================================== --- base3.10/src/main/webapp/resource/editor/js/froala_editor_script_custom.js (revision 98) +++ base3.10/src/main/webapp/resource/editor/js/froala_editor_script_custom.js (revision 99) @@ -386,26 +386,24 @@ var defaultsDom = function(html) { var fileIcon = fileExtIcon(html.fileExtsn); var fileSize = fileSizeConvert(html.fileSize); - var dom = '<li class="' + fileIcon + '" id ="' + html.fileId + '">' - + '<div class="file_wrap">' + var dom = '<li class="' + fileIcon + ' file_box" id ="' + html.fileId + '">' + "<p class='filename'>" + html.originFileNm + "<em class='fileSize'>[" + fileSize + "]</em></p>" - + "<button type='button' class='btn_ss bg_basic' title='파일 본문에 넣기'>본문에 넣기</button>"; + + "<button type='button' class='btn_inner widthauto' title='파일 본문에 넣기'>본문에 넣기</button>"; // 이미지 여부 확인 // if (fileSizeConvert(html.originFileNm)) { // dom += "<a href=" + html.link.replace('/download.do', '/imageview.do') + " target='_blank' class='btn_ss bg_basic' title='이미지 미리보기'>미리보기</a>"; // } - dom += "<button type='button' class='btn_delete btn_sq_s ml2' title='파일 삭제'>삭제</button>" - + "</div>" + dom += "<button type='button' class='btn_inner' title='파일 삭제'><em class='blind'>삭제</em><span class='icon-delete'></span></button>" + "</li>"; return dom; } // 파일 목록 생성 (사용자게시판) var defaultsDomUser = function(html) { - var dom = '<div id="'+html.fileId+'" class="file_box">' + var dom = '<li id="'+html.fileId+'" class="file_box">' + '<p class="filename">'+html.originFileNm+'</p>' + '<button type="button" class="btn_inner widthauto" title="파일 본문에 넣기">본문에 넣기</button>' + '<button type="button" class="btn_inner" title="파일 삭제" ><em class="blind">삭제</em><span class="icon-delete"></span></button>' - + '</div>' + + '</li>' return dom; }

Add a comment

List

Delete comment