Skip to content

U
ulakbus-ui
Commit 964b97b2 authored by Vladimir Baranov's avatar Vladimir Baranov
Browse files
Options

rref #5392. Show close button when chat app screen is empty

parent 6ec07e8c
Hide whitespace changes
Inline Side-by-side
Showing with 20 additions and 9 deletions
app/app.css
View file @ 964b97b2
...@@ -2289,7 +2289,7 @@ table.dataTable thead .sorting:after { ...@@ -2289,7 +2289,7 @@ table.dataTable thead .sorting:after {
margin-top: 15px; margin-top: 15px;
} }
.chat-app .conversation-header .close-chat-app { .chat-app .conversation-header .close-chat-app, .chat-app .conversation-section-empty .close-chat-app {
display: inline-block; display: inline-block;
float: left; float: left;
width: 40px; width: 40px;
...@@ -2303,6 +2303,13 @@ table.dataTable thead .sorting:after { ...@@ -2303,6 +2303,13 @@ table.dataTable thead .sorting:after {
cursor: pointer; cursor: pointer;
} }
.chat-app .conversation-section-empty .close-chat-app {
display: block;
position: absolute;
right: 15px;
top: 0px;
}
.chat-app .conversation-header .chat-app-actions { .chat-app .conversation-header .chat-app-actions {
display: inline-block; display: inline-block;
float: left; float: left;
...@@ -2374,7 +2381,7 @@ table.dataTable thead .sorting:after { ...@@ -2374,7 +2381,7 @@ table.dataTable thead .sorting:after {
border-radius:100%; border-radius:100%;
} }
.chat-app .conversation-section .conversation-body .beginning-of-conversation { .chat-app .conversation-section .conversation-body .beginning-of-conversation, .chat-app .conversation-section-empty .conversation-body {
text-align: center; text-align: center;
font-family: 'robotobold'; font-family: 'robotobold';
font-size: 20px; font-size: 20px;
...@@ -2384,6 +2391,10 @@ table.dataTable thead .sorting:after { ...@@ -2384,6 +2391,10 @@ table.dataTable thead .sorting:after {
border-bottom: 1px solid #f3f3f3; border-bottom: 1px solid #f3f3f3;
} }
.chat-app .conversation-section-empty .conversation-body {
padding-top: 100px;
}
.chat-app .conversation-section .conversation-body .conversation-block { .chat-app .conversation-section .conversation-body .conversation-block {
display:block; display:block;
position:relative; position:relative;
......
app/components/messaging/templates/conversation.html
View file @ 964b97b2
<span class="loader" ng-show="loadingChannel"></span> <span class="loader" ng-show="loadingChannel"></span>
<div class="conversation-section" ng-hide="selectedChannel">
<div class="conversation-body" >
<div class="conversation-body-inner">
<div class="beginning-of-conversation"> <div class="conversation-section conversation-section-empty" ng-hide="selectedChannel">
Select or create channel to begin conversation <div class="close-chat-app" ng-click="hideApp()">
</div> <span class="glyphicon glyphicon-remove" ></span>
</div> </div>
<div class="conversation-body" >
Select or create channel to begin conversation
</div> </div>
</div> </div>
<div class="conversation-section" ng-hide="loadingChannel || !selectedChannel"> <div class="conversation-section" ng-hide="loadingChannel || !selectedChannel">
<div class="conversation-header"> <div class="conversation-header">
<div class="conversation-user"> <div class="conversation-user">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment