Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

adjust organization profile to new changes

Browse source
This commit is contained in:
Felix Niklas 2014-11-14 13:55:24 +01:00
parent 9365dd95e5
commit 21b198c8e5
2 changed files with 30 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/assets/javascripts/app/views/layout_ref/organization_profile.jst.eco
View file

@ -15,6 +15,9 @@
<li role="presentation"><a role="menuitem" tabindex="-1">Benutzer löschen</a> <li role="presentation"><a role="menuitem" tabindex="-1">Benutzer löschen</a>
</ul> </ul>
</div> </div>
<div class="profile-organizationIcon">
<div class="organisation icon"></div>
</div>
<h1>Steuerbüro C. Kaik</h1> <h1>Steuerbüro C. Kaik</h1>
</div> </div>
<div class="profile-section"> <div class="profile-section">
@ -48,19 +51,19 @@
<div class="profile-section"> <div class="profile-section">
<label><%- @T('Members') %></label> <label><%- @T('Members') %></label>
<div class="profile-details horizontal wrap"> <div class="profile-details horizontal wrap">
<div class="profile-detailsEntry"> <div class="profile-organizationMember">
<span class="avatar unique user-popover size-40" data-id="4" style="background-position: -97.5718417033075px -178.430732445616px;">AG</span> <span class="avatar unique user-popover size-40" data-id="4" style="background-position: -97.5718417033075px -178.430732445616px;">AG</span>
<a href="#">Doreen Kubiak</a> <a href="#">Doreen Kubiak</a>
</div> </div>
<div class="profile-detailsEntry"> <div class="profile-organizationMember">
<div class="avatar" style="background-image: url(https://pbs.twimg.com/profile_images/1216362658/DSC_0084-p_bigger.jpg)"></div> <div class="avatar" style="background-image: url(https://pbs.twimg.com/profile_images/1216362658/DSC_0084-p_bigger.jpg)"></div>
<a href="#">Franz Xaver</a> <a href="#">Franz Xaver</a>
</div> </div>
<div class="profile-detailsEntry"> <div class="profile-organizationMember">
<span class="avatar unique user-popover size-40" data-id="4" style="background-position: -27.5718417033075px -17.430732445616px;">JM</span> <span class="avatar unique user-popover size-40" data-id="4" style="background-position: -27.5718417033075px -17.430732445616px;">JM</span>
<a href="#">Julius Müller</a> <a href="#">Julius Müller</a>
</div> </div>
<div class="profile-detailsEntry"> <div class="profile-organizationMember">
<span class="avatar unique user-popover size-40" data-id="4" style="background-position: -97.5718417033075px -178.430732445616px;">HH</span> <span class="avatar unique user-popover size-40" data-id="4" style="background-position: -97.5718417033075px -178.430732445616px;">HH</span>
<a href="#">Hans Hubert</a> <a href="#">Hans Hubert</a>
</div> </div>

24
app/assets/stylesheets/zammad.css.scss
View file

@ -4510,6 +4510,16 @@ label + .wizard-buttonList {
display: block; display: block;
} }
.profile-organizationMember {
@extend .profile-detailsEntry;
@extend .horizontal;
@extend .center;
.avatar {
margin-right: 10px;
}
}
.profile-ticketList { .profile-ticketList {
@extend .flex; @extend .flex;
@extend .vertical; @extend .vertical;
@ -4521,7 +4531,6 @@ label + .wizard-buttonList {
.tasks { .tasks {
@extend .flex; @extend .flex;
@extend .vertical; @extend .vertical;
@extend .justified;
} }
} }
@ -4543,6 +4552,19 @@ label + .wizard-buttonList {
} }
} }
.profile-organizationIcon {
@extend .centered;
width: 80px;
height: 80px;
background: hsl(0,0%,87%);
border-radius: 100%;
opacity: 0.4;
.icon {
transform: scale(1.6);
}
}
/* /*