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
49671b41
Commit
49671b41
authored
Jul 25, 2016
by
Vladimir Baranov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
rref #5392. Update html and styles for readonly conversations
parent
5797b16c
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
3 deletions
+6
-3
app.css
app/app.css
+4
-0
conversation.html
app/components/messaging/templates/conversation.html
+2
-3
No files found.
app/app.css
View file @
49671b41
...
...
@@ -2336,6 +2336,10 @@ table.dataTable thead .sorting:after {
overflow-x
:
hidden
;
}
.chat-app
.conversation-body.readonly
{
height
:
calc
(
100%
-
100px
);
}
.chat-app
.conversation-footer
{
height
:
70px
;
width
:
560px
;
...
...
app/components/messaging/templates/conversation.html
View file @
49671b41
...
...
@@ -31,7 +31,7 @@
</div>
</div>
<div
class=
"conversation-body"
scroll-down-when-update=
"lastMessage"
>
<div
class=
"conversation-body"
ng-class=
"{readonly: selectedChannel.read_only}"
scroll-down-when-update=
"lastMessage"
>
<div
class=
"conversation-body-inner"
>
<div
class=
"beginning-of-conversation"
>
...
...
@@ -65,8 +65,7 @@
</div>
</div>
<div
class=
"conversation-footer"
>
<div
class=
"conversation-footer"
ng-show=
"!selectedChannel.read_only"
>
<textarea
placeholder=
"Mesajını buraya yaz..."
ng-model=
"shared.message"
on-enter-pressed=
"sendMessage(shared.message)"
></textarea>
<div
class=
"add-attachment"
>
<span
class=
"glyphicon glyphicon-send"
ng-click=
"sendMessage(shared.message);"
></span>
...
...
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