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

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/locales/taiga/locale-en.json
View File

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

8
app/modules/attachments/attachments.scss
View File

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

5
app/modules/components/attachments-full/attachments-full.jade
View File

@ -20,11 +20,6 @@ section.attachments(tg-attachments-drop="vm.addAttachments(files, false)")
tg-check-permission="modify_{{vm.type}}"
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")
include ../../../svg/add.svg

5
app/modules/components/attachments-simple/attachments-simple.jade
View File

@ -4,11 +4,6 @@ section.attachments(tg-attachments-drop="vm.addAttachments(files)")
.attachments-header
h3.attachments-title #[span.attachments-num {{vm.attachments.size}}] #[span.attachments-text(translate="ATTACHMENT.SECTION_NAME")]
.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")
include ../../../svg/add.svg
input(

2
app/modules/components/project-logo-src/project-logo-src.directive.coffee
View File

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

2
app/modules/discover/discover-search/discover-search.scss
View File

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

5
app/partials/admin/admin-project-profile.jade
View File

@ -35,11 +35,8 @@ div.wrapper(
id="logo-field"
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="#"
title="{{'ADMIN.PROJECT_PROFILE.CHANGE_LOGO' | translate}}"
) {{'ADMIN.PROJECT_PROFILE.CHANGE_LOGO' | translate}}

5
app/partials/common/tag/tag-line.jade
View File

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

5
app/partials/user/user-profile.jade
View File

@ -27,11 +27,8 @@ div.wrapper(
id="avatar-field"
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="#"
title="{{'USER_PROFILE.CHANGE_PHOTO' | translate}}"
) {{'USER_PROFILE.CHANGE_PHOTO' | translate}}

15
app/styles/dependencies/mixins/profile-form.scss
View File

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

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

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

8
app/styles/layout/ticket-detail.scss
View File

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

33
app/styles/modules/common/assigned-to.scss
View File

@ -60,20 +60,6 @@
.assigned-to-options {
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 {
color: $gray-light;
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%);
}
}
}