diff --git a/UI/Templates/MailerUI/UIxMailFolderTemplate.wox b/UI/Templates/MailerUI/UIxMailFolderTemplate.wox index 04a4769a0..c7d6a2fcf 100644 --- a/UI/Templates/MailerUI/UIxMailFolderTemplate.wox +++ b/UI/Templates/MailerUI/UIxMailFolderTemplate.wox @@ -5,7 +5,6 @@ xmlns:label="OGo:label">
-

{{mailbox.selectedFolder.$messages.length}} @@ -14,38 +13,43 @@

-
- - -
- -
- -
{{currentMessage.$shortAddress('from')}}
-
{{currentMessage.subject}}
-
-
- warning - star - reply - forward - attach_file -
-
-
+ + +
+ +
+ +
{{currentMessage.$shortAddress('from')}}
+
{{currentMessage.subject}}
+
+
+ warning + star + reply + forward + attach_file +
+
+
+ +
diff --git a/UI/WebServerResources/js/Mailer/Mailbox.service.js b/UI/WebServerResources/js/Mailer/Mailbox.service.js index 6d3dc4de1..62fde844f 100644 --- a/UI/WebServerResources/js/Mailer/Mailbox.service.js +++ b/UI/WebServerResources/js/Mailer/Mailbox.service.js @@ -150,7 +150,7 @@ */ Mailbox.prototype.init = function(data) { var _this = this; - this.$isLoading = false; + this.$isLoading = true; this.$messages = []; this.uidsMap = {}; angular.extend(this, data); diff --git a/UI/WebServerResources/scss/components/progressCircular/_extends.scss b/UI/WebServerResources/scss/components/progressCircular/_extends.scss index fda3a18b0..8a6c57f15 100644 --- a/UI/WebServerResources/scss/components/progressCircular/_extends.scss +++ b/UI/WebServerResources/scss/components/progressCircular/_extends.scss @@ -1,2 +1,2 @@ /*! progressCircular/_extends.scss - */ -@import '../../../angular-material/src/components/progressCircular/progressCircular.scss'; \ No newline at end of file +@import '../../../angular-material/src/components/progressCircular/progress-circular.scss'; \ No newline at end of file diff --git a/UI/WebServerResources/scss/components/progressCircular/progress-circular.scss b/UI/WebServerResources/scss/components/progressCircular/progress-circular.scss index 72cdbcc72..bdbfa0829 100644 --- a/UI/WebServerResources/scss/components/progressCircular/progress-circular.scss +++ b/UI/WebServerResources/scss/components/progressCircular/progress-circular.scss @@ -1,2 +1,18 @@ /// progressCircular.scss -*- Mode: scss; indent-tabs-mode: nil; basic-offset: 2 -*- @import 'extends'; + +.sg-progress-circular-floating { + &.ng-hide { + transform: translate(-50%, 0) scale(0); + } + transition: transform .3s cubic-bezier(0.18, 0.89, 0.32, 1.28); + position: absolute; + top: (10 * $baseline-grid); + left: 50%; + transform: translate(-50%, 0) scale(1); + bottom: auto; + background-color: white; + border-radius: 50%; + padding: $baseline-grid/2; + box-shadow: $whiteframe-shadow-z3; +} \ No newline at end of file diff --git a/UI/WebServerResources/scss/styles.scss b/UI/WebServerResources/scss/styles.scss index 41d7ec800..ef945b7af 100755 --- a/UI/WebServerResources/scss/styles.scss +++ b/UI/WebServerResources/scss/styles.scss @@ -46,8 +46,8 @@ @import 'components/input/input'; @import 'components/list/list'; @import 'components/menu/menu'; -//@import 'components/progressCircular/progress-circular'; -@import 'components/progressLinear/progress-linear'; +@import 'components/progressCircular/progress-circular'; +//@import 'components/progressLinear/progress-linear'; @import 'components/radioButton/radio-button'; @import 'components/select/select'; @import 'components/sidenav/sidenav';