From adca7db4fe7e033240bed48c4ad57a1e35876bc2 Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Mon, 19 Oct 2015 11:52:29 +0200 Subject: [PATCH] update page-loading layoutRef --- .../views/layout_ref/admin_loading.jst.eco | 13 ++++------- app/assets/stylesheets/zammad.scss | 23 +++++++++++-------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/app/assets/javascripts/app/views/layout_ref/admin_loading.jst.eco b/app/assets/javascripts/app/views/layout_ref/admin_loading.jst.eco index 42f9c2da0..ec428eb15 100644 --- a/app/assets/javascripts/app/views/layout_ref/admin_loading.jst.eco +++ b/app/assets/javascripts/app/views/layout_ref/admin_loading.jst.eco @@ -83,14 +83,11 @@
-
-

Email

+
+
-
-
-
Collecting Email Settings..
-
- -
+
+
+
Loading Email Settings
\ No newline at end of file diff --git a/app/assets/stylesheets/zammad.scss b/app/assets/stylesheets/zammad.scss index a1bbedb71..b98ce3df1 100644 --- a/app/assets/stylesheets/zammad.scss +++ b/app/assets/stylesheets/zammad.scss @@ -1632,6 +1632,19 @@ kbd { } } + +.page-loading { + min-height: 500px; + display: flex; + align-items: center; + justify-content: center; +} + +.page-loading-label { + margin-left: 10px; + margin-top: 1px; +} + .dropdown-menu .count { padding-top: 1px; margin-left: 10px; @@ -6415,16 +6428,6 @@ output { } } - &.action--loading { - min-height: 300px; - align-items: center; - justify-content: center; - - .action-loading-label { - margin-left: 10px; - } - } - .action-flow { display: flex; flex-wrap: wrap;