Merge branch 'template'

2013-09-11 17:26:34 +02:00
parent 67b5fab53f bb5946457a
commit 591f952287
21 changed files with 440 additions and 117 deletions
--- a/templates/admin/default/admin-layout.tpl
+++ b/templates/admin/default/admin-layout.tpl
@@ -224,7 +224,7 @@
 	<script src="http://code.jquery.com/jquery-2.0.3.min.js"></script>

    {debugbar_renderjs}
-    {debugbar_renderresult}
+

 	{block name="after-javascript-include"}{/block}

--- a/templates/admin/default/assets/img/top-bar-logo-save.png
+++ b/templates/admin/default/assets/img/top-bar-logo-save.png
--- a/templates/admin/default/assets/img/top-bar-logo.png
+++ b/templates/admin/default/assets/img/top-bar-logo.png
--- 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;
 	}