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

Merge remote-tracking branch 'origin/master' into stable

stable
David Barragán Merino 2016-04-29 11:53:44 +02:00
parent af069abae5 a6f023903c
commit ba868a08ee
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/modules/projects/components/watch-project-button/watch-project-button.jade
View File

@ -9,7 +9,7 @@ a.track-button.watch-button.watch-container(
tg-svg(svg-icon="icon-watch") tg-svg(svg-icon="icon-watch")
span(ng-if="!vm.project.get('is_watcher')", translate="PROJECT.WATCH_BUTTON.WATCH") span(ng-if="!vm.project.get('is_watcher')", translate="PROJECT.WATCH_BUTTON.WATCH")
span(ng-if="vm.project.get('is_watcher')", translate="PROJECT.WATCH_BUTTON.WATCHING") span(ng-if="vm.project.get('is_watcher')", translate="PROJECT.WATCH_BUTTON.WATCHING")
tg-svg(svg-icon="icon-arrow-down") tg-svg.watch-options-arrow(svg-icon="icon-arrow-down")
span.track-button-counter( span.track-button-counter(
title="{{ 'PROJECT.WATCH_BUTTON.COUNTER_TITLE'|translate:{total:vm.project.get(\"total_watchers\")||0}:'messageformat' }}", title="{{ 'PROJECT.WATCH_BUTTON.COUNTER_TITLE'|translate:{total:vm.project.get(\"total_watchers\")||0}:'messageformat' }}",

7
app/styles/components/track-btn.scss
View File

@ -25,10 +25,11 @@
background: darken($whitish, 5%); background: darken($whitish, 5%);
transition: background .3s; transition: background .3s;
} }
.icon-arrow-down { }
height: .6rem; .watch-options-arrow {
margin: 0 .5rem 0 auto; margin: 0 .5rem 0 auto;
width: .6rem; svg {
@include svg-size(.75rem);
} }
} }
&:hover { &:hover {