Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
U
ulakbus-ui
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ulakbus
ulakbus-ui
Commits
964b97b2
Commit
964b97b2
authored
Jul 20, 2016
by
Vladimir Baranov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
rref #5392. Show close button when chat app screen is empty
parent
6ec07e8c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
20 additions
and
9 deletions
+20
-9
app.css
app/app.css
+13
-2
conversation.html
app/components/messaging/templates/conversation.html
+7
-7
No files found.
app/app.css
View file @
964b97b2
...
...
@@ -2289,7 +2289,7 @@ table.dataTable thead .sorting:after {
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
;
float
:
left
;
width
:
40px
;
...
...
@@ -2303,6 +2303,13 @@ table.dataTable thead .sorting:after {
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
{
display
:
inline-block
;
float
:
left
;
...
...
@@ -2374,7 +2381,7 @@ table.dataTable thead .sorting:after {
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
;
font-family
:
'robotobold'
;
font-size
:
20px
;
...
...
@@ -2384,6 +2391,10 @@ table.dataTable thead .sorting:after {
border-bottom
:
1px
solid
#f3f3f3
;
}
.chat-app
.conversation-section-empty
.conversation-body
{
padding-top
:
100px
;
}
.chat-app
.conversation-section
.conversation-body
.conversation-block
{
display
:
block
;
position
:
relative
;
...
...
app/components/messaging/templates/conversation.html
View file @
964b97b2
<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"
>
Select or create channel to begin conversation
</div>
</div>
<div
class=
"conversation-section conversation-section-empty"
ng-hide=
"selectedChannel"
>
<div
class=
"close-chat-app"
ng-click=
"hideApp()"
>
<span
class=
"glyphicon glyphicon-remove"
></span>
</div>
<div
class=
"conversation-body"
>
Select or create channel to begin conversation
</div>
</div>
<div
class=
"conversation-section"
ng-hide=
"loadingChannel || !selectedChannel"
>
<div
class=
"conversation-header"
>
<div
class=
"conversation-user"
>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment