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

Merge pull request #911 from taigaio/issue/181/blocked-icon 

Blocked project icon sits over other icons
stable
Juanfran 2016-03-18 12:08:38 +01:00
parent 8516da6c95 b0be8e3013
commit d09927c9a3
7 changed files with 16 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/modules/profile/profile-favs/items/project.jade
View File

@ -18,12 +18,9 @@
tg-nav="project:project=vm.item.get('slug')" tg-nav="project:project=vm.item.get('slug')"
title="{{ ::vm.item.get('name') }}" title="{{ ::vm.item.get('name') }}"
) {{ ::vm.item.get('name') }} ) {{ ::vm.item.get('name') }}
span.private( svg.icon.icon-lock.private(ng-if="::vm.item.get('project_is_private')")
ng-if="::vm.item.get('project_is_private')" use(xlink:href="#icon-lock")
title="{{'PROJECT.PRIVATE' | translate}}" title {{'PROJECT.PRIVATE' | translate}}"
)
svg.icon.icon-lock
use(xlink:href="#icon-lock")
svg.icon.icon-blocked-project(ng-if="vm.item.get('project_blocked_code')") svg.icon.icon-blocked-project(ng-if="vm.item.get('project_blocked_code')")
use(xlink:href="#icon-blocked-project") use(xlink:href="#icon-blocked-project")
title(translate="PROJECT.BLOCKED_PROJECT.BLOCKED") title(translate="PROJECT.BLOCKED_PROJECT.BLOCKED")

9
app/modules/projects/listing/projects-listing.jade
View File

@ -44,12 +44,9 @@
tg-nav="project:project=project.get('slug')" tg-nav="project:project=project.get('slug')"
title="{{ ::project.get('name') }}" title="{{ ::project.get('name') }}"
) {{project.get('name')}} ) {{project.get('name')}}
span.private( svg.icon.icon-lock.private(ng-if="project.get('is_private')")
ng-if="project.get('is_private')" use(xlink:href="#icon-lock")
title="{{'PROJECT.PRIVATE' | translate}}" title {{'PROJECT.PRIVATE' | translate}}"
)
svg.icon.icon-lock
use(xlink:href="#icon-lock")
svg.icon.icon-badge(ng-if="project.get('i_am_owner')") svg.icon.icon-badge(ng-if="project.get('i_am_owner')")
use(xlink:href="#icon-badge") use(xlink:href="#icon-badge")

10
app/modules/projects/project/project.jade
View File

@ -16,12 +16,10 @@ div.wrapper
.intro-title .intro-title
h1 h1
span.project-name {{::vm.project.get("name")}} span.project-name {{::vm.project.get("name")}}
span.private(
ng-if="::vm.project.get('is_private')" svg.icon.icon-lock.private(ng-if="::vm.project.get('is_private')")
title="{{'PROJECT.PRIVATE' | translate}}" use(xlink:href="#icon-lock")
) title {{'PROJECT.PRIVATE' | translate}}"
svg.icon.icon-lock
use(xlink:href="#icon-lock")
div.track-buttons-container(ng-if="vm.user") div.track-buttons-container(ng-if="vm.user")
tg-like-project-button(project="vm.project") tg-like-project-button(project="vm.project")

2
app/styles/components/list-items.scss
View File

@ -45,7 +45,7 @@
@extend %large; @extend %large;
} }
.icon-blocked-project { .icon-blocked-project {
@include svg-size(); @include svg-size(.75rem);
} }
.list-itemtype-project-data-wrapper { .list-itemtype-project-data-wrapper {
display: flex; display: flex;

8
app/styles/components/private.scss
View File

@ -1,10 +1,4 @@
.private { .private {
display: inline-block; fill: $gray-light;
margin-left: .5rem; margin-left: .5rem;
width: .5rem;
svg {
@include svg-size(.5rem);
fill: $gray-light;
transition: fill .3s linear;
}
} }

2
app/styles/dependencies/mixins/project-card.scss
View File

@ -25,7 +25,7 @@
display: flex; display: flex;
margin-top: auto; margin-top: auto;
svg { svg {
@include svg-size(.8rem); @include svg-size(.75rem);
fill: currentColor; fill: currentColor;
margin-right: .25rem; margin-right: .25rem;
} }

3
app/styles/modules/home-project.scss
View File

@ -30,6 +30,9 @@
margin-bottom: 0; margin-bottom: 0;
vertical-align: middle; vertical-align: middle;
} }
.private {
@include svg-size(1.1rem);
}
.like-watch-container { .like-watch-container {
margin-left: auto; margin-left: auto;
} }