From e502bbff547c8b695515dba4827e8888e102ba94 Mon Sep 17 00:00:00 2001 From: khk Date: Fri, 31 Jan 2020 18:14:55 +0900 Subject: [PATCH] =?UTF-8?q?=EC=83=89=EC=83=81=20=EB=B3=80=EA=B2=BD?= =?UTF-8?q?=EC=97=90=20=EB=94=B0=EB=A5=B8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../messenger/components/intro.component.html | 2 +- .../src/assets/scss/global/_default.scss | 31 ++++++++++++------- .../src/lib/components/tree.component.scss | 12 ------- 3 files changed, 21 insertions(+), 24 deletions(-) diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/intro.component.html b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/intro.component.html index bf350c3a..b6dd54fb 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/intro.component.html +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/intro.component.html @@ -10,7 +10,7 @@ {{ getTitle() }} 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 7db586ab..efb28354 100644 --- a/projects/ucap-webmessenger-app/src/assets/scss/global/_default.scss +++ b/projects/ucap-webmessenger-app/src/assets/scss/global/_default.scss @@ -54,19 +54,20 @@ ol { $lg-red: ( 50: #ffffff, 100: #fff9fc, - 200: #f48fb1, + 200: #f1e1e5, /*300: #f06292,*/ 300: #ef4c73, 400: #ec407a, 500: #ed097e, 600: #d81b60, 700: #c2185b, 800: #ad1457, - /*900: #880e4f,*/900: #5f2a41, + /*900: #880e4f,*/ 900: #5f2a41, A100: #ff80ab, A200: #ff4081, A400: #ff3399, A700: #c51162, B100: #4f4f4f, + B200: #67545b, G100: #ef4c73, G900: #352a37, contrast: ( @@ -92,14 +93,12 @@ $lg-red: ( $aquaBlue-daesang: ( 50: #f9feff, - //#e0f7fa, - /* 100: #b2ebf2,*/ 100: #ebfdff, - /*200: #65e4f5,*/ 200: #a7f3fd, - //#80deea, - 300: #4dd0e1, + 100: #ebfdff, + 200: #a7f3fd, + 300: #4dd0e1, 400: #26c6da, 500: #00bcd4, - /*600: #00acc1,*/ 600: #00b6d5, + 600: #00b6d5, 700: #1ea7b9, 800: #0367a6, 900: #024873, @@ -108,6 +107,7 @@ $aquaBlue-daesang: ( A400: #00e5ff, A700: #06a6c1, B100: #2d3a4a, + B200: #00b6d5, //,#47667fbackgroundcolor G100: #0367a6, /*G900: #192a2c,*/ G900: #6dd5ed, @@ -200,11 +200,11 @@ $daesang-grey: ( color: mat-color($primary, default-contrast); } .bg-accent-dark { - background: mat-color($accent, 600); + background: mat-color($accent, B200); color: mat-color($primary, default-contrast); } .bg-accent-light { - background: mat-color($accent, 300) !important; + background: mat-color($accent, 300); color: mat-color($primary, default-contrast); } .bg-accent-bright { @@ -278,7 +278,8 @@ $daesang-grey: ( .policy { background-color: mat-color($accent, B100); } - .mat-badge-accent .mat-badge-content , .weblink .mat-badge-content{ + .mat-badge-accent .mat-badge-content, + .weblink .mat-badge-content { background-color: mat-color($warn, 400); } @@ -430,4 +431,12 @@ $daesang-grey: ( .translation-preview { background-color: mat-color($accent, 900, 0.8); } + .tree-has-child { + li { + .tree-node-body { + background-color: mat-color($accent, 100); + border: 1px solid mat-color($accent, 200); + } + } + } } 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 5c5e01f7..e50ed777 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 @@ -3,8 +3,6 @@ .tree-node-closer-container { position: relative; - // border: 1px dotted grey; - // border-width: 0 0 1px 1px; .tree-node-closer-top { width: 15px; @@ -13,7 +11,6 @@ border: 1px dotted #cccccc; border-width: 0 0 1px 1px; top: -40px; - // left: 20px; } .tree-node-closer-bottom { width: 15px; @@ -22,7 +19,6 @@ border: 1px dotted #cccccc; border-width: 0 0 1px 1px; top: 0px; - // left: 20px; } .tree-node-closer-top[sub-node] { @@ -52,11 +48,6 @@ list-style-type: none; } - // li:last-child { - // border-left: 1px solid white; - // margin-left: -41px; - // } - .tree-has-child { height: 50px; min-height: 50px; @@ -71,10 +62,7 @@ .tree-node-body { width: 100%; height: 40px; - background-color: #eef9fd; - border: 1px solid #cee1e8; border-radius: 4px; - //padding-bottom: 10px; button { line-height: normal; .mat-button-wrapper {