Fix all release bugs

stable
Xavier Julián 2016-02-01 09:57:23 +01:00
parent 747a190f33
commit 3e9dee18f2
13 changed files with 46 additions and 51 deletions

View File

@ -373,7 +373,6 @@
"DEPRECATED_FILE": "Deprecated?", "DEPRECATED_FILE": "Deprecated?",
"ADD": "Add new attachment. {{maxFileSizeMsg}}", "ADD": "Add new attachment. {{maxFileSizeMsg}}",
"DROP": "Drop attachments here!", "DROP": "Drop attachments here!",
"MAX_FILE_SIZE": "[Max. size: {{maxFileSize}}]",
"SHOW_DEPRECATED": "+ show deprecated atachments", "SHOW_DEPRECATED": "+ show deprecated atachments",
"HIDE_DEPRECATED": "- hide deprecated atachments", "HIDE_DEPRECATED": "- hide deprecated atachments",
"COUNT_DEPRECATED": "({{ counter }} deprecated)", "COUNT_DEPRECATED": "({{ counter }} deprecated)",

View File

@ -20,7 +20,7 @@
} }
label { label {
cursor: pointer; cursor: pointer;
margin-left: 1rem; margin-left: .25rem;
&.add-attachment-button { &.add-attachment-button {
background: $gray; background: $gray;
border: 0; border: 0;
@ -54,6 +54,12 @@
width: 1.6rem; width: 1.6rem;
} }
} }
.size-info {
@extend %light;
@extend %small;
color: $gray;
padding-left: 1rem;
}
input { input {
display: none; display: none;
} }

View File

@ -20,11 +20,6 @@ section.attachments(tg-attachments-drop="vm.addAttachments(files, false)")
tg-check-permission="modify_{{vm.type}}" tg-check-permission="modify_{{vm.type}}"
title!="{{'ATTACHMENT.ADD' | translate}}" title!="{{'ATTACHMENT.ADD' | translate}}"
) )
span.size-info(
ng-if="vm.maxFileSize",
translate="ATTACHMENT.MAX_FILE_SIZE",
translate-values="{ 'maxFileSize': vm.maxFileSize}"
)
label.add-attachment-button(for="add-attach") label.add-attachment-button(for="add-attach")
include ../../../svg/add.svg include ../../../svg/add.svg

View File

@ -4,11 +4,6 @@ section.attachments(tg-attachments-drop="vm.addAttachments(files)")
.attachments-header .attachments-header
h3.attachments-title #[span.attachments-num {{vm.attachments.size}}] #[span.attachments-text(translate="ATTACHMENT.SECTION_NAME")] h3.attachments-title #[span.attachments-num {{vm.attachments.size}}] #[span.attachments-text(translate="ATTACHMENT.SECTION_NAME")]
.add-attach(title!="{{'ATTACHMENT.ADD' | translate}}") .add-attach(title!="{{'ATTACHMENT.ADD' | translate}}")
span.size-info(
translate="ATTACHMENT.MAX_FILE_SIZE"
translate-values="{ 'maxFileSize': vm.maxFileSizeFormated}"
ng-if="vm.maxFileSize"
)
label.add-attachment-button(for="add-attach") label.add-attachment-button(for="add-attach")
include ../../../svg/add.svg include ../../../svg/add.svg
input( input(

View File

@ -51,7 +51,7 @@ ProjectLogoSrcDirective = ($parse) ->
return if not project return if not project
projectLogo = project.get('logo_small_url') projectLogo = project.get('logo_big_url')
if projectLogo if projectLogo
el.attr("src", projectLogo) el.attr("src", projectLogo)

View File

@ -81,7 +81,7 @@
} }
.project-statistics { .project-statistics {
display: flex; display: flex;
flex-basis: 140px; flex-basis: 300px;
justify-content: flex-end; justify-content: flex-end;
svg { svg {
@include svg-size(.8rem); @include svg-size(.8rem);

View File

@ -35,11 +35,8 @@ div.wrapper(
id="logo-field" id="logo-field"
tg-project-logo-model="logoAttachment" tg-project-logo-model="logoAttachment"
) )
p.image-help
span {{ 'ADMIN.PROJECT_PROFILE.LOGO_HELP' | translate }}
span.size-info.hidden(tg-bo-html="maxFileSizeMsg")
a.button-green.change.js-change-logo( a.button-green.change-image.js-change-logo(
href="#" href="#"
title="{{'ADMIN.PROJECT_PROFILE.CHANGE_LOGO' | translate}}" title="{{'ADMIN.PROJECT_PROFILE.CHANGE_LOGO' | translate}}"
) {{'ADMIN.PROJECT_PROFILE.CHANGE_LOGO' | translate}} ) {{'ADMIN.PROJECT_PROFILE.CHANGE_LOGO' | translate}}

View File

@ -3,5 +3,6 @@ a(href="#", class="add-tag hidden", title="{{'COMMON.TAGS.ADD' | translate}}")
span.icon.icon-plus span.icon.icon-plus
span.add-tag-text(translate="COMMON.TAGS.ADD") span.add-tag-text(translate="COMMON.TAGS.ADD")
input(type="text", placeholder="{{'COMMON.TAGS.PLACEHOLDER' | translate}}", class="tag-input hidden") span.add-tag-input
a(href="", title="{{'COMMON.SAVE' | translate}}", class="save icon icon-floppy hidden") input(type="text", placeholder="{{'COMMON.TAGS.PLACEHOLDER' | translate}}", class="tag-input hidden")
a(href="", title="{{'COMMON.SAVE' | translate}}", class="save icon icon-floppy hidden")

View File

@ -27,11 +27,8 @@ div.wrapper(
id="avatar-field" id="avatar-field"
tg-avatar-model="avatarAttachment" tg-avatar-model="avatarAttachment"
) )
p.image-help
span {{ 'USER_PROFILE.IMAGE_HELP' | translate }}
span.size-info.hidden(tg-bo-html="maxFileSizeMsg")
a.button-green.change.js-change-avatar( a.button-green.change-image.js-change-avatar(
href="#" href="#"
title="{{'USER_PROFILE.CHANGE_PHOTO' | translate}}" title="{{'USER_PROFILE.CHANGE_PHOTO' | translate}}"
) {{'USER_PROFILE.CHANGE_PHOTO' | translate}} ) {{'USER_PROFILE.CHANGE_PHOTO' | translate}}

View File

@ -18,14 +18,13 @@
.image { .image {
width: 100%; width: 100%;
} }
.loading-spinner {
}
} }
.change-image {
display: block;
}
.image-container { .image-container {
position: relative; position: relative;
margin-bottom: 0; margin-bottom: .5rem;
} }
.loading-overlay { .loading-overlay {
display: none; display: none;
@ -46,14 +45,10 @@
border: 0; border: 0;
transform-origin: center center; transform-origin: center center;
} }
.image-help {
@extend %xsmall;
line-height: 1rem;
margin-bottom: .5rem;
text-align: center;
}
.use-default-image { .use-default-image {
@extend %xsmall; @extend %xsmall;
display: block;
margin-top: .25rem;
text-align: center; text-align: center;
&:hover { &:hover {
color: $red; color: $red;

View File

@ -51,6 +51,7 @@
.project-card-logo { .project-card-logo {
display: inline-block; display: inline-block;
flex-basis: 50px; flex-basis: 50px;
flex-shrink: 0;
width: 50px; width: 50px;
height: 50px; height: 50px;
margin-right: .5rem; margin-right: .5rem;

View File

@ -10,10 +10,11 @@
.us-title { .us-title {
@extend %large; @extend %large;
@extend %text; @extend %text;
align-items: center; align-items: flex-start;
background: $whitish; background: $whitish;
display: flex; display: flex;
flex: 1; flex: 1;
flex-direction: column;
padding: .5rem; padding: .5rem;
position: relative; position: relative;
transition: all .2s linear; transition: all .2s linear;
@ -57,10 +58,11 @@
align-content: center; align-content: center;
align-items: center; align-items: center;
display: flex; display: flex;
width: 100%;
} }
input { input {
background: $white; background: $white;
flex-grow: 9; flex-grow: 1;
} }
.save-container { .save-container {
flex-grow: 1; flex-grow: 1;
@ -74,6 +76,7 @@
flex: 1; flex: 1;
margin-bottom: 0; margin-bottom: 0;
max-width: 92%; max-width: 92%;
width: 100%;
} }
.us-title-text:hover { .us-title-text:hover {
.icon-edit { .icon-edit {
@ -91,6 +94,7 @@
.us-name { .us-name {
color: $gray; color: $gray;
display: inline-block; display: inline-block;
flex-grow: 1;
line-height: 2.2rem; line-height: 2.2rem;
padding-right: 1rem; padding-right: 1rem;
width: 100%; width: 100%;

View File

@ -60,20 +60,6 @@
.assigned-to-options { .assigned-to-options {
display: inline-block; display: inline-block;
} }
.user-assigned,
.assign-to-me {
color: $primary;
cursor: default;
&:hover {
cursor: pointer;
}
.icon {
vertical-align: middle;
}
> span {
@include ellipsis(80%);
}
}
.icon-delete { .icon-delete {
color: $gray-light; color: $gray-light;
opacity: 0; opacity: 0;
@ -85,4 +71,23 @@
} }
} }
} }
.user-assigned,
.assign-to-me {
cursor: default;
&:hover {
color: currentColor;
}
&.editable {
color: $primary;
&:hover {
cursor: pointer;
}
}
.icon {
vertical-align: middle;
}
> span {
@include ellipsis(80%);
}
}
} }