Merge pull request #166 from sagidayan/UI

- finish
This commit is contained in:
Sagi Dayan 2015-08-03 22:55:54 +03:00
commit 891f3f09ec
2 changed files with 3 additions and 3 deletions

View file

@ -155,11 +155,11 @@
<md-tabs md-dynamic-height md-border-bottom>
<md-tab label="Messages">
<md-card ng-repeat = "msg in userMessages">
<div layout = "column" layout-padding>
<div layout = "row" layout-padding>
<div flex = "30" class="md-avatar">
<img ng-src="{{msg.user.avatar_url}}" style="width:100%">
</div>
<div flex = "20" layout = "row">
<div flex = "20" layout = "column">
<div>
{{msg.user.username}}
</div>

View file

@ -108,7 +108,7 @@
</div>
<md-content class="tabDesign">
<md-card ng-repeat = "msg in projectMessages">
<div layout = "row" layout-padding ng-if="!displayingMessages && msg.isProject">
<div layout = "row" layout-padding ng-if="!displayingMessages && msg.isProject && msg.groupId == project.id">
<div flex = "10">
<img ng-src="{{msg.user.avatar_url}}" style="width:80%">
</div>