Merge branch 'master' of https://github.com/thelia/thelia

2013-09-18 11:55:04 +02:00
parent c7a6fe060f 6483813a35
commit 742b90b24c
239 changed files with 23621 additions and 10230 deletions
--- a/templates/admin/default/assets/less/thelia/thelia.less
+++ b/templates/admin/default/assets/less/thelia/thelia.less
@@ -35,7 +35,7 @@

 .topbar {

-	background: url("@{imgDir}/top.jpg") repeat-x;	
+	background: url("@{imgDir}/top.jpg") repeat-x;
 	font-weight: bold;

 	.version-info {
@@ -203,7 +203,7 @@
        border-bottom: 2px solid #A5CED8;
        margin-bottom: 0.5em;
    }
-    
+
    // The action bar on the right
    .actions {
        text-align: right;
@@ -218,6 +218,10 @@
            text-transform: none;
        }
    }
+
+    .inner-actions {
+        margin-top: 0.5em;
+    }
 }

 // The overall form container