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

Minor fixes on timeline

stable
Xavier Julián 2015-05-12 15:18:28 +02:00 committed by Juanfran
parent 8f3e512f6e
commit 08b731baa0
4 changed files with 17 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/modules/profile/profile-bar/profile-bar.jade
View File

@ -1,10 +1,7 @@
section.profile-bar section.profile-bar
div.profile-image-wrapper div.profile-image-wrapper
img.profile-img(ng-src="{{::vm.user.big_photo}}", alt="{{::vm.user.full_name}}") img.profile-img(ng-src="{{::vm.user.big_photo}}", alt="{{::vm.user.full_name}}")
div.edit-profile(title="{{ 'USER.PROFILE.EDIT' | translate }}") a.profile-edition(title="{{ 'USER.PROFILE.EDIT' | translate }}", tg-nav="user-settings-user-profile", translate="USER.PROFILE.EDIT")
a.profile-edition(title="{{ 'USER.PROFILE.EDIT' | translate }}", tg-nav="user-settings-user-profile")
span.icon.icon-edit
span(translate="USER.PROFILE.EDIT")
// a.button-green // a.button-green
// span(translate="USER.PROFILE.FOLLOW") // span(translate="USER.PROFILE.FOLLOW")
div.profile-data div.profile-data

2
app/modules/profile/profile-timeline-attachment/profile-timeline-attachment-image.jade
View File

@ -1,5 +1,5 @@
// timeline-attachment directive // timeline-attachment directive
div.activity-image-attachment div.activity-image-attachment
blockquote blockquote
a(href="{{::attachment.url}}", title="See {{::attachment.filename}}") a(href="{{::attachment.url}}", title="See {{::attachment.filename}}", target="_blank")
img(ng-src="{{::attachment.url}}", alt="{{::attachment.filename}}") img(ng-src="{{::attachment.url}}", alt="{{::attachment.filename}}")

2
app/modules/profile/profile-timeline-attachment/profile-timeline-attachment.jade
View File

@ -1,5 +1,5 @@
div.single-attachment div.single-attachment
blockquote blockquote
a(ng-href="{{ attachment.url }}", title="Click to download {{ attachment.filename }}") a(ng-href="{{ attachment.url }}", title="Click to download {{ attachment.filename }}", target="_blank")
span.icon.icon-document span.icon.icon-document
span {{attachment.filename}} span {{attachment.filename}}

45
app/modules/profile/styles/profile-bar.scss
View File

@ -9,53 +9,36 @@
filter: brightness(40%) saturate(150%) hue-rotate(60deg); filter: brightness(40%) saturate(150%) hue-rotate(60deg);
transition: all .2s cubic-bezier(.01, .7, 1, 1); transition: all .2s cubic-bezier(.01, .7, 1, 1);
} }
.edit-profile { .profile-edition {
opacity: 1; opacity: 1;
transition: opacity .2s cubic-bezier(.01, .7, 1, 1); transform: translateY(0);
transition: all .2s cubic-bezier(.01, .7, 1, 1);
transition-delay: .3s;
} }
} }
} }
.profile-img { .profile-img {
max-width: 100%; max-width: 100%;
} }
.edit-profile { .profile-edition {
@extend %large; @extend %large;
@extend %light;
background: rgba($black, .4);
bottom: 0; bottom: 0;
color: $white;
left: 0; left: 0;
opacity: 0; opacity: 0;
overflow: hidden;
padding: 1rem;
position: absolute; position: absolute;
right: 0; transform: translateY(100%);
top: 0; width: 100%;
&:hover { &:hover {
.profile-edition { background: rgba($black, .8);
opacity: 1; transition: all .3s cubic-bezier(.01, .7, 1, 1);
transition: all .2s cubic-bezier(.01, .7, 1, 1);
transition-delay: .2s;
}
} }
} }
.profile-edition {
@extend %small;
background: rgba($white, .1);
color: $white;
height: 30px;
left: calc(50% - 55px);
opacity: 0;
padding: .4rem;
position: absolute;
top: calc(50% - 5px);
width: 110px;
.icon-edit {
color: $white;
margin-right: .3rem;
}
&:hover {
background: rgba($white, .4);
color: $white;
transition: all .2s cubic-bezier(.77, .01, .97, .85);
}
}
.button-green { .button-green {
display: block; display: block;
margin-bottom: 1rem; margin-bottom: 1rem;