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

Styles fixed on details

stable
Xavier Julián 2014-07-29 12:44:21 +02:00
parent 8c4ac1b309
commit da6673a1f8
7 changed files with 33 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -112,9 +112,9 @@ WatchersDirective = ($rootscope, $confirm) ->
</a> </a>
</div> </div>
<div class="watcher-name"> <div class="watcher-name">
<a href="" title="<%- watcher.full_name_display %>"> <span>
<%- watcher.full_name_display %> <%- watcher.full_name_display %>
</a> </span>
<% if (editable) { %> <% if (editable) { %>
<a class="icon icon-delete" <a class="icon icon-delete"
@ -190,15 +190,14 @@ AssignedToDirective = ($rootscope, $confirm) ->
template = _.template(""" template = _.template("""
<% if (assignedTo) { %> <% if (assignedTo) { %>
<div class="user-avatar"> <div class="user-avatar">
<a href="" title="Assigned to" class="avatar"> <img src="<%= assignedTo.photo %>" alt="<%- assignedTo.full_name_display %>" />
<img src="<%= assignedTo.photo %>" alt="<%- assignedTo.full_name_display %>" />
</a>
</div> </div>
<% } %> <% } %>
<div class="assigned-to"> <div class="assigned-to">
<span class="assigned-title">Assigned to</span> <span class="assigned-title">Assigned to</span>
<a href="" title="edit assignment" class="user-assigned">
<a href="" title="edit assignment" class="user-assigned <% if (editable) { %> editable <% } %>">
<% if (assignedTo) { %> <% if (assignedTo) { %>
<%- assignedTo.full_name_display %> <%- assignedTo.full_name_display %>
<% } else { %> <% } else { %>

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

@ -22,7 +22,7 @@ block content
div.blocked-warning(ng-show="us.is_blocked") div.blocked-warning(ng-show="us.is_blocked")
span.icon.icon-warning span.icon.icon-warning
p.blocked Blocked! p.blocked Trolrororo!
p(tg-bind-html="us.blocked_note || 'This user story is blocked'") p(tg-bind-html="us.blocked_note || 'This user story is blocked'")
div.user-story-tags(tg-tag-line, ng-model="us.tags") div.user-story-tags(tg-tag-line, ng-model="us.tags")

9
app/styles/components/assigned-to.scss
View File

@ -4,18 +4,27 @@
position: relative; position: relative;
.user-avatar { .user-avatar {
@include table-flex-child(1, 0); @include table-flex-child(1, 0);
img {
border-radius: 8%;
width: 100%;
}
} }
.assigned-to { .assigned-to {
@include table-flex-child(3, 0); @include table-flex-child(3, 0);
margin-left: 1rem; margin-left: 1rem;
margin-top: 15px; margin-top: 15px;
.assigned-title { .assigned-title {
@extend %small;
color: $gray-light; color: $gray-light;
display: block; display: block;
} }
.user-assigned { .user-assigned {
@extend %large; @extend %large;
color: $green-taiga; color: $green-taiga;
cursor: default;
&.editable {
cursor: pointer;
}
} }
.icon-delete { .icon-delete {
color: $gray-light; color: $gray-light;

12
app/styles/components/buttons.scss
View File

@ -42,7 +42,7 @@ a.button-green {
} }
} }
.button-gray { a.button-gray {
background: $button-gray; background: $button-gray;
&:hover { &:hover {
background: $button-gray-hover; background: $button-gray-hover;
@ -53,7 +53,7 @@ a.button-green {
} }
} }
.button-blackish { a.button-blackish {
background: $blackish; background: $blackish;
color: $whitish; color: $whitish;
&:hover { &:hover {
@ -65,7 +65,7 @@ a.button-green {
} }
} }
.button-red { a.button-red {
background: $red-light; background: $red-light;
&:hover { &:hover {
background: $red; background: $red;
@ -76,7 +76,7 @@ a.button-green {
} }
} }
.button-orange { a.button-orange {
background: $orange; background: $orange;
&:hover { &:hover {
background: lighten($orange, 10%); background: lighten($orange, 10%);
@ -87,7 +87,7 @@ a.button-green {
} }
} }
.button-block { a.button-block {
background: $white; background: $white;
color: $red; color: $red;
&:hover { &:hover {
@ -96,7 +96,7 @@ a.button-green {
} }
} }
.button-bulk { a.button-bulk {
@extend %button; @extend %button;
background: $green-taiga; background: $green-taiga;
font-size: 22px; font-size: 22px;

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

@ -37,7 +37,7 @@
} }
.watcher-name { .watcher-name {
@include table-flex-child(8, 0); @include table-flex-child(8, 0);
@extend %medium; @extend %small;
color: $grayer; color: $grayer;
margin-left: 1rem; margin-left: 1rem;
position: relative; position: relative;

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

@ -17,6 +17,9 @@
margin-bottom: 1rem; margin-bottom: 1rem;
padding: 2rem 1rem; padding: 2rem 1rem;
position: relative; position: relative;
input {
background: $white;
}
.us-title-text { .us-title-text {
margin-bottom: 0; margin-bottom: 0;
} }
@ -76,6 +79,9 @@
} }
.us-content { .us-content {
textarea {
background: $white;
}
ul { ul {
margin-left: 1rem; margin-left: 1rem;
} }
@ -98,10 +104,12 @@
} }
input { input {
display: inline-block; display: inline-block;
padding: .4rem;
width: 14rem; width: 14rem;
} }
.tag { .tag {
padding: 2px 10px; @extend %small;
padding: .5rem;
} }
} }
@ -201,12 +209,14 @@
} }
.issue-data { .issue-data {
@extend %small;
div { div {
@include clearfix(); @include clearfix();
@include transition(background .2s ease-in); @include transition(background .2s ease-in);
background: darken($whitish, 5%); background: darken($whitish, 5%);
margin-bottom: .5rem; margin-bottom: .5rem;
padding: .5rem; padding: .5rem;
padding-right: 1rem;
&:last-child { &:last-child {
margin: 0; margin: 0;
} }

1
app/styles/modules/common/attachments.scss
View File

@ -8,7 +8,6 @@
padding: .5rem 1rem; padding: .5rem 1rem;
.button { .button {
float: right; float: right;
padding: .2rem 6rem;
} }
.icon, .icon,
.attachments-num, .attachments-num,