From 6bcdd53b6949d04b58d7dccc97ee65689789fc12 Mon Sep 17 00:00:00 2001 From: khk Date: Fri, 3 Jan 2020 10:11:28 +0900 Subject: [PATCH] =?UTF-8?q?top-bar=20=EC=9B=B9=EB=A7=81=ED=81=AC=20?= =?UTF-8?q?=EC=9D=B4=EB=AF=B8=EC=A7=80=20=EA=B5=90=EC=B2=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../native/components/top-bar.component.html | 521 +++++++++++------- .../native/components/top-bar.component.scss | 234 +++++--- .../my-profile-widget.component.html | 28 +- .../my-profile-widget.component.scss | 19 +- 4 files changed, 489 insertions(+), 313 deletions(-) diff --git a/projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.html b/projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.html index a8018145..4b0041ed 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.html +++ b/projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.html @@ -4,186 +4,274 @@
DS Talk
-
- - - - - - - + 웹하드 + + + + + + + + + + + + + - + + + - + + + + E[삭제예정] 마이프로필 설정을 이동--> + +
+
+ - + + - + +
diff --git a/projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.scss b/projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.scss index d7a6f564..7c510063 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.scss +++ b/projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.scss @@ -27,108 +27,162 @@ .app-layout-native-title-bar-spacer { flex: 1 1 auto; } - - .app-layout-native-title-bar-link { - align-items: center; - position: relative; - - .stroke-bar { - width: 1px; - height: 20px; - background-color: rgba(256, 256, 256, 0.3); - margin: 0 10px 0 20px; - display: inline-flex; - } - .button { - -webkit-app-region: no-drag; - outline: 0; - cursor: pointer; - border: none; - height: 28px; - min-width: 28px; - max-width: 28px; - padding: 5px; - line-height: 10px; - border-radius: 0; - background: transparent; - transition: background 0.2s linear, color 0.2s linear; - text-align: center; - font-size: 10px; - vertical-align: middle; - margin-left: 10px; - transform: translateY(-2px); - - &.app-layout-native-title-bar-logout, - &.app-layout-native-title-bar-setting { - background-color: #efefef; + .btn-area { + display: flex; + margin-left: auto; + flex-flow: row; + justify-items: center; + .app-layout-native-title-bar-link { + align-items: center; + position: relative; + display: flex; + .stroke-bar { + width: 1px; + height: 20px; + background-color: rgba(256, 256, 256, 0.3); + margin: 0 10px 0 20px; + display: inline-flex; + } + .button { + -webkit-app-region: no-drag; + outline: 0; + cursor: pointer; + border: none; + height: 30px; + min-width: 30px; + max-width: 30px; + padding: 3px; + line-height: 10px; + background-color: #ffffff; border-radius: 50%; - } - &:hover { - opacity: 0.7; + transition: background 0.2s linear, color 0.2s linear; + text-align: center; + font-size: 10px; + vertical-align: middle; + margin-left: 14px; + .weblink { + display: inline-flex; + line-height: 24px; + font-size: 12px; + font-weight: bold; + text-align: center; + width: 24px; + height: 24px; + background-repeat: no-repeat; + background-position: 50% 50%; + text-indent: -1000000px; + justify-content: center; + &.dsp { + text-indent: 0; + } + &.sms { + text-indent: 0; + letter-spacing: -1px; + } + &.ep, + &.it-service { + text-indent: 0; + font-size: 13px; + } + &.S_OM, + &.Personal-news { + text-indent: 0; + font-size: 11px; + letter-spacing: -1px; + } + } + + &.app-layout-native-title-bar-logout, + &.app-layout-native-title-bar-setting { + background-color: #efefef; + border-radius: 50%; + } + &:hover { + opacity: 0.7; + } } } - } - .app-layout-native-title-bar-actions { - align-items: center; - position: relative; - - .button { - -webkit-app-region: no-drag; - outline: 0; - cursor: pointer; - border: none; - height: 30px; - min-width: 30px; - max-width: 30px; - padding: 5px; - line-height: 10px; - border-radius: 0; - background: transparent; - transition: background 0.2s linear, color 0.2s linear; - text-align: center; - font-size: 10px; - vertical-align: middle; - margin-left: 6px; - transform: translateY(-2px); - .mat-icon { - //transform: translateY(-2px); - width: 16px; - height: 16px; - min-height: 16px; - min-width: 16px; - font-size: 16px; - } - - &.app-layout-native-title-bar-close, - &.app-layout-native-title-bar-maximize, - &.app-layout-native-title-bar-minimize { - color: darken(white, 20%); - font-weight: lighter; - } - - // &.app-layout-native-title-bar-minimize .mat-icon { - // transform: translateY(-43%); - // } - - &:hover { - border-radius: 4px; - &.app-layout-native-title-bar-close { - background: darken(#000000, 10%); - color: darken(white, 0); + .app-layout-native-title-bar-actions { + align-items: center; + position: relative; + .button { + -webkit-app-region: no-drag; + outline: 0; + cursor: pointer; + border: none; + height: 30px; + min-width: 30px; + max-width: 30px; + padding: 5px; + line-height: 10px; + border-radius: 0; + background: transparent; + transition: background 0.2s linear, color 0.2s linear; + text-align: center; + font-size: 10px; + vertical-align: middle; + margin-left: 6px; + transform: translateY(-2px); + .mat-icon { + //transform: translateY(-2px); + width: 16px; + height: 16px; + min-height: 16px; + min-width: 16px; + font-size: 16px; } + &.app-layout-native-title-bar-close, + &.app-layout-native-title-bar-maximize, &.app-layout-native-title-bar-minimize { - background: darken(#000000, 10%); - color: darken(white, 0); + color: darken(white, 20%); + font-weight: lighter; } - &.app-layout-native-title-bar-maximize { - background: darken(#000000, 10%); - color: darken(white, 0); + // &.app-layout-native-title-bar-minimize .mat-icon { + // transform: translateY(-43%); + // } + + &:hover { + border-radius: 4px; + &.app-layout-native-title-bar-close { + background: darken(#000000, 10%); + color: darken(white, 0); + } + + &.app-layout-native-title-bar-minimize { + background: darken(#000000, 10%); + color: darken(white, 0); + } + + &.app-layout-native-title-bar-maximize { + background: darken(#000000, 10%); + color: darken(white, 0); + } } } } } } } +@mixin weblink($color) { + $color: rgba($color, 0.999); + .webhard { + background-image: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' width='20' height='20' viewBox='0 0 24 24' fill='none' stroke='#{$color}' stroke-width='2' stroke-linecap='round' stroke-linejoin='round' %3E%3Cpath d='M4.5,4.3L1.7,10v5c0,0.9,0.7,1.7,1.7,1.7h13.3c0.9,0,1.7-0.7,1.7-1.7v-5l-2.9-5.7c-0.3-0.6-0.9-0.9-1.5-0.9H6 C5.4,3.3,4.8,3.7,4.5,4.3z'/%3E%3Cline class='st0' x1='5' y1='13.3' x2='5' y2='13.3'/%3E%3Cline class='st0' x1='8.3' y1='13.3' x2='8.3' y2='13.3'/%3E%3C/svg%3E"); + } + .vc { + background-image: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' width='20' height='20' viewBox='0 0 24 24' fill='none' stroke='#{$color}' stroke-width='2' stroke-linecap='round' stroke-linejoin='round' class='feather feather-video'%3E%3Cpolygon points='23 7 16 12 23 17 23 7'%3E%3C/polygon%3E%3Crect x='1' y='5' width='15' height='14' rx='2' ry='2'%3E%3C/rect%3E%3C/svg%3E"); + } + .elephant { + background-image: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' width='20' height='20' viewBox='0 0 24 24' fill='#{$color}' stroke='none' xml:space='preserve'%3E%3Cpath d='M19.1,5c-1,0-2,0.4-2.7,1.1c-1.2-1-2.9-1.5-4.7-1.5c-1.7,0-3.3,0.5-4.5,1.4C6.6,5.3,5.7,5,4.8,5C2.6,5,0.9,6.7,0.9,8.8 c0,1.1,1.1,4.6,2.7,5.7c0.3,0.2,0.7,0.3,1.1,0.3c0.2,0,0.4,0,0.6-0.1c0.5-0.2,0.9-0.4,1.3-0.6c0.6,0.6,1.3,1,2.1,1.4l0.8,1.2 c0.3,0.5,0.5,1.1,0.6,1.7H9.2c-0.7,0-1.2,0.6-1.2,1.2s0.6,1.2,1.2,1.2h0.4c2.5,0,4.6-1.7,5.2-4.1l0.4-1.4c0.7-0.4,1.4-0.8,1.9-1.3 c0.4,0.3,0.9,0.5,1.5,0.8c0.2,0.1,0.4,0.1,0.6,0.1c0.4,0,0.7-0.1,1.1-0.3c1.6-1.1,2.7-4.6,2.7-5.7C22.9,6.7,21.2,5,19.1,5z M5,14.1 c-0.3,0.1-0.7,0.1-1-0.2C2.7,13,1.7,9.8,1.7,8.8c0-1.7,1.4-3.1,3.1-3.1c0.7,0,1.4,0.3,2,0.7C6.4,6.8,6.1,7.1,5.8,7.5 C5.5,7.3,5.1,7.2,4.8,7.2c-1.2,0-2.1,1-2.1,2.1c0,0.6,0.6,2.5,1.5,3.1c0.2,0.1,0.4,0.2,0.6,0.2c0.1,0,0.3,0,0.4-0.1 c0.1,0,0.2-0.1,0.3-0.1c0.2,0.4,0.4,0.8,0.7,1.1C5.8,13.8,5.4,13.9,5,14.1z M5.1,11.8c-0.1,0-0.2,0.1-0.3,0.1 c-0.1,0-0.2,0.1-0.4-0.1c-0.6-0.4-1.2-2-1.2-2.5c0-0.8,0.6-1.4,1.4-1.4C5,7.9,5.2,8,5.4,8.1c-0.3,0.7-0.5,1.4-0.5,2.2 C4.9,10.8,5,11.3,5.1,11.8z M14.7,14.8c-0.1,0-0.2,0.1-0.2,0.2l-0.4,1.6c-0.5,2.1-2.4,3.5-4.5,3.5H9.2c-0.3,0-0.5-0.2-0.5-0.5 c0-0.3,0.2-0.5,0.5-0.5h1.1c0.3,0,0.5-0.2,0.5-0.5c0-0.8-0.2-1.6-0.7-2.3L9.3,15c0-0.1-0.1-0.1-0.2-0.1c-0.8-0.3-1.5-0.8-2.1-1.3 c0,0,0-0.1-0.1-0.1c0,0-0.1-0.1-0.1-0.1c-0.4-0.4-0.7-0.9-0.9-1.4c0,0,0-0.1,0-0.1c-0.2-0.5-0.3-1-0.3-1.5c0-2.8,2.7-5,6.1-5 s6.1,2.3,6.1,5C17.9,12.2,16.7,13.9,14.7,14.8z M18.2,8.3c0.3-0.2,0.6-0.4,0.9-0.4c0.8,0,1.4,0.6,1.4,1.4c0,0.5-0.5,2.1-1.2,2.5 C19.2,12,19.1,12,19,11.9c-0.2-0.1-0.4-0.2-0.6-0.3c0.1-0.4,0.2-0.9,0.2-1.3C18.6,9.6,18.5,8.9,18.2,8.3z M19.8,13.9 c-0.3,0.2-0.7,0.3-1,0.2c-0.5-0.2-0.9-0.4-1.3-0.7c0.3-0.3,0.5-0.7,0.7-1.1c0.2,0.1,0.4,0.2,0.6,0.3c0.1,0.1,0.3,0.1,0.4,0.1 c0.2,0,0.4-0.1,0.6-0.2c0.9-0.6,1.5-2.5,1.5-3.1c0-1.2-1-2.1-2.1-2.1c-0.5,0-0.9,0.2-1.3,0.4c-0.2-0.4-0.5-0.7-0.9-1.1 c0.6-0.6,1.3-0.9,2.1-0.9c1.7,0,3.1,1.4,3.1,3.1C22.2,9.8,21.1,13,19.8,13.9z'/%3E%3Cpath d='M11.5,16.5h1c0.3,0,0.5-0.2,0.5-0.5s-0.2-0.5-0.5-0.5h-1c-0.3,0-0.5,0.2-0.5,0.5S11.2,16.5,11.5,16.5z'/%3E%3Cpath d='M13,17.6H11c-0.3,0-0.5,0.2-0.5,0.5s0.2,0.5,0.5,0.5H13c0.3,0,0.5-0.2,0.5-0.5S13.3,17.6,13,17.6z'/%3E%3Cpath d='M17,12.4c0,0.5-0.4,0.8-0.8,0.8c-0.5,0-0.8-0.4-0.8-0.8s0.4-0.8,0.8-0.8C16.7,11.6,17,12,17,12.4z'/%3E%3Cpath d='M8.5,12.4c0,0.5-0.4,0.8-0.8,0.8c-0.5,0-0.8-0.4-0.8-0.8s0.4-0.8,0.8-0.8C8.1,11.6,8.5,12,8.5,12.4z'/%3E%3C/svg%3E"); + } + .mail { + background-image: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' width='20' height='20' viewBox='0 0 24 24' fill='none' stroke='#{$color}' stroke-width='2' stroke-linecap='round' stroke-linejoin='round' %3E%3Cpath d='M4 4h16c1.1 0 2 .9 2 2v12c0 1.1-.9 2-2 2H4c-1.1 0-2-.9-2-2V6c0-1.1.9-2 2-2z'%3E%3C/path%3E%3Cpolyline points='22,6 12,13 2,6'%3E%3C/polyline%3E%3C/svg%3E"); + } + .approved { + background-image: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' width='20' height='20' viewBox='0 0 24 24' fill='none' stroke='#{$color}' stroke-width='2' stroke-linecap='round' stroke-linejoin='round' %3E%3Cpath d='M20.24 12.24a6 6 0 0 0-8.49-8.49L5 10.5V19h8.5z'%3E%3C/path%3E%3Cline x1='16' y1='8' x2='2' y2='22'%3E%3C/line%3E%3Cline x1='17.5' y1='15' x2='9' y2='15'%3E%3C/line%3E%3C/svg%3E"); + } +} + +@include weblink(#425888); diff --git a/projects/ucap-webmessenger-ui-profile/src/lib/components/my-profile-widget.component.html b/projects/ucap-webmessenger-ui-profile/src/lib/components/my-profile-widget.component.html index d6494589..6d570800 100644 --- a/projects/ucap-webmessenger-ui-profile/src/lib/components/my-profile-widget.component.html +++ b/projects/ucap-webmessenger-ui-profile/src/lib/components/my-profile-widget.component.html @@ -10,18 +10,20 @@
- - - +
diff --git a/projects/ucap-webmessenger-ui-profile/src/lib/components/my-profile-widget.component.scss b/projects/ucap-webmessenger-ui-profile/src/lib/components/my-profile-widget.component.scss index d4c2e313..79df6ce6 100644 --- a/projects/ucap-webmessenger-ui-profile/src/lib/components/my-profile-widget.component.scss +++ b/projects/ucap-webmessenger-ui-profile/src/lib/components/my-profile-widget.component.scss @@ -3,7 +3,6 @@ flex-flow: row; width: 60px; height: 30px; - bottom: 10px; color: #ffffff; font-size: 11px; justify-items: flex-end; @@ -28,6 +27,7 @@ } .btn-setting { position: absolute; + height: 100%; bottom: 0; display: inline-flex; justify-items: flex-end; @@ -36,13 +36,22 @@ display: inline-block; bottom: 0; width: 10px; - height: 11px; + height: 10px; border: 1px solid #ffffff; align-self: flex-end; } - svg { - &.on { - transform: rotate(180deg); + button { + cursor: pointer; + width: 20px; + height: 100%; + align-items: center; + background: none; + border: none; + svg { + stroke: #ffffff; + &.on { + transform: rotate(180deg); + } } } }