ucap/next-ucap-messenger
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger

Browse Source
This commit is contained in:
leejinho 2020-01-31 17:17:05 +09:00
commit 9e8c15df82
5 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -1,6 +1,6 @@
{
"name": "ucap-webmessenger",
"version": "0.0.11",
"version": "0.0.12",
"author": {
"name": "LG CNS",
"email": "lgucap@lgcns.com"

2
projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.html
View File

@ -10,7 +10,7 @@
</ucap-integrated-search-form>
<div
*ngIf="!!loginRes && !!weblink"
class="app-layout-native-title-bar-link"
class="app-layout-native-title-bar-link weblink"
>
<ng-container *ngFor="let link of weblink" [ngSwitch]="link.key">
<button

9
projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.scss
View File

@ -48,11 +48,13 @@
-webkit-box-align: center;
align-items: center;
position: relative;
display: inline-block;
display: inline-flex;
min-width: 0;
width: auto;
overflow: hidden;
white-space: nowrap;
align-items: center;
height:100%;
.button {
-webkit-app-region: no-drag;
outline: 0;
@ -69,8 +71,7 @@
text-align: center;
font-size: 10px;
vertical-align: middle;
margin-left: 10px;
transform: translateY(-2px);
margin-right: 12px;
.weblink {
display: inline-flex;
line-height: 24px;
@ -121,7 +122,7 @@
width: 10px;
height: 20px;
border-right: 1px solid rgba(255, 255, 255, 0.3);
margin: 0 10px 0 10px;
margin: 0 10px 0 0;
display: inline-block;
}
.myprofile-item {

8
projects/ucap-webmessenger-app/src/assets/scss/global/_default.scss
View File

@ -52,8 +52,8 @@ ol {
list-style: none;
}
$lg-red: (
50: #fff9fc,
100: #f8bbd0,
50: #ffffff,
100: #fff9fc,
200: #f48fb1,
/*300: #f06292,*/ 300: #ef4c73,
400: #ec407a,
@ -61,7 +61,7 @@ $lg-red: (
600: #d81b60,
700: #c2185b,
800: #ad1457,
900: #880e4f,
/*900: #880e4f,*/900: #5f2a41,
A100: #ff80ab,
A200: #ff4081,
A400: #ff3399,
@ -278,7 +278,7 @@ $daesang-grey: (
.policy {
background-color: mat-color($accent, B100);
}
.mat-badge-accent .mat-badge-content {
.mat-badge-accent .mat-badge-content , .weblink .mat-badge-content{
background-color: mat-color($warn, 400);
}

12
projects/ucap-webmessenger-ui/src/lib/components/integrated-search.component.scss
View File

@ -40,6 +40,18 @@
margin-left: -20px;
.mat-form-field-infix {
padding-left: 26px;
.mat-form-field-label-wrapper {
.mat-form-field-label {
padding-left: 20px;
}
}
}
&:focus {
.mat-form-field-label-wrapper {
.mat-form-field-label {
padding-left: 0;
}
}
}
}
}