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

2013-09-12 12:41:30 +02:00
parent c64b987e9b 3115ee006d
commit 2163121a1a
74 changed files with 2204 additions and 996 deletions
--- a/templates/admin/default/assets/less/thelia/thelia.less
+++ b/templates/admin/default/assets/less/thelia/thelia.less
@@ -40,7 +40,7 @@
        line-height: @topBarHeight;
        height: @topBarHeight;
 		background: url("@{imgDir}/top-bar-logo.png") left -3px no-repeat;
-		padding-left: 100px;
+		padding-left: 170px;
        text-shadow: 0px 1px 1px black;
        color: #6d737b;
 	}
@@ -261,6 +261,6 @@

 .loading{
  background: url("@{imgDir}/ajax-loader.gif") no-repeat;
-  height: 24px;
-  width: 24px;
+  height: 30px;
+  width: 30px;
 }