[MERGE] from upstream

bzr revid: fva@openerp.com-20130731153654-g7htxjci0zk4xev3
2013-07-31 17:36:54 +02:00
parent 1036f7f205 3269a89f7b
commit 1eb9d5b626
4 changed files with 15 additions and 9 deletions
@@ -176,11 +176,3 @@
    margin-left: 0px !important;
 }
 */
-
-.carousel > .css_carousel_options {
-    cursor: pointer;
-    position: absolute;
-    white-space: nowrap;
-    z-index: 1;
-    display: none;
-}
@@ -103,3 +103,11 @@ h5 {
  min-height: 300px;
  color: white;
 }
+
+.carousel > .css_carousel_options {
+    cursor: pointer;
+    position: absolute;
+    white-space: nowrap;
+    z-index: 1;
+    display: none;
+}
@@ -79,3 +79,9 @@ h5
    min-height: 300px
    color: white

+.carousel > .css_carousel_options
+    cursor: pointer
+    position: absolute
+    white-space: nowrap
+    z-index: 1
+    display: none
@@ -131,7 +131,7 @@
                                </section>
                            </div>

-                            <div class='oe_snippet' name='Three Collumns' data-selector=".container">
+                            <div class='oe_snippet' name='Three Columns' data-selector=".container">
                                <section class="container">
                                    <div class="row mt32">
                                        <div class="span4">