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

Multiple style fixes to keep html consistency

stable
Xavier Julián 2014-10-21 13:11:04 +02:00 committed by David Barragán Merino
parent 2370b02fa3
commit 7cd13c5c79
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -349,8 +349,8 @@ module.directive("tgAssignedTo", ["$rootScope", "$tgConfirm", "$tgRepo", "$tgLoa
BlockButtonDirective = ($rootscope, $loading) -> BlockButtonDirective = ($rootscope, $loading) ->
template = """ template = """
<a class="button button-gray item-block">Block</a> <a href="#" class="button button-gray item-block">Block</a>
<a class="button button-red item-unblock">Unblock</a> <a href="#" class="button button-red item-unblock">Unblock</a>
""" """
link = ($scope, $el, $attrs, $model) -> link = ($scope, $el, $attrs, $model) ->
@ -365,9 +365,11 @@ BlockButtonDirective = ($rootscope, $loading) ->
$el.find('.item-unblock').hide() $el.find('.item-unblock').hide()
$el.on "click", ".item-block", (event) -> $el.on "click", ".item-block", (event) ->
event.preventDefault()
$rootscope.$broadcast("block", $model.$modelValue) $rootscope.$broadcast("block", $model.$modelValue)
$el.on "click", ".item-unblock", (event) -> $el.on "click", ".item-unblock", (event) ->
event.preventDefault()
$loading.start($el.find(".item-unblock")) $loading.start($el.find(".item-unblock"))
finish = -> finish = ->
$loading.finish($el.find(".item-unblock")) $loading.finish($el.find(".item-unblock"))

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

@ -54,8 +54,8 @@ block content
section.us-detail-settings section.us-detail-settings
fieldset(tg-task-is-iocaine-button, tg-check-permission="modify_task", ng-model="task") fieldset(tg-task-is-iocaine-button, tg-check-permission="modify_task", ng-model="task")
tg-block-button(tg-check-permission="modify_task", ng-model="task") div(tg-block-button, tg-check-permission="modify_task", ng-model="task")
tg-delete-button(tg-check-permission="delete_task", div(tg-delete-button, tg-check-permission="delete_task",
on-delete-go-to-url="project-backlog", on-delete-go-to-url="project-backlog",
project-slug="{{ project.slug }}", project-slug="{{ project.slug }}",
ng-model="task") ng-model="task")

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

@ -58,7 +58,7 @@
margin-bottom: 0; margin-bottom: 0;
max-width: 94%; max-width: 94%;
&:hover { &:hover {
.save { .edit {
@include transition(opacity .3s linear); @include transition(opacity .3s linear);
opacity: 1; opacity: 1;
} }