From 4e06b1fdd54743bad897c51699db8266655ceb05 Mon Sep 17 00:00:00 2001
From: Kevin Granger <shipowlata@gmail.com>
Date: Tue, 12 Nov 2013 14:50:19 +0100
Subject: [PATCH] // update Bootstrap 3.0.2 + fix tree header

---
 admin-dev/themes/default/css/admin-theme.css  | 27 ++++++++++++++-----
 .../default/scss/admin-theme/_admin-tree.sass |  1 -
 .../helpers/tree/tree_associated_header.tpl   |  2 +-
 .../template/helpers/tree/tree_header.tpl     |  2 +-
 4 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/admin-dev/themes/default/css/admin-theme.css b/admin-dev/themes/default/css/admin-theme.css
index ad9bff087..a2ebb57f2 100644
--- a/admin-dev/themes/default/css/admin-theme.css
+++ b/admin-dev/themes/default/css/admin-theme.css
@@ -240,9 +240,9 @@ pre code { padding: 0; font-size: inherit; color: inherit; white-space: pre-wrap
 .row:before, #dashboard .data_list_vertical:before, .row:after, #dashboard .data_list_vertical:after { content: " "; /* 1 */ display: table; /* 2 */ }
 .row:after, #dashboard .data_list_vertical:after { clear: both; }
 
-.col-xs-11, .col-sm-11, .col-md-11, .col-lg-11, .col-xs-10, .col-sm-10, .col-md-10, .col-lg-10, .col-xs-9, .col-sm-9, .col-md-9, .col-lg-9, .col-xs-8, .col-sm-8, .col-md-8, .col-lg-8, .col-xs-7, .col-sm-7, .col-md-7, .col-lg-7, .col-xs-6, .col-sm-6, .col-md-6, .col-lg-6, .col-xs-5, .col-sm-5, .col-md-5, .col-lg-5, .col-xs-4, #dashboard .data_list_vertical li, .col-sm-4, .col-md-4, .col-lg-4, .col-xs-3, .col-sm-3, .col-md-3, .col-lg-3, .col-xs-2, .col-sm-2, .col-md-2, .col-lg-2, .col-xs-1, .col-sm-1, .col-md-1, .col-lg-1, .col-xs-12, .col-sm-12, .col-md-12, .col-lg-12 { position: relative; min-height: 1px; padding-left: 5px; padding-right: 5px; }
+.col-xs-12, .col-sm-12, .col-md-12, .col-lg-12, .col-xs-11, .col-sm-11, .col-md-11, .col-lg-11, .col-xs-10, .col-sm-10, .col-md-10, .col-lg-10, .col-xs-9, .col-sm-9, .col-md-9, .col-lg-9, .col-xs-8, .col-sm-8, .col-md-8, .col-lg-8, .col-xs-7, .col-sm-7, .col-md-7, .col-lg-7, .col-xs-6, .col-sm-6, .col-md-6, .col-lg-6, .col-xs-5, .col-sm-5, .col-md-5, .col-lg-5, .col-xs-4, #dashboard .data_list_vertical li, .col-sm-4, .col-md-4, .col-lg-4, .col-xs-3, .col-sm-3, .col-md-3, .col-lg-3, .col-xs-2, .col-sm-2, .col-md-2, .col-lg-2, .col-xs-1, .col-sm-1, .col-md-1, .col-lg-1 { position: relative; min-height: 1px; padding-left: 5px; padding-right: 5px; }
 
-.col-xs-11, .col-xs-10, .col-xs-9, .col-xs-8, .col-xs-7, .col-xs-6, .col-xs-5, .col-xs-4, #dashboard .data_list_vertical li, .col-xs-3, .col-xs-2, .col-xs-1, .col-xs-12 { float: left; }
+.col-xs-12, .col-xs-11, .col-xs-10, .col-xs-9, .col-xs-8, .col-xs-7, .col-xs-6, .col-xs-5, .col-xs-4, #dashboard .data_list_vertical li, .col-xs-3, .col-xs-2, .col-xs-1 { float: left; }
 
 .col-xs-1 { width: 8.33333%; }
 
@@ -268,6 +268,8 @@ pre code { padding: 0; font-size: inherit; color: inherit; white-space: pre-wrap
 
 .col-xs-12 { width: 100%; }
 
+.col-xs-pull-0 { right: 0%; }
+
 .col-xs-pull-1 { right: 8.33333%; }
 
 .col-xs-pull-2 { right: 16.66667%; }
@@ -292,6 +294,8 @@ pre code { padding: 0; font-size: inherit; color: inherit; white-space: pre-wrap
 
 .col-xs-pull-12 { right: 100%; }
 
+.col-xs-push-0 { left: 0%; }
+
 .col-xs-push-1 { left: 8.33333%; }
 
 .col-xs-push-2 { left: 16.66667%; }
@@ -316,6 +320,8 @@ pre code { padding: 0; font-size: inherit; color: inherit; white-space: pre-wrap
 
 .col-xs-push-12 { left: 100%; }
 
+.col-xs-offset-0 { margin-left: 0%; }
+
 .col-xs-offset-1 { margin-left: 8.33333%; }
 
 .col-xs-offset-2 { margin-left: 16.66667%; }
@@ -341,7 +347,7 @@ pre code { padding: 0; font-size: inherit; color: inherit; white-space: pre-wrap
 .col-xs-offset-12 { margin-left: 100%; }
 
 @media (min-width: 768px) { .container { width: 728px; }
-  .col-sm-11, .col-sm-10, .col-sm-9, .col-sm-8, .col-sm-7, .col-sm-6, .col-sm-5, .col-sm-4, .col-sm-3, .col-sm-2, .col-sm-1, .col-sm-12 { float: left; }
+  .col-sm-12, .col-sm-11, .col-sm-10, .col-sm-9, .col-sm-8, .col-sm-7, .col-sm-6, .col-sm-5, .col-sm-4, .col-sm-3, .col-sm-2, .col-sm-1 { float: left; }
   .col-sm-1 { width: 8.33333%; }
   .col-sm-2 { width: 16.66667%; }
   .col-sm-3 { width: 25%; }
@@ -354,6 +360,7 @@ pre code { padding: 0; font-size: inherit; color: inherit; white-space: pre-wrap
   .col-sm-10 { width: 83.33333%; }
   .col-sm-11 { width: 91.66667%; }
   .col-sm-12 { width: 100%; }
+  .col-sm-pull-0 { right: 0%; }
   .col-sm-pull-1 { right: 8.33333%; }
   .col-sm-pull-2 { right: 16.66667%; }
   .col-sm-pull-3 { right: 25%; }
@@ -366,6 +373,7 @@ pre code { padding: 0; font-size: inherit; color: inherit; white-space: pre-wrap
   .col-sm-pull-10 { right: 83.33333%; }
   .col-sm-pull-11 { right: 91.66667%; }
   .col-sm-pull-12 { right: 100%; }
+  .col-sm-push-0 { left: 0%; }
   .col-sm-push-1 { left: 8.33333%; }
   .col-sm-push-2 { left: 16.66667%; }
   .col-sm-push-3 { left: 25%; }
@@ -378,6 +386,7 @@ pre code { padding: 0; font-size: inherit; color: inherit; white-space: pre-wrap
   .col-sm-push-10 { left: 83.33333%; }
   .col-sm-push-11 { left: 91.66667%; }
   .col-sm-push-12 { left: 100%; }
+  .col-sm-offset-0 { margin-left: 0%; }
   .col-sm-offset-1 { margin-left: 8.33333%; }
   .col-sm-offset-2 { margin-left: 16.66667%; }
   .col-sm-offset-3 { margin-left: 25%; }
@@ -391,7 +400,7 @@ pre code { padding: 0; font-size: inherit; color: inherit; white-space: pre-wrap
   .col-sm-offset-11 { margin-left: 91.66667%; }
   .col-sm-offset-12 { margin-left: 100%; } }
 @media (min-width: 992px) { .container { width: 940px; }
-  .col-md-11, .col-md-10, .col-md-9, .col-md-8, .col-md-7, .col-md-6, .col-md-5, .col-md-4, .col-md-3, .col-md-2, .col-md-1, .col-md-12 { float: left; }
+  .col-md-12, .col-md-11, .col-md-10, .col-md-9, .col-md-8, .col-md-7, .col-md-6, .col-md-5, .col-md-4, .col-md-3, .col-md-2, .col-md-1 { float: left; }
   .col-md-1 { width: 8.33333%; }
   .col-md-2 { width: 16.66667%; }
   .col-md-3 { width: 25%; }
@@ -404,6 +413,7 @@ pre code { padding: 0; font-size: inherit; color: inherit; white-space: pre-wrap
   .col-md-10 { width: 83.33333%; }
   .col-md-11 { width: 91.66667%; }
   .col-md-12 { width: 100%; }
+  .col-md-pull-0 { right: 0%; }
   .col-md-pull-1 { right: 8.33333%; }
   .col-md-pull-2 { right: 16.66667%; }
   .col-md-pull-3 { right: 25%; }
@@ -416,6 +426,7 @@ pre code { padding: 0; font-size: inherit; color: inherit; white-space: pre-wrap
   .col-md-pull-10 { right: 83.33333%; }
   .col-md-pull-11 { right: 91.66667%; }
   .col-md-pull-12 { right: 100%; }
+  .col-md-push-0 { left: 0%; }
   .col-md-push-1 { left: 8.33333%; }
   .col-md-push-2 { left: 16.66667%; }
   .col-md-push-3 { left: 25%; }
@@ -428,6 +439,7 @@ pre code { padding: 0; font-size: inherit; color: inherit; white-space: pre-wrap
   .col-md-push-10 { left: 83.33333%; }
   .col-md-push-11 { left: 91.66667%; }
   .col-md-push-12 { left: 100%; }
+  .col-md-offset-0 { margin-left: 0%; }
   .col-md-offset-1 { margin-left: 8.33333%; }
   .col-md-offset-2 { margin-left: 16.66667%; }
   .col-md-offset-3 { margin-left: 25%; }
@@ -441,7 +453,7 @@ pre code { padding: 0; font-size: inherit; color: inherit; white-space: pre-wrap
   .col-md-offset-11 { margin-left: 91.66667%; }
   .col-md-offset-12 { margin-left: 100%; } }
 @media (min-width: 1200px) { .container { width: 1170px; }
-  .col-lg-11, .col-lg-10, .col-lg-9, .col-lg-8, .col-lg-7, .col-lg-6, .col-lg-5, .col-lg-4, .col-lg-3, .col-lg-2, .col-lg-1, .col-lg-12 { float: left; }
+  .col-lg-12, .col-lg-11, .col-lg-10, .col-lg-9, .col-lg-8, .col-lg-7, .col-lg-6, .col-lg-5, .col-lg-4, .col-lg-3, .col-lg-2, .col-lg-1 { float: left; }
   .col-lg-1 { width: 8.33333%; }
   .col-lg-2 { width: 16.66667%; }
   .col-lg-3 { width: 25%; }
@@ -454,6 +466,7 @@ pre code { padding: 0; font-size: inherit; color: inherit; white-space: pre-wrap
   .col-lg-10 { width: 83.33333%; }
   .col-lg-11 { width: 91.66667%; }
   .col-lg-12 { width: 100%; }
+  .col-lg-pull-0 { right: 0%; }
   .col-lg-pull-1 { right: 8.33333%; }
   .col-lg-pull-2 { right: 16.66667%; }
   .col-lg-pull-3 { right: 25%; }
@@ -466,6 +479,7 @@ pre code { padding: 0; font-size: inherit; color: inherit; white-space: pre-wrap
   .col-lg-pull-10 { right: 83.33333%; }
   .col-lg-pull-11 { right: 91.66667%; }
   .col-lg-pull-12 { right: 100%; }
+  .col-lg-push-0 { left: 0%; }
   .col-lg-push-1 { left: 8.33333%; }
   .col-lg-push-2 { left: 16.66667%; }
   .col-lg-push-3 { left: 25%; }
@@ -478,6 +492,7 @@ pre code { padding: 0; font-size: inherit; color: inherit; white-space: pre-wrap
   .col-lg-push-10 { left: 83.33333%; }
   .col-lg-push-11 { left: 91.66667%; }
   .col-lg-push-12 { left: 100%; }
+  .col-lg-offset-0 { margin-left: 0%; }
   .col-lg-offset-1 { margin-left: 8.33333%; }
   .col-lg-offset-2 { margin-left: 16.66667%; }
   .col-lg-offset-3 { margin-left: 25%; }
@@ -3688,7 +3703,7 @@ td.actions { min-width: 200px; }
 .tree .tree-item-disable, .tree .tree-folder-name-disable { color: #cccccc; }
 .tree .tree-item-disable:hover, .tree .tree-folder-name-disable:hover { color: #cccccc; background-color: none; }
 
-.tree-actions { padding-bottom: 4px; display: inline-block; }
+.tree-actions { display: inline-block; }
 
 .tree-panel-heading-controls { margin: -20px -20px 20px; padding: 5px; border-bottom: solid 1px #dfdfdf; }
 
diff --git a/admin-dev/themes/default/scss/admin-theme/_admin-tree.sass b/admin-dev/themes/default/scss/admin-theme/_admin-tree.sass
index e035b405a..bfd883405 100644
--- a/admin-dev/themes/default/scss/admin-theme/_admin-tree.sass
+++ b/admin-dev/themes/default/scss/admin-theme/_admin-tree.sass
@@ -30,7 +30,6 @@
 			color: #ccc
 			background-color: none
 .tree-actions
-	padding-bottom: 4px
 	display: inline-block
 
 .tree-panel-heading-controls
diff --git a/admin-dev/themes/default/template/controllers/products/helpers/tree/tree_associated_header.tpl b/admin-dev/themes/default/template/controllers/products/helpers/tree/tree_associated_header.tpl
index ef8110e35..162d3d89b 100644
--- a/admin-dev/themes/default/template/controllers/products/helpers/tree/tree_associated_header.tpl
+++ b/admin-dev/themes/default/template/controllers/products/helpers/tree/tree_associated_header.tpl
@@ -23,4 +23,4 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-<div class="tree-panel-heading-controls">{if isset($toolbar)}{$toolbar}{/if}</div>
+<div class="tree-panel-heading-controls clearfix">{if isset($toolbar)}{$toolbar}{/if}</div>
diff --git a/admin-dev/themes/default/template/helpers/tree/tree_header.tpl b/admin-dev/themes/default/template/helpers/tree/tree_header.tpl
index d7c8ef7a3..7ab49a6bc 100644
--- a/admin-dev/themes/default/template/helpers/tree/tree_header.tpl
+++ b/admin-dev/themes/default/template/helpers/tree/tree_header.tpl
@@ -22,7 +22,7 @@
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 *}
-<div class="tree-panel-heading-controls">
+<div class="tree-panel-heading-controls clearfix">
 	<!-- <i class="icon-tag"></i>&nbsp;{l s=$title} -->
 	{if isset($toolbar)}{$toolbar}{/if}
 </div>
\ No newline at end of file