From cfefc473e22f79bcc34e971698d3131a817e0072 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xavier=20Juli=C3=A1n?= Date: Wed, 28 Jan 2015 08:51:24 +0100 Subject: [PATCH 1/5] User avatar spinner --- app/partials/user/user-profile.jade | 4 ++-- app/styles/modules/user-settings/user-profile.scss | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/partials/user/user-profile.jade b/app/partials/user/user-profile.jade index ea874a87..5be8ae8b 100644 --- a/app/partials/user/user-profile.jade +++ b/app/partials/user/user-profile.jade @@ -14,8 +14,8 @@ div.wrapper(tg-user-profile, ng-controller="UserSettingsController as ctrl", fieldset(tg-user-avatar) .image-container img.avatar(ng-src="{{user.big_photo}}" alt="avatar") - div.overlay - span.icon.icon-spinner + .overlay + img.loading-spinner(src="/svg/spinner-circle.svg", alt="loading...") input(type="file", id="avatar-field", class="hidden", tg-avatar-model="avatarAttachment") p The image will be cropped to 80x80px.
diff --git a/app/styles/modules/user-settings/user-profile.scss b/app/styles/modules/user-settings/user-profile.scss index 68d11ca2..f167e087 100644 --- a/app/styles/modules/user-settings/user-profile.scss +++ b/app/styles/modules/user-settings/user-profile.scss @@ -33,8 +33,9 @@ @extend %loading-spinner; border: 0; flex-grow: 0; - transform-origin: 32 32; - width: 30%; + max-height: 3rem; + max-width: 3rem; + transform-origin: center center; } p { @extend %xsmall; From f2851413c1edeac5efd2c19351b3ef05e42de9f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xavier=20Juli=C3=A1n?= Date: Wed, 28 Jan 2015 09:38:47 +0100 Subject: [PATCH 2/5] Fix User Profile spinner --- app/styles/modules/user-settings/user-profile.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/styles/modules/user-settings/user-profile.scss b/app/styles/modules/user-settings/user-profile.scss index f167e087..62f39807 100644 --- a/app/styles/modules/user-settings/user-profile.scss +++ b/app/styles/modules/user-settings/user-profile.scss @@ -19,7 +19,7 @@ .overlay { align-content: center; align-items: center; - background: rgba($blackish, .9); + background: rgba($blackish, .8); bottom: 0; display: none; justify-content: center; From 8d51478f70cffa0b6225e738583dadf31264000b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xavier=20Juli=C3=A1n?= Date: Wed, 28 Jan 2015 09:39:06 +0100 Subject: [PATCH 3/5] Fix assigned to spinner --- app/styles/modules/common/assigned-to.scss | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/styles/modules/common/assigned-to.scss b/app/styles/modules/common/assigned-to.scss index 72b2a1de..f68e5126 100644 --- a/app/styles/modules/common/assigned-to.scss +++ b/app/styles/modules/common/assigned-to.scss @@ -12,7 +12,8 @@ } .loading-spinner { @extend %loading-spinner; - margin: 0 auto; + margin: 1rem auto; + max-height: 2rem; max-width: 2rem; } .user-avatar { From 92a5ebe3342a50e3458ddd7dddfd12b9778892f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xavier=20Juli=C3=A1n?= Date: Wed, 28 Jan 2015 09:39:37 +0100 Subject: [PATCH 4/5] Fix Sprints Spinner --- app/coffee/modules/backlog/sprints.coffee | 4 ++-- app/partials/includes/modules/sprints.jade | 2 +- app/styles/modules/backlog/sprints.scss | 14 +++++++++----- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/app/coffee/modules/backlog/sprints.coffee b/app/coffee/modules/backlog/sprints.coffee index 0c8c4479..2216b78e 100644 --- a/app/coffee/modules/backlog/sprints.coffee +++ b/app/coffee/modules/backlog/sprints.coffee @@ -141,7 +141,7 @@ ToggleExcludeClosedSprintsVisualization = ($rootscope, $loading) -> link = ($scope, $el, $attrs) -> # Event Handlers $el.on "click", "", (event) -> - $loading.start($el.siblings('.load')) + $loading.start($el.parent().siblings('.loading-spinner')) $rootscope.$broadcast("backlog:toggle-closed-sprints-visualization") $scope.$on "$destroy", -> @@ -149,7 +149,7 @@ ToggleExcludeClosedSprintsVisualization = ($rootscope, $loading) -> $scope.$on "sprints:loaded", (ctx, sprints) => closedSprints = _.filter(sprints, (sprint) -> sprint.closed) - $loading.finish($el.siblings('.load')) + $loading.finish($el.parent().siblings('.loading-spinner')) #TODO: i18n if closedSprints.length > 0 diff --git a/app/partials/includes/modules/sprints.jade b/app/partials/includes/modules/sprints.jade index ac57261b..3e95cf9d 100644 --- a/app/partials/includes/modules/sprints.jade +++ b/app/partials/includes/modules/sprints.jade @@ -18,7 +18,7 @@ section.sprints a.filter-closed-sprints(href="", ng-show="totalClosedMilestones") span.icon.icon-archive span(tg-backlog-toggle-closed-sprints-visualization="ctrl.excludeClosedSprints") Show closed sprints - span.load + div.loading-spinner div.sprint.sprint-closed(ng-repeat="sprint in closedSprints track by sprint.id" tg-backlog-sprint="sprint", tg-sprint-sortable) include sprint diff --git a/app/styles/modules/backlog/sprints.scss b/app/styles/modules/backlog/sprints.scss index da706f1e..a3014ec6 100644 --- a/app/styles/modules/backlog/sprints.scss +++ b/app/styles/modules/backlog/sprints.scss @@ -24,11 +24,15 @@ margin-right: .3rem; vertical-align: middle; } - .load { - display: inline-block; - margin-left: .3rem; - vertical-align: middle; - } + } + .loading-spinner { + @extend %loading-spinner; + border: 0; + flex-grow: 0; + margin-bottom: 1rem; + max-height: 2rem; + max-width: 2rem; + transform-origin: center center; } .sprint-name { a { From 68d5e4a8bfcb3e49d4d1cb35bd6aa31857caa457 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xavier=20Juli=C3=A1n?= Date: Wed, 28 Jan 2015 10:19:37 +0100 Subject: [PATCH 5/5] Single generic spinner class --- app/styles/dependencies/helpers.scss | 7 ++++--- app/styles/layout/us-detail.scss | 3 --- app/styles/modules/common/history.scss | 6 ------ app/styles/modules/wiki/wiki-nav.scss | 5 ----- 4 files changed, 4 insertions(+), 17 deletions(-) diff --git a/app/styles/dependencies/helpers.scss b/app/styles/dependencies/helpers.scss index 54a5114d..b259563d 100644 --- a/app/styles/dependencies/helpers.scss +++ b/app/styles/dependencies/helpers.scss @@ -59,9 +59,10 @@ padding: 12px; text-align: center; } - .loading-spinner { - @extend %loading-spinner; - } +} + +.loading-spinner { + @extend %loading-spinner; } %button { diff --git a/app/styles/layout/us-detail.scss b/app/styles/layout/us-detail.scss index 8c6dd629..174e1322 100644 --- a/app/styles/layout/us-detail.scss +++ b/app/styles/layout/us-detail.scss @@ -349,9 +349,6 @@ .level-name { color: darken($whitish, 20%); float: right; - .loading-spinner { - @extend %loading-spinner; - } } } diff --git a/app/styles/modules/common/history.scss b/app/styles/modules/common/history.scss index 1b37baae..1cfc957d 100644 --- a/app/styles/modules/common/history.scss +++ b/app/styles/modules/common/history.scss @@ -108,12 +108,6 @@ .preview-icon { opacity: 0; } - .loading-spinner { - @extend %loading-spinner; - max-height: 1rem; - max-width: 1rem; - } - } .show-more-comments { @extend %small; diff --git a/app/styles/modules/wiki/wiki-nav.scss b/app/styles/modules/wiki/wiki-nav.scss index 6b63e87f..08b7a76a 100644 --- a/app/styles/modules/wiki/wiki-nav.scss +++ b/app/styles/modules/wiki/wiki-nav.scss @@ -35,11 +35,6 @@ padding: 8px; text-align: center; width: 100%; - .loading-spinner { - @extend %loading-spinner; - max-height: 1rem; - max-width: 1rem; - } } } .button {