diff --git a/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/attach-file.component.scss b/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/attach-file.component.scss index c58c3d75..6d659f7b 100644 --- a/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/attach-file.component.scss +++ b/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/attach-file.component.scss @@ -1,4 +1,3 @@ -@charset "UTF-8" .bubble-main { display: flex; flex-direction: row; @@ -12,43 +11,43 @@ background-repeat: no-repeat; &.doc { background-image: url(/assets/images/file/icon_talk_doc.png); - &.disable{ + &.disable { background-image: url(/assets/images/file/icon_talk_doc_d.png); } } &.exe { background-image: url(/assets/images/file/icon_talk_exe.png); - &.disable{ + &.disable { background-image: url(/assets/images/file/icon_talk_exe_d.png); } } &.file { background-image: url(/assets/images/file/icon_talk_file.png); - &.disable{ + &.disable { background-image: url(/assets/images/file/icon_talk_file_d.png); } } &.hwp { background-image: url(/assets/images/file/icon_talk_hwp.png); - &.disable{ + &.disable { background-image: url(/assets/images/file/icon_talk_hwp_d.png); } } &.ppt { background-image: url(/assets/images/file/icon_talk_ppt.png); - &.disable{ + &.disable { background-image: url(/assets/images/file/icon_talk_ppt_d.png); } } &.xls { background-image: url(/assets/images/file/icon_talk_xls.png); - &.disable{ + &.disable { background-image: url(/assets/images/file/icon_talk_xls_d.png); } } &.zip { background-image: url(/assets/images/file/icon_talk_zip.png); - &.disable{ + &.disable { background-image: url(/assets/images/file/icon_talk_doc_d.png); } } @@ -90,9 +89,9 @@ text-align: center; align-items: center; font-size: 13px; - border-right:1px solid #dddddd; - &:last-child{ - border-right:none; + border-right: 1px solid #dddddd; + &:last-child { + border-right: none; } .mat-button { width: 100%; diff --git a/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/date-splitter.component.scss b/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/date-splitter.component.scss index c28fd375..3f879e9b 100644 --- a/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/date-splitter.component.scss +++ b/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/date-splitter.component.scss @@ -1,4 +1,3 @@ -@charset 'utf-8'; .date-split { display: flex; align-content: center; @@ -6,9 +5,9 @@ .line { height: 1px; background-color: #cccccc; - width:40%; - flex:1 1 auto; - margin-bottom:10px; + width: 40%; + flex: 1 1 auto; + margin-bottom: 10px; } .date { width: 160px; diff --git a/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/mass.component.scss b/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/mass.component.scss index 819f34a7..aa2dfae1 100644 --- a/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/mass.component.scss +++ b/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/mass.component.scss @@ -1,8 +1,8 @@ -@charset "UTF-8" .bubble-main { padding: 14px; text-align: left; } + .btn-box { border-top: 1px solid #dddddd; height: 40px; diff --git a/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/schedule.component.scss b/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/schedule.component.scss index 926d6e82..012437db 100644 --- a/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/schedule.component.scss +++ b/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/schedule.component.scss @@ -1,4 +1,3 @@ -@charset "UTF-8" .event-main { flex-direction: column; text-align: left; diff --git a/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/translation.component.scss b/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/translation.component.scss index 039ae60d..2c68b44f 100644 --- a/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/translation.component.scss +++ b/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/translation.component.scss @@ -1,4 +1,3 @@ -@charset "UTF-8" .translation-main { text-align: left; .original { diff --git a/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/video.component.scss b/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/video.component.scss index c3f104fb..2b897501 100644 --- a/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/video.component.scss +++ b/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/video.component.scss @@ -1,7 +1,6 @@ -@charset "UTF-8" -.bubble-main{ +.bubble-main { flex-direction: column; - padding:14px; + padding: 14px; .file-img { display: inline-flex; width: 50px; @@ -11,47 +10,47 @@ background-repeat: no-repeat; &.video { background-image: url(/assets/images/file/icon_talk_video.png); - &.disable{ + &.disable { background-image: url(/assets/images/file/icon_talk_video_d.png); } } } - .file-info{ - display:inline-flex; - flex-direction: column; - text-align: left; - line-height:1.6em; - .file-name{ - font-size:14px; - font-weight:bold; - display:inline-flex + .file-info { + display: inline-flex; + flex-direction: column; + text-align: left; + line-height: 1.6em; + .file-name { + font-size: 14px; + font-weight: bold; + display: inline-flex; } - .file-size{ - display:inline-flex; - font-size:11px; - color:#666666; + .file-size { + display: inline-flex; + font-size: 11px; + color: #666666; } - .file-ext{ - font-size:12px; + .file-ext { + font-size: 12px; } } } -.btn-box{ - width:100%; - height:40px; - border-top:1px solid #dddddd; - display:flex; - ul{ - width:100%; - li{ - width:50%; - display:inline-block; - text-align:center; +.btn-box { + width: 100%; + height: 40px; + border-top: 1px solid #dddddd; + display: flex; + ul { + width: 100%; + li { + width: 50%; + display: inline-block; + text-align: center; align-items: center; - font-size:13px; - border-right:1px solid #dddddd; - &:last-child{ - border-right:none; + font-size: 13px; + border-right: 1px solid #dddddd; + &:last-child { + border-right: none; } .mat-button { width: 100%; @@ -59,4 +58,4 @@ } } } -} \ No newline at end of file +} diff --git a/projects/ucap-webmessenger-ui-chat/src/lib/components/messages.component.scss b/projects/ucap-webmessenger-ui-chat/src/lib/components/messages.component.scss index 8ee3618f..4cd6b3a3 100644 --- a/projects/ucap-webmessenger-ui-chat/src/lib/components/messages.component.scss +++ b/projects/ucap-webmessenger-ui-chat/src/lib/components/messages.component.scss @@ -206,7 +206,6 @@ $meBox-bg: #ffffff; word-wrap: break-word; white-space: nowrap; } - } .message-row.me > .bubble { @@ -214,11 +213,11 @@ $meBox-bg: #ffffff; background-color: $meBox-bg; } .message-row.me { - .profile-img{ - display:none; + .profile-img { + display: none; } - .chat-name{ - display:none; + .chat-name { + display: none; } .message-main { text-align: right; diff --git a/projects/ucap-webmessenger-ui/src/assets/scss/_ucap-ui.scss b/projects/ucap-webmessenger-ui/src/assets/scss/_ucap-ui.scss index 0a1ba1af..8624180f 100644 --- a/projects/ucap-webmessenger-ui/src/assets/scss/_ucap-ui.scss +++ b/projects/ucap-webmessenger-ui/src/assets/scss/_ucap-ui.scss @@ -12,6 +12,3 @@ @import 'partials/icons'; @import 'partials/normalize'; @import 'partials/scrollbars'; - -//creative -@import 'global/default'; diff --git a/projects/ucap-webmessenger-ui/src/assets/scss/global/_common.scss b/projects/ucap-webmessenger-ui/src/assets/scss/global/_common.scss deleted file mode 100644 index 54d1153c..00000000 --- a/projects/ucap-webmessenger-ui/src/assets/scss/global/_common.scss +++ /dev/null @@ -1,53 +0,0 @@ -@charset 'utf-8'; - -$listH-row3: 120px; -$listH-row2: 90px; -$listH-row2-s: 70px; -$checkbox-size: 16px; -$presence-size: 8px; -$thumbnail-msize: 40px; -$bg-list-hover: #efefef; -$bg-list-item-msg: #f0f4f6; - -$font-dark: #212121; -$font-mid: #666666; -$font-light: #848d95; -$font-white: #ffffff; - -$line-basic: 1px solid #dddddd; -$color-main: #ee278b; - -@mixin ellipsis($row) { - overflow: hidden; - text-overflow: ellipsis; - @if $row == 1 { - display: block; - white-space: nowrap; - word-wrap: normal; - } @else if $row >= 2 { - display: -webkit-box; - -webkit-line-clamp: $row; - -webkit-box-orient: vertical; - word-wrap: break-word; - } -} - -@mixin border-radius($radius) { - border-radius: $radius; - -webkit-border-radius: $radius; - -moz-border-radius: $radius; -} -@mixin visible($sh) { - display: $sh; -} -@mixin presence-status($status) { - @if $status == pcOn { - background-color: #28ad66; - } @else if $status == pcOut { - background-color: #f35b5b; - } @else if $status == pcOff { - background-color: #a29f9f; - } @else if $status == pcOther { - background-color: #f0c10a; - } -} diff --git a/projects/ucap-webmessenger-ui/src/assets/scss/global/_default.scss b/projects/ucap-webmessenger-ui/src/assets/scss/global/_default.scss deleted file mode 100644 index 22f1ca11..00000000 --- a/projects/ucap-webmessenger-ui/src/assets/scss/global/_default.scss +++ /dev/null @@ -1,47 +0,0 @@ -@charset 'utf-8'; - -html { - height: 100%; - overflow-y: scroll; -} -body { - position: relative; - width: 100%; - height: 100%; - padding: 0; - margin: 0; - color: #333; - font-family: '나눔고딕', Malgun Gothic, '맑은고딕', Arial, Dotum, '돋움', - Gulim, '굴림'; - font-size: 13px; - line-height: 18px !important; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; -} -div, -p, -ol, -ul, -li, -h1, -h2, -h3, -h4, -h5, -h6, -form, -iframe, -dl, -dt, -dd { - margin: 0; - padding: 0; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; -} -ul, -ol { - list-style: none; -} diff --git a/tsconfig.json b/tsconfig.json index 21d4c409..f79668c2 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -33,7 +33,6 @@ ], "@ucap-webmessenger/pi": ["projects/ucap-webmessenger-pi/src/public-api"], "@ucap-webmessenger/ui": ["projects/ucap-webmessenger-ui/src/public-api"], - "@ucap-webmessenger/ui/*": ["projects/ucap-webmessenger-ui/src/*"], "@ucap-webmessenger/ui-account": [ "projects/ucap-webmessenger-ui-account/src/public-api" ],