From b8d59a0133e68bf866c70283380bbe6e8fbf7405 Mon Sep 17 00:00:00 2001 From: khk Date: Tue, 7 Jan 2020 19:32:07 +0900 Subject: [PATCH] =?UTF-8?q?sass=EB=B3=80=EA=B2=BD=EB=82=B4=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/assets/scss/global/_default.scss | 5 +++++ .../src/lib/components/tree.component.scss | 21 ++++++++++++------- .../src/assets/scss/partials/_general.scss | 3 +++ .../src/assets/scss/partials/_presence.scss | 2 +- .../float-action-button.component.scss | 10 +++++---- 5 files changed, 29 insertions(+), 12 deletions(-) diff --git a/projects/ucap-webmessenger-app/src/assets/scss/global/_default.scss b/projects/ucap-webmessenger-app/src/assets/scss/global/_default.scss index 6346aee1..d4b8294d 100644 --- a/projects/ucap-webmessenger-app/src/assets/scss/global/_default.scss +++ b/projects/ucap-webmessenger-app/src/assets/scss/global/_default.scss @@ -403,4 +403,9 @@ $daesang-grey: ( } } } + .chat-search-frame { + .chat-search { + background-color: mat-color($accent, 600, 0.7); + } + } } diff --git a/projects/ucap-webmessenger-ui-organization/src/lib/components/tree.component.scss b/projects/ucap-webmessenger-ui-organization/src/lib/components/tree.component.scss index 9fe606d4..5c5e01f7 100644 --- a/projects/ucap-webmessenger-ui-organization/src/lib/components/tree.component.scss +++ b/projects/ucap-webmessenger-ui-organization/src/lib/components/tree.component.scss @@ -1,4 +1,4 @@ -.organization-tree { +::ng-deep .organization-tree { padding: 5px; .tree-node-closer-container { @@ -10,7 +10,7 @@ width: 15px; height: 40px; position: absolute; - border: 1px dotted grey; + border: 1px dotted #cccccc; border-width: 0 0 1px 1px; top: -40px; // left: 20px; @@ -19,7 +19,7 @@ width: 15px; height: 40px; position: absolute; - border: 1px dotted grey; + border: 1px dotted #cccccc; border-width: 0 0 1px 1px; top: 0px; // left: 20px; @@ -74,10 +74,17 @@ background-color: #eef9fd; border: 1px solid #cee1e8; border-radius: 4px; - padding-bottom: 10px; - - .tree-node-expand-btn { - background-color: transparent; + //padding-bottom: 10px; + button { + line-height: normal; + .mat-button-wrapper { + width: 24px; + height: 24px; + .tree-node-expand-btn { + background-color: transparent; + font-size: 20px; + } + } } } } diff --git a/projects/ucap-webmessenger-ui/src/assets/scss/partials/_general.scss b/projects/ucap-webmessenger-ui/src/assets/scss/partials/_general.scss index d1c55201..bad43a32 100644 --- a/projects/ucap-webmessenger-ui/src/assets/scss/partials/_general.scss +++ b/projects/ucap-webmessenger-ui/src/assets/scss/partials/_general.scss @@ -72,3 +72,6 @@ input { a { cursor: pointer; } +[class*='btn'] { + cursor: pointer; +} diff --git a/projects/ucap-webmessenger-ui/src/assets/scss/partials/_presence.scss b/projects/ucap-webmessenger-ui/src/assets/scss/partials/_presence.scss index f64201b6..2ff2ec84 100644 --- a/projects/ucap-webmessenger-ui/src/assets/scss/partials/_presence.scss +++ b/projects/ucap-webmessenger-ui/src/assets/scss/partials/_presence.scss @@ -6,7 +6,7 @@ align-items: center; text-indent: -10000000px; margin-right: 4px; - border-radius: 100px; + border-radius: 50%; } .presence { @extend %presence; diff --git a/projects/ucap-webmessenger-ui/src/lib/components/float-action-button.component.scss b/projects/ucap-webmessenger-ui/src/lib/components/float-action-button.component.scss index 4273023d..5886bc6b 100644 --- a/projects/ucap-webmessenger-ui/src/lib/components/float-action-button.component.scss +++ b/projects/ucap-webmessenger-ui/src/lib/components/float-action-button.component.scss @@ -1,4 +1,4 @@ -.fab-container { +::ng-deep .btn-main-float { position: absolute; bottom: 15px; right: 40px; @@ -12,9 +12,11 @@ flex-direction: column-reverse; align-items: center; margin-bottom: 5px; - - button { - margin-bottom: 17px; + } + button { + margin-bottom: 17px; + .mat-button-wrapper { + line-height: normal; } } }