LupusNobilis
/
sogo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

(css) Fix for md-cards in ACL editor

pull/91/head
Francis Lachapelle 2015-06-23 11:21:50 -04:00
parent b41828a7f1
commit 412dca053a
2 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
UI/Templates/UIxAclEditor.wox
View File

@ -13,9 +13,10 @@
ng-click="acl.selectUser(user)"
ng-class="{ 'sg-collapsed': user.uid != acl.selectedUser.uid, 'sg-expanded': user.uid == acl.selectedUser.uid }">
<md-button>
<div layout="row" layout-align="start center">
<div layout="row" layout-align="start center" class="md-flex">
<span class="card-picture" ng-switch="user.userClass">
<div ng-switch-when="normal-user" class="sg-avatar"><!-- normal-user --></div>
<div ng-switch-when="normal-group" class="sg-list-avatar"><!-- normal-group --></div>
<div ng-switch-when="public-user" class="sg-list-avatar"><!-- public-user --></div>
</span>
<div class="sg-tile-content">

25
UI/WebServerResources/scss/components/card/card.scss
View File

@ -5,7 +5,6 @@ md-card {
overflow: hidden;
md-card-content {
order: 1;
transition: $swift-ease-in-out;
}
@ -13,13 +12,31 @@ md-card {
background-color: sg-color($sogoPaper, 50);
}
// Collapsed/expanded states for cards in ACL editor
&.sg-collapsed, &.sg-expanded {
transition: $swift-ease-in-out;
transition-delay: 0s;
> .md-button {
margin: 0;
flex-direction: row;
}
md-card-content {
order: 1;
transition: $swift-ease-in-out;
transition-delay: 0.1s;
max-height: 500px;
&.ng-hide {
max-height: 0;
padding-bottom: 0;
padding-top: 0;
}
}
}
&.sg-collapsed {
border-radius: 0;
margin-top: 0;
margin-bottom: 0;
> .md-button {
margin: 0;
}
}
&.sg-expanded {