From cd31fc239f38afef80271b3a53d1b43487aa9dcd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xavier=20Juli=C3=A1n?= Date: Mon, 27 Oct 2014 09:59:39 +0100 Subject: [PATCH] Add attachment limit size information on avatar and attachments --- app/coffee/modules/common/attachments.coffee | 3 ++- app/partials/user-profile.jade | 8 ++++---- app/styles/modules/common/attachments.scss | 4 ++++ app/styles/modules/user-settings/user-profile.scss | 6 +++++- 4 files changed, 15 insertions(+), 6 deletions(-) diff --git a/app/coffee/modules/common/attachments.coffee b/app/coffee/modules/common/attachments.coffee index 3402a392..fb36ccde 100644 --- a/app/coffee/modules/common/attachments.coffee +++ b/app/coffee/modules/common/attachments.coffee @@ -159,8 +159,9 @@ AttachmentsDirective = ($confirm) -> attachments -
+
+
diff --git a/app/partials/user-profile.jade b/app/partials/user-profile.jade index 0826e8d8..2b4289e5 100644 --- a/app/partials/user-profile.jade +++ b/app/partials/user-profile.jade @@ -24,9 +24,9 @@ block content span.icon.icon-spinner input(type="file", id="avatar-field", class="hidden", tg-avatar-model="avatarAttachment") - - p The image will be cropped to 80x80 size. - a.button.button-green.change Change + p The image will be cropped to 80x80px.
+ span.hidden Maximum upload size is 700Kb + a.button.button-green.change(title="Maximum upload size is 700Kb") Change a.use-gravatar Use gravatar image div.data @@ -60,7 +60,7 @@ block content a.delete-account(href="", title="Delete Taiga account", ng-click="ctrl.openDeleteLightbox()") Delete Taiga account - div.lightbox.lightbox-delete-account.hidden(tg-lb-delete-user) + div.lightbox.lightbox-delete-account.hidden(tg-lb-delete-user) div.lightbox.lightbox-confirm-use-gravatar.hidden include views/modules/lightbox-use-gravatar diff --git a/app/styles/modules/common/attachments.scss b/app/styles/modules/common/attachments.scss index 56a2fdc9..b49b67e0 100644 --- a/app/styles/modules/common/attachments.scss +++ b/app/styles/modules/common/attachments.scss @@ -169,4 +169,8 @@ input { display: none; } + span { + @extend %small; + color: $gray-light; + } } diff --git a/app/styles/modules/user-settings/user-profile.scss b/app/styles/modules/user-settings/user-profile.scss index a720aa64..21c1a219 100644 --- a/app/styles/modules/user-settings/user-profile.scss +++ b/app/styles/modules/user-settings/user-profile.scss @@ -36,9 +36,13 @@ } p { @extend %xsmall; - margin-bottom: 0; + line-height: .8rem; + margin-bottom: .3rem; text-align: center; } + span { + @extend %bold; + } .use-gravatar { @extend %small; cursor: pointer;