Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger
This commit is contained in:
commit
9d79f3d4bd
|
@ -5,10 +5,8 @@
|
||||||
<div class="app-layout-native-title-bar-title">DS Talk</div>
|
<div class="app-layout-native-title-bar-title">DS Talk</div>
|
||||||
<div class="btn-area">
|
<div class="btn-area">
|
||||||
<ucap-integrated-search-form
|
<ucap-integrated-search-form
|
||||||
*ngIf="!!loginRes"
|
*ngIf="!!loginRes"
|
||||||
(search)="onIntegratedSearch($event)"
|
(search)="onIntegratedSearch($event)" class="input-lineless integrated-search">
|
||||||
class="input-lineless integrated-search"
|
|
||||||
>
|
|
||||||
</ucap-integrated-search-form>
|
</ucap-integrated-search-form>
|
||||||
<div
|
<div
|
||||||
*ngIf="!!loginRes && !!weblink"
|
*ngIf="!!loginRes && !!weblink"
|
||||||
|
|
Loading…
Reference in New Issue
Block a user