[Merge]with trunk

bzr revid: mba@tinyerp.com-20140228131907-byupoh7m80vbw5yl

3 files changed, 48 insertions, 49 deletions

diff --git a/addons/web/static/src/css/Makefile b/addons/web/static/src/css/Makefile
index f4f1f6d1bb5..ba88946baac 100644
--- a/addons/web/static/src/css/Makefile
+++ b/addons/web/static/src/css/Makefile
@@ -1,2 +1,5 @@
-sass:
-	sass -t expanded --compass --unix-newlines --watch base.sass:base.css&
\ No newline at end of file
+all: *.css
+%.css: %.sass
+	sass -t expanded --compass --unix-newlines $< $@
+watch:
+	sass -t expanded --compass --unix-newlines --watch .:.
diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 430c11c19b3..2e59907d21c 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -78,6 +78,20 @@
 .openerp td {
   vertical-align: top;
 }
+.openerp .oe_title {
+  width: 50%;
+  float: left;
+}
+.openerp .oe_title:after {
+  content: ".";
+  display: block;
+  height: 0;
+  clear: both;
+  visibility: hidden;
+}
+.openerp .oe_form_group {
+  clear: both;
+}
 .openerp .zebra tbody tr:nth-child(odd) td {
   background-color: #f0f0fa;
   background-color: #efeff8;
@@ -1205,10 +1219,7 @@
 .openerp .oe_about .oe_bottom a {
   color: #eeeeee;
 }
-.openerp .oe_form_uri {
-  color: #7c7bad;
-}
-.openerp .oe_form_uri:hover {
+.openerp a.oe_form_uri:hover {
   text-decoration: underline;
 }
 .openerp .oe_application {
@@ -1594,7 +1605,6 @@
   border-radius: 0 3px 3px 0;
 }
 .openerp .oe_searchview .oe_searchview_facets .oe_searchview_facet .oe_facet_category, .openerp .oe_searchview .oe_searchview_facets .oe_searchview_facet .oe_facet_value {
-  height: 18px;
   padding: 0 4px;
 }
 .openerp .oe_searchview .oe_searchview_facets .oe_searchview_facet .oe_facet_category {
@@ -2021,7 +2031,6 @@
 }
 .openerp .oe_form > :not(.oe_form_nosheet) header .oe_button {
   margin: 3px 2px 1px;
-  float: left;
 }
 .openerp .oe_form > :not(.oe_form_nosheet) header .oe_button:first-child {
   margin-left: 6px;
@@ -3021,25 +3030,12 @@
   font-size: 95%;
   line-height: 1.2em;
 }
-.openerp .oe_debug_view_log label {
-  display: block;
-  width: 49%;
-  text-align: right;
-  float: left;
-  font-weight: bold;
-  color: #000099;
-}
-.openerp .oe_debug_view_log span {
-  display: block;
-  width: 49%;
-  float: right;
-  color: #333333;
-}
 .openerp .navbar {
   min-height: 32px;
   margin-bottom: 0px;
   border: none;
   z-index: 1;
+  position: static;
   background-color: #414141;
   background-color: #454343;
   background-image: -webkit-gradient(linear, left top, left bottom, from(#646060), to(#262626));
@@ -3138,10 +3134,6 @@
   border: none;
   padding: 10px 0 3px 0;
 }
-.openerp .jqstooltip {
-  height: auto !important;
-  width: auto !important;
-}
 .openerp h5 {
   font-weight: bold;
   font-size: smaller;
@@ -3153,6 +3145,12 @@
   margin: 3px 3px 0 !important;
 }
 
+.jqstooltip {
+  height: auto !important;
+  width: auto !important;
+  padding: 0;
+}
+
 @-moz-document url-prefix() {
   .openerp .oe_searchview .oe_searchview_search {
     top: -1px;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 84db0ff5da7..e24f8fe90ed 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -189,6 +189,17 @@ $sheet-padding: 16px
         vertical-align: middle
     td
         vertical-align: top
+    .oe_title
+        width: 50%
+        float: left    
+    .oe_title:after
+        content: "."
+        display: block
+        height: 0
+        clear: both
+        visibility: hidden    
+    .oe_form_group
+        clear: both
     .zebra tbody tr:nth-child(odd) td
         background-color: #f0f0fa
         @include vertical-gradient(#f0f0fa, #eeeef6)
@@ -1002,10 +1013,8 @@ $sheet-padding: 16px
                 color: #eee
     // }}}
     // ActionManager {{{
-    .oe_form_uri
-        color: $link-color
-        &:hover
-            text-decoration: underline
+    a.oe_form_uri:hover
+        text-decoration: underline
     .oe_application
         width: 100%
         height: 100%
@@ -1302,7 +1311,6 @@ $sheet-padding: 16px
                     background: $tag-bg-light
                     @include radius(0 3px 3px 0)
                 .oe_facet_category, .oe_facet_value
-                    height: 18px
                     padding: 0 4px
                 .oe_facet_category
                     color: white
@@ -1639,7 +1647,6 @@ $sheet-padding: 16px
             float: right
         .oe_button
             margin: 3px 2px 1px
-            float: left
             &:first-child
                 margin-left: 6px
 
@@ -2419,18 +2426,6 @@ $sheet-padding: 16px
     .oe_debug_view_log
         font-size: 95%
         line-height: 1.2em
-    .oe_debug_view_log label
-        display: block
-        width: 49%
-        text-align: right
-        float: left
-        font-weight: bold
-        color: #009
-    .oe_debug_view_log span
-        display: block
-        width: 49%
-        float: right
-        color: #333
     // }}}
     // Bootstrap HACKS {{{
     .navbar
@@ -2438,6 +2433,7 @@ $sheet-padding: 16px
         margin-bottom: 0px
         border: none
         z-index: 1
+        position: static
         background-color: #414141
         @include vertical-gradient(#646060, #262626)
     .navbar-default
@@ -2517,10 +2513,7 @@ $sheet-padding: 16px
         border: none
         padding: 10px 0 3px 0
 
-    // Customize for kanban tooltip
-    .jqstooltip
-        height: auto !important
-        width: auto !important
+
 
     // Customize for chatter
     h5
@@ -2531,7 +2524,12 @@ $sheet-padding: 16px
     .oe_msg_subtype_check
         margin: 3px 3px 0 !important
     // }}}
-
+// Customize for kanban tooltip
+.jqstooltip
+    height: auto !important
+    width: auto !important
+    padding: 0
+        
 @-moz-document url-prefix()
     .openerp
         .oe_searchview .oe_searchview_search