taiga
/
taiga-front
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix style and directives template refactor on right sidebar of details

stable
Xavier Julián 2014-10-21 10:56:32 +02:00 committed by David Barragán Merino
parent 4feaa08364
commit a91db557d3
7 changed files with 44 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/coffee/modules/common/components.coffee
View File

@ -272,11 +272,13 @@ AssignedToDirective = ($rootscope, $confirm, $repo, $loading) ->
<span class="assigned-title">Assigned to</span> <span class="assigned-title">Assigned to</span>
<a href="" title="edit assignment" class="user-assigned editable"> <a href="" title="edit assignment" class="user-assigned editable">
<span class="assigned-name">
<% if (assignedTo) { %> <% if (assignedTo) { %>
<%- assignedTo.full_name_display %> <%- assignedTo.full_name_display %>
<% } else { %> <% } else { %>
Not assigned Not assigned
<% } %> <% } %>
</span>
<span class="icon icon-arrow-bottom"></span> <span class="icon icon-arrow-bottom"></span>
</a> </a>
<% if (assignedTo!==null) { %> <% if (assignedTo!==null) { %>

10
app/partials/issues-detail.jade
View File

@ -43,12 +43,12 @@ block content
h1(tg-issue-status-display, ng-model="issue") h1(tg-issue-status-display, ng-model="issue")
tg-created-by-display.us-created-by(ng-model="issue") tg-created-by-display.us-created-by(ng-model="issue")
div.issue-data div.issue-data
tg-issue-type-button(ng-model="issue") div.duty-data(tg-issue-type-button, ng-model="issue")
tg-issue-severity-button(ng-model="issue") div.duty-data(tg-issue-severity-button, ng-model="issue")
tg-issue-priority-button(ng-model="issue") div.duty-data(tg-issue-priority-button, ng-model="issue")
tg-issue-status-button(ng-model="issue") div.duty-data(tg-issue-status-button, ng-model="issue")
section.us-assigned-to(tg-assigned-to, ng-model="issue") section.duty-assigned-to(tg-assigned-to, ng-model="issue")
section.watchers(tg-watchers, ng-model="issue") section.watchers(tg-watchers, ng-model="issue")

2
app/partials/task-detail.jade
View File

@ -47,7 +47,7 @@ block content
tg-created-by-display.us-created-by(ng-model="task") tg-created-by-display.us-created-by(ng-model="task")
tg-task-status-button.issue-data(ng-model="task") tg-task-status-button.issue-data(ng-model="task")
section.us-assigned-to(tg-assigned-to, ng-model="task") section.duty-assigned-to(tg-assigned-to, ng-model="task")
section.watchers(tg-watchers, ng-model="task") section.watchers(tg-watchers, ng-model="task")

2
app/partials/us-detail.jade
View File

@ -53,7 +53,7 @@ block content
tg-us-estimation(ng-model="us", save-after-modify="true") tg-us-estimation(ng-model="us", save-after-modify="true")
tg-us-status-button.issue-data(ng-model="us") tg-us-status-button.issue-data(ng-model="us")
section.us-assigned-to(tg-assigned-to, ng-model="us") section.duty-assigned-to(tg-assigned-to, ng-model="us")
section.watchers(tg-watchers, ng-model="us") section.watchers(tg-watchers, ng-model="us")

2
app/styles/components/watchers.scss
View File

@ -1,5 +1,5 @@
.watchers { .watchers {
margin-top: 2rem; margin-top: 1rem;
.watchers-header { .watchers-header {
border-bottom: 2px solid $gray-light; border-bottom: 2px solid $gray-light;
padding: .5rem; padding: .5rem;

27
app/styles/layout/us-detail.scss
View File

@ -271,18 +271,17 @@
.issue-data { .issue-data {
@extend %small; @extend %small;
margin-bottom: 1rem;
.duty-data {
margin-bottom: .5rem;
&:last-child {
margin: 0;
}
div { div {
@include clearfix();
@include transition(background .2s ease-in); @include transition(background .2s ease-in);
background: darken($whitish, 5%); background: darken($whitish, 5%);
padding: .5rem; padding: .5rem;
padding-right: 1rem; padding-right: 1rem;
div {
margin-bottom: .5rem;
}
&:last-child {
margin: 0;
}
} }
.clickable { .clickable {
&:hover { &:hover {
@ -290,6 +289,7 @@
background: darken($whitish, 10%); background: darken($whitish, 10%);
} }
} }
}
.level { .level {
display: inline-block; display: inline-block;
margin-right: .5rem; margin-right: .5rem;
@ -377,16 +377,3 @@
} }
} }
} }
.us-assigned-to {
&.loading {
width: 100%;
span {
font-size: 30px;
padding: 20px 0;
text-align: center;
width: 100%;
@include animation (loading .5s linear);
@include animation (spin 1s linear infinite);
}
}
}

17
app/styles/modules/common/assigned-to.scss
View File

@ -1,7 +1,18 @@
.us-assigned-to { .duty-assigned-to {
@include table-flex(); @include table-flex();
margin-top: 1rem; margin-top: 1rem;
position: relative; position: relative;
&.loading {
width: 100%;
span {
font-size: 30px;
padding: 20px 0;
text-align: center;
width: 100%;
@include animation (loading .5s linear);
@include animation (spin 1s linear infinite);
}
}
.user-avatar { .user-avatar {
@include table-flex-child(1, 0); @include table-flex-child(1, 0);
img { img {
@ -26,6 +37,10 @@
cursor: pointer; cursor: pointer;
} }
} }
.assigned-name {
@include ellipsis(80%);
display: inline-block;
}
.icon-delete { .icon-delete {
color: $gray-light; color: $gray-light;
opacity: 1; opacity: 1;