Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger
This commit is contained in:
leejinho
commit
8ffde2ef54
6
package-lock.json
generated
6
package-lock.json
generated
@ -10737,6 +10737,12 @@
|
||||
"isobject": "^3.0.1"
|
||||
}
|
||||
},
|
||||
"observable-profiler": {
|
||||
"version": "0.1.1",
|
||||
"resolved": "https://registry.npmjs.org/observable-profiler/-/observable-profiler-0.1.1.tgz",
|
||||
"integrity": "sha512-MhUzV7CqrnlKn69Okqx7IIH2nnKl+ZYAEekD4tnwAOTePtbQwR5+TLnHsHLl5zcYanMRDw9ff36vlRmv04fF7Q==",
|
||||
"dev": true
|
||||
},
|
||||
"obuf": {
|
||||
"version": "1.1.2",
|
||||
"resolved": "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz",
|
||||
|
||||
@ -4,59 +4,97 @@
|
||||
</mat-card-header>
|
||||
<mat-card-content>
|
||||
<div fxFlex class="setting-tab">
|
||||
<mat-tab-group animationDuration="0ms" mat-stretch-tabs>
|
||||
<mat-tab-group animationDuration="0ms" vertical>
|
||||
<mat-tab>
|
||||
<ng-template mat-tab-label>
|
||||
<mat-icon>group</mat-icon>
|
||||
asdkfsdkfs
|
||||
<span class="mdi mdi-settings"></span>
|
||||
일반
|
||||
</ng-template>
|
||||
하나
|
||||
</mat-tab>
|
||||
<mat-tab>
|
||||
<ng-template mat-tab-label>
|
||||
<mat-icon>group</mat-icon>
|
||||
asdkfsdkfs
|
||||
<span class="mdi mdi-lock"></span>
|
||||
개인정보취급방침
|
||||
</ng-template>
|
||||
둘
|
||||
</mat-tab>
|
||||
<mat-tab>
|
||||
<ng-template mat-tab-label>
|
||||
<mat-icon>group</mat-icon>
|
||||
asdkfsdkfs
|
||||
알림
|
||||
</ng-template>
|
||||
셋
|
||||
</mat-tab>
|
||||
<mat-tab>
|
||||
<ng-template mat-tab-label>
|
||||
<mat-icon>group</mat-icon>
|
||||
asdkfsdkfs
|
||||
장치
|
||||
</ng-template>
|
||||
넷
|
||||
</mat-tab>
|
||||
<mat-tab>
|
||||
<ng-template mat-tab-label>
|
||||
<mat-icon>group</mat-icon>
|
||||
사용권한
|
||||
</ng-template>
|
||||
넷
|
||||
</mat-tab>
|
||||
<mat-tab>
|
||||
<ng-template mat-tab-label>
|
||||
<mat-icon>group</mat-icon>
|
||||
통화
|
||||
</ng-template>
|
||||
넷
|
||||
</mat-tab>
|
||||
</mat-tab-group>
|
||||
|
||||
<div class="left-side-tabs-body">
|
||||
<div #tabs id="tabs-0" class="left-side-tabs-contents" style="display: block;">
|
||||
<!-- <div class="left-side-tabs-body">
|
||||
<div
|
||||
#tabs
|
||||
id="tabs-0"
|
||||
class="left-side-tabs-contents"
|
||||
style="display: block;"
|
||||
>
|
||||
ddddd
|
||||
</div>
|
||||
<div #tabs id="tabs-1" class="left-side-tabs-contents" style="display: none;">
|
||||
<div
|
||||
#tabs
|
||||
id="tabs-1"
|
||||
class="left-side-tabs-contents"
|
||||
style="display: none;"
|
||||
>
|
||||
dddagadsfgadsf
|
||||
</div>
|
||||
<div #tabs id="tabs-2" class="left-side-tabs-contents" style="display: none;">
|
||||
<div
|
||||
#tabs
|
||||
id="tabs-2"
|
||||
class="left-side-tabs-contents"
|
||||
style="display: none;"
|
||||
>
|
||||
fbkasfldsafkskdf
|
||||
</div>
|
||||
<div #tabs id="tabs-3" class="left-side-tabs-contents" style="display: none;">
|
||||
<div
|
||||
#tabs
|
||||
id="tabs-3"
|
||||
class="left-side-tabs-contents"
|
||||
style="display: none;"
|
||||
>
|
||||
rgkdsfgkdfglkdsflgs
|
||||
</div>
|
||||
</div>
|
||||
</div> -->
|
||||
</div>
|
||||
</mat-card-content>
|
||||
<mat-card-actions class="button-farm flex-row">
|
||||
<button mat-stroked-button (click)="onClickChoice(false)" class="mat-primary">
|
||||
<button
|
||||
mat-stroked-button
|
||||
(click)="onClickChoice(false)"
|
||||
class="mat-primary"
|
||||
>
|
||||
No
|
||||
</button>
|
||||
<button mat-flat-button (click)="onClickChoice(true)" class="mat-primary">
|
||||
Yes
|
||||
</button>
|
||||
</mat-card-actions>
|
||||
</mat-card>
|
||||
</mat-card>
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
::ng-deep .cdk-overlay-pane{
|
||||
width:600px;
|
||||
max-height:90%;
|
||||
.setting-frame{
|
||||
::ng-deep .cdk-overlay-pane {
|
||||
width: 600px;
|
||||
max-height: 90%;
|
||||
.setting-frame {
|
||||
.mat-dialog-container {
|
||||
position: relative;
|
||||
}
|
||||
@ -28,12 +28,12 @@
|
||||
align-items: flex-start;
|
||||
height: calc(100% - 100px);
|
||||
.setting-tab {
|
||||
width:100%;
|
||||
height:100%;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
position: relative;
|
||||
.mat-tab-group {
|
||||
width:100%;
|
||||
height:100%;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
position: relative;
|
||||
}
|
||||
}
|
||||
@ -49,15 +49,3 @@
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
::ng-deep .mat-tab-group {
|
||||
.mat-tab-header{
|
||||
margin-bottom:10px;
|
||||
.mat-tab-labels{
|
||||
border-bottom:2px solid #dddddd;
|
||||
.mat-tab-label{
|
||||
padding:0 10px;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -29,7 +29,9 @@ export class Effects {
|
||||
MessengerSettingsDialogResult
|
||||
>(MessengerSettingsDialogComponent, {
|
||||
width: '800px',
|
||||
maxWidth: '800px',
|
||||
height: '800px',
|
||||
minHeight: '800px',
|
||||
disableClose: false,
|
||||
data: {}
|
||||
});
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -0,0 +1,27 @@
|
||||
// From Font Awesome
|
||||
.#{$mdi-css-prefix}-spin:before {
|
||||
-webkit-animation: #{$mdi-css-prefix}-spin 2s infinite linear;
|
||||
animation: #{$mdi-css-prefix}-spin 2s infinite linear;
|
||||
}
|
||||
|
||||
@-webkit-keyframes #{$mdi-css-prefix}-spin {
|
||||
0% {
|
||||
-webkit-transform: rotate(0deg);
|
||||
transform: rotate(0deg);
|
||||
}
|
||||
100% {
|
||||
-webkit-transform: rotate(359deg);
|
||||
transform: rotate(359deg);
|
||||
}
|
||||
}
|
||||
|
||||
@keyframes #{$mdi-css-prefix}-spin {
|
||||
0% {
|
||||
-webkit-transform: rotate(0deg);
|
||||
transform: rotate(0deg);
|
||||
}
|
||||
100% {
|
||||
-webkit-transform: rotate(359deg);
|
||||
transform: rotate(359deg);
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,10 @@
|
||||
.#{$mdi-css-prefix}:before,
|
||||
.#{$mdi-css-prefix}-set {
|
||||
display: inline-block;
|
||||
font: normal normal normal #{$mdi-font-size-base}/ 1 '#{$mdi-font-name}'; // shortening font declaration
|
||||
font-size: inherit; // can't have font-size inherit on line above, so need to override
|
||||
text-rendering: auto; // optimizelegibility throws things off #1094
|
||||
line-height: inherit;
|
||||
-webkit-font-smoothing: antialiased;
|
||||
-moz-osx-font-smoothing: grayscale;
|
||||
}
|
||||
@ -0,0 +1,65 @@
|
||||
$mdi-sizes: 18 24 36 48;
|
||||
@each $mdi-size in $mdi-sizes {
|
||||
.#{$mdi-css-prefix}-#{$mdi-size}px {
|
||||
&.#{$mdi-css-prefix}-set,
|
||||
&.#{$mdi-css-prefix}:before {
|
||||
font-size: $mdi-size * 1px;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.#{$mdi-css-prefix}-dark {
|
||||
&:before {
|
||||
color: rgba(0, 0, 0, 0.54);
|
||||
}
|
||||
&.#{$mdi-css-prefix}-inactive:before {
|
||||
color: rgba(0, 0, 0, 0.26);
|
||||
}
|
||||
}
|
||||
.#{$mdi-css-prefix}-light {
|
||||
&:before {
|
||||
color: rgba(255, 255, 255, 1);
|
||||
}
|
||||
&.#{$mdi-css-prefix}-inactive:before {
|
||||
color: rgba(255, 255, 255, 0.3);
|
||||
}
|
||||
}
|
||||
|
||||
$mdi-degrees: 45 90 135 180 225 270 315;
|
||||
@each $mdi-degree in $mdi-degrees {
|
||||
.#{$mdi-css-prefix}-rotate-#{$mdi-degree} {
|
||||
&:before {
|
||||
-webkit-transform: rotate(#{$mdi-degree}deg);
|
||||
-ms-transform: rotate(#{$mdi-degree}deg);
|
||||
transform: rotate(#{$mdi-degree}deg);
|
||||
}
|
||||
/*
|
||||
// Not included in production
|
||||
&.#{$mdi-css-prefix}-flip-h:before {
|
||||
-webkit-transform: scaleX(-1) rotate(#{$mdi-degree}deg);
|
||||
transform: scaleX(-1) rotate(#{$mdi-degree}deg);
|
||||
filter: FlipH;
|
||||
-ms-filter: "FlipH";
|
||||
}
|
||||
&.#{$mdi-css-prefix}-flip-v:before {
|
||||
-webkit-transform: scaleY(-1) rotate(#{$mdi-degree}deg);
|
||||
-ms-transform: rotate(#{$mdi-degree}deg);
|
||||
transform: scaleY(-1) rotate(#{$mdi-degree}deg);
|
||||
filter: FlipV;
|
||||
-ms-filter: "FlipV";
|
||||
}
|
||||
*/
|
||||
}
|
||||
}
|
||||
.#{$mdi-css-prefix}-flip-h:before {
|
||||
-webkit-transform: scaleX(-1);
|
||||
transform: scaleX(-1);
|
||||
filter: FlipH;
|
||||
-ms-filter: 'FlipH';
|
||||
}
|
||||
.#{$mdi-css-prefix}-flip-v:before {
|
||||
-webkit-transform: scaleY(-1);
|
||||
transform: scaleY(-1);
|
||||
filter: FlipV;
|
||||
-ms-filter: 'FlipV';
|
||||
}
|
||||
@ -0,0 +1,19 @@
|
||||
@function char($character-code) {
|
||||
@if function-exists('selector-append') {
|
||||
@return unquote('"\\#{$character-code}"');
|
||||
}
|
||||
|
||||
@if "\\#{'x'}"== '\\x' {
|
||||
@return str-slice('\x', 1, 1) + $character-code;
|
||||
} @else {
|
||||
@return #{'"\\'}#{$character-code + '"'};
|
||||
}
|
||||
}
|
||||
|
||||
@function mdi($name) {
|
||||
@if map-has-key($mdi-icons, $name) == false {
|
||||
@warn "Icon #{$name} not found.";
|
||||
@return '';
|
||||
}
|
||||
@return char(map-get($mdi-icons, $name));
|
||||
}
|
||||
@ -0,0 +1,10 @@
|
||||
@each $key, $value in $mdi-icons {
|
||||
.#{$mdi-css-prefix}-#{$key}::before {
|
||||
content: char($value);
|
||||
}
|
||||
}
|
||||
|
||||
.#{$mdi-css-prefix}-blank::before {
|
||||
content: '\F68C';
|
||||
visibility: hidden;
|
||||
}
|
||||
@ -0,0 +1,14 @@
|
||||
@font-face {
|
||||
font-family: '#{$mdi-font-name}';
|
||||
src: url('#{$mdi-font-path}/#{$mdi-filename}-webfont.eot?v=#{$mdi-version}');
|
||||
src: url('#{$mdi-font-path}/#{$mdi-filename}-webfont.eot?#iefix&v=#{$mdi-version}')
|
||||
format('embedded-opentype'),
|
||||
url('#{$mdi-font-path}/#{$mdi-filename}-webfont.woff2?v=#{$mdi-version}')
|
||||
format('woff2'),
|
||||
url('#{$mdi-font-path}/#{$mdi-filename}-webfont.woff?v=#{$mdi-version}')
|
||||
format('woff'),
|
||||
url('#{$mdi-font-path}/#{$mdi-filename}-webfont.ttf?v=#{$mdi-version}')
|
||||
format('truetype');
|
||||
font-weight: normal;
|
||||
font-style: normal;
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,8 @@
|
||||
/* MaterialDesignIcons.com */
|
||||
@import 'variables';
|
||||
@import 'functions';
|
||||
@import 'path';
|
||||
@import 'core';
|
||||
@import 'icons';
|
||||
@import 'extras';
|
||||
@import 'animated';
|
||||
@ -301,6 +301,11 @@ $daesang-grey: (
|
||||
.mat-tab-labels {
|
||||
display: flex;
|
||||
flex-direction: column !important;
|
||||
align-content: flex-start;
|
||||
|
||||
.mat-tab-label {
|
||||
justify-content: flex-start;
|
||||
}
|
||||
}
|
||||
|
||||
.mat-ink-bar {
|
||||
@ -313,12 +318,13 @@ $daesang-grey: (
|
||||
nav[mat-tab-nav-bar][vertical] {
|
||||
display: flex;
|
||||
flex-direction: row !important;
|
||||
|
||||
.mat-tab-links {
|
||||
display: flex;
|
||||
flex-direction: column !important;
|
||||
}
|
||||
}
|
||||
|
||||
nav[mat-tab-nav-bar][vertical] .mat-tab-links {
|
||||
display: flex;
|
||||
flex-direction: column !important;
|
||||
}
|
||||
.messages .container {
|
||||
background: mat-color($accent, 50);
|
||||
}
|
||||
|
||||
@ -1,5 +1,7 @@
|
||||
@import '~perfect-scrollbar/css/perfect-scrollbar.css';
|
||||
|
||||
@import 'assets/fonts/materialdesignicons/scss/materialdesignicons';
|
||||
|
||||
@import '~@ucap-webmessenger-scss/ui/ucap-ui';
|
||||
|
||||
@import 'assets/scss/ucap';
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
.bubble-main {
|
||||
padding: 14px;
|
||||
text-align:left;
|
||||
span{
|
||||
text-align: left;
|
||||
span {
|
||||
word-wrap: break-word;
|
||||
white-space: pre-wrap;
|
||||
word-break: keep-all;
|
||||
word-break: break-word;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user