Merge branch 'upload_management' of https://github.com/thelia/thelia into upload_management

2013-09-23 12:31:01 +02:00
parent 1ea614be57 19782f6852
commit 144864de09
96 changed files with 6369 additions and 2326 deletions
--- a/templates/admin/default/assets/less/thelia/thelia.less
+++ b/templates/admin/default/assets/less/thelia/thelia.less
@@ -227,6 +227,14 @@
    }
 }

+.tab-content {
+    // Center loading indicator
+    .loading {
+        margin: 8em auto;
+        text-align: center;
+    }
+}
+
 // The overall form container
 .form-container {

@@ -276,5 +284,8 @@
 .loading{
  background: url("@{imgDir}/ajax-loader.gif") no-repeat;
  height: 30px;
-  width: 30px;
+  display: inline-block;
+  line-height: 30px;
+  padding-left: 40px;
+  width: auto;
 }