[MERGE] mit style

bzr revid: al@openerp.com-20120619130220-44vg6uae5po3hdxo

3 files changed, 52 insertions, 59 deletions

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index b096e33c511..d55b320b969 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -90,7 +90,8 @@
 .openerp li {
   list-style-type: none;
 }
-.openerp input, .openerp textarea {
+.openerp input, .openerp textarea, .openerp select {
+  padding: 4px;
   border: 1px solid #cccccc;
   -moz-border-radius: 3px;
   -webkit-border-radius: 3px;
@@ -181,6 +182,9 @@
 .openerp .ui-menu .ui-menu-item a.ui-state-active {
   background: #f0f0fa;
 }
+.openerp .ui-tabs {
+  margin: 0 -16px;
+}
 .openerp .oe_i {
   font-family: "mnmliconsRegular" !important;
   font-size: 21px;
@@ -261,6 +265,20 @@
   width: 200px;
   text-align: center;
 }
+.openerp .oe_avatar {
+  float: left;
+  margin: 0 16px 0 0;
+}
+.openerp .oe_avatar img {
+  height: 50px;
+  -moz-border-radius: 3px;
+  -webkit-border-radius: 3px;
+  border-radius: 3px;
+  -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.3);
+  -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.3);
+  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.3);
+  border: none;
+}
 .openerp.oe_tooltip {
   font-size: 12px;
 }
@@ -724,7 +742,6 @@
   border-right: 1px solid #afafb6;
   text-shadow: 0 1px 1px white;
   padding-bottom: 16px;
-  line-height: 18px;
 }
 .openerp a.oe_logo {
   width: 220px;
@@ -980,9 +997,9 @@
   float: right;
   background: #8a89ba;
   color: #eeeeee;
-  font-size: 12px;
+  font-size: 10px;
   border: 1px solid lightgray;
-  padding: 0px 4px 0px 4px;
+  padding: 2px 4px;
   text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
   margin: 0px;
   -moz-border-radius: 4px;
@@ -1244,10 +1261,6 @@
   height: 14px;
   font-size: 11px;
   line-height: 18px;
-  border: 1px solid #cccccc;
-  -moz-border-radius: 3px;
-  -webkit-border-radius: 3px;
-  border-radius: 3px;
 }
 .openerp .oe_searchview.oe_focused {
   border-color: #a6a6fe;
@@ -1388,7 +1401,7 @@
 }
 .openerp .oe_searchview .oe_searchview_drawer {
   position: absolute;
-  z-index: 1;
+  z-index: 100;
   margin-top: 4px;
   top: 100%;
   right: -1px;
@@ -1704,9 +1717,9 @@
   margin: 0 auto;
 }
 .openerp .oe_application .oe_form_sheet {
-  padding: 18px;
   background: white;
   min-height: 330px;
+  padding: 16px;
   border: 1px solid #afafb6;
   -moz-box-shadow: 0 0 10px rgba(0, 0, 0, 0.3);
   -webkit-box-shadow: 0 0 10px rgba(0, 0, 0, 0.3);
@@ -1748,11 +1761,14 @@
   width: 100%;
 }
 .openerp .oe_form .oe_form_field_char input,
-.openerp .oe_form .oe_form_field_text textarea,
 .openerp .oe_form .oe_form_field_url input,
+.openerp .oe_form .oe_form_field_text textarea,
 .openerp .oe_form .oe_form_field_selection select {
   width: inherit;
 }
+.openerp .oe_form .oe_form_sheet textarea {
+  width: 500px;
+}
 .openerp .oe_form .oe_form_field_float input {
   width: 100px;
 }
@@ -1799,7 +1815,7 @@
   padding: 0 2px;
 }
 .openerp .oe_form .oe_form_field_text textarea {
-  resize: vertical;
+  resize: none;
 }
 .openerp .oe_form .oe_form_field {
   width: 100%;
@@ -1838,11 +1854,6 @@
   -moz-box-sizing: border-box;
   -ms-box-sizing: border-box;
   box-sizing: border-box;
-  padding: 0 2px;
-  border: 1px solid #999999;
-  -moz-border-radius: 3px;
-  -webkit-border-radius: 3px;
-  border-radius: 3px;
   background: white;
   min-width: 70px;
   color: #1f1f1f;
@@ -1869,7 +1880,6 @@
 .openerp .oe_form .oe_form_field_many2one input,
 .openerp .oe_form .oe_form_field_binary input,
 .openerp .oe_form .oe_form_field_binary input,
-.openerp .oe_form .oe_form_field_email input,
 .openerp .oe_form .oe_form_field_url input {
   border-right: none;
   -webkit-border-top-right-radius: 0px;
@@ -1879,7 +1889,6 @@
   border-top-right-radius: 0px;
   border-bottom-right-radius: 0px;
 }
-.openerp .oe_form .oe_form_field_email button img,
 .openerp .oe_form .oe_form_field_url button img {
   vertical-align: top;
 }
@@ -1947,11 +1956,9 @@
 }
 .openerp .oe_form .oe_form_field_with_button > .oe_button {
   float: right;
-  -webkit-border-top-left-radius: 0px;
-  -webkit-border-bottom-left-radius: 0px;
-  -moz-border-radius-topleft: 0px;
-  -moz-border-radius-bottomleft: 0px;
-  border-top-left-radius: 0px;
+  -moz-border-radius: 0;
+  -webkit-border-radius: 0;
+  border-radius: 0;
   border-bottom-left-radius: 0px;
   height: 22px;
 }
@@ -1999,9 +2006,6 @@
   width: auto;
   vertical-align: top;
 }
-.openerp .oe_form .oe_form_field_image > img {
-  min-width: 100px;
-}
 .openerp .oe_form .oe_form_field_image .oe_form_field_image_controls {
   position: absolute;
   top: 1px;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 3b90fe2e0e2..341755cbcb2 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -134,7 +134,8 @@ $colour4: #8a89ba
         padding: 0
     li
         list-style-type: none
-    input, textarea
+    input, textarea, select
+        padding: 4px
         border: 1px solid #ccc
         @include radius(3px)
     img
@@ -193,6 +194,8 @@ $colour4: #8a89ba
             width: auto
             a.ui-state-active
                 background: #f0f0fa
+    .ui-tabs
+        margin: 0 -16px
     // }}}
     // Generic classes {{{
     .oe_i
@@ -237,7 +240,14 @@ $colour4: #8a89ba
     .oe_button_box
         width: 200px
         text-align: center
-    //.oe_avatar 
+    .oe_avatar
+        float: left
+        margin: 0 16px 0 0
+        img
+            height: 50px
+            @include radius(3px)
+            @include box-shadow(0 1px 3px rgba(0, 0, 0, 0.3))
+            border: none
     //.oe_edit_only 
     // }}}
     // Tooltips {{{
@@ -595,7 +605,6 @@ $colour4: #8a89ba
         border-right: 1px solid #afafb6
         text-shadow: 0 1px 1px white
         padding-bottom: 16px
-        line-height: 18px
     a.oe_logo
         width: 220px
         display: block
@@ -787,9 +796,9 @@ $colour4: #8a89ba
             float: right
             background: #8a89ba
             color: #eee
-            font-size: 12px
+            font-size: 10px
             border: 1px solid lightgray
-            padding: 0px 4px 0px 4px
+            padding: 2px 4px
             text-shadow: 0 1px 1px rgba(0,0,0,0.2)
             margin: 0px
             @include radius(4px)
@@ -995,8 +1004,6 @@ $colour4: #8a89ba
             height: 14px
             font-size: 11px
             line-height: 18px
-            border: 1px solid #ccc
-            @include radius(3px)
         &.oe_focused
             border-color: $facets-border-selected
             @include box-shadow(0 1px 2px $facets-border-selected inset)
@@ -1107,7 +1114,7 @@ $colour4: #8a89ba
 
         .oe_searchview_drawer
             position: absolute
-            z-index: 1
+            z-index: 100
             // detach drawer from field slightly
             margin-top: 4px
             top: 100%
@@ -1355,9 +1362,9 @@ $colour4: #8a89ba
             max-width: 960px
             margin: 0 auto
         .oe_form_sheet
-            padding: 18px
             background: white
             min-height: 330px
+            padding: 16px
             border: 1px solid #afafb6
             @include box-shadow(0 0 10px rgba(0,0,0,0.3))
     .oe_form
@@ -1392,11 +1399,12 @@ $colour4: #8a89ba
             width: 100%
 
         .oe_form_field_char input,
-        .oe_form_field_text textarea,
         .oe_form_field_url input,
+        .oe_form_field_text textarea,
         .oe_form_field_selection select
             width: inherit
-
+        .oe_form_sheet textarea
+            width: 500px
         .oe_form_field_float input
             width: 100px
 
@@ -1443,8 +1451,6 @@ $colour4: #8a89ba
     // }}}
     // FormView.fields {{{
     .oe_form
-        .oe_form_field_text textarea
-            resize: vertical
         .oe_form_field
             width: 100%
             display: inline-block
@@ -1452,7 +1458,6 @@ $colour4: #8a89ba
             line-height: 18px
             input
                 margin: 0px
-
         .oe_form_field_integer
             width: 180px
         .oe_form_field_float
@@ -1461,7 +1466,6 @@ $colour4: #8a89ba
             width: 7em
         .oe_form_field_datetime
             width: 11em
-
         input[type="text"],
         input[type="password"],
         input[type="file"],
@@ -1474,9 +1478,6 @@ $colour4: #8a89ba
         select,
         textarea
             @include box-sizing(border)
-            padding: 0 2px
-            border: 1px solid #999
-            @include radius(3px)
             background: white
             min-width: 70px
             color: #1f1f1f
@@ -1496,7 +1497,6 @@ $colour4: #8a89ba
         .oe_form_field_many2one input,
         .oe_form_field_binary input,
         .oe_form_field_binary input,
-        .oe_form_field_email input,
         .oe_form_field_url input
             border-right: none
             -webkit-border-top-right-radius: 0px
@@ -1505,7 +1505,6 @@ $colour4: #8a89ba
             -moz-border-radius-bottomright: 0px
             border-top-right-radius: 0px
             border-bottom-right-radius: 0px
-        .oe_form_field_email button img,
         .oe_form_field_url button img
             vertical-align: top
         .oe_form_field_date,
@@ -1560,11 +1559,7 @@ $colour4: #8a89ba
                 width: 100%
             > .oe_button
                 float: right
-                -webkit-border-top-left-radius: 0px
-                -webkit-border-bottom-left-radius: 0px
-                -moz-border-radius-topleft: 0px
-                -moz-border-radius-bottomleft: 0px
-                border-top-left-radius: 0px
+                @include radius(0)
                 border-bottom-left-radius: 0px
                 height: 22px
             > div
@@ -1581,7 +1576,6 @@ $colour4: #8a89ba
             visibility: hidden
         .oe_form_group
             margin: 5px 0px 5px 0px
-
     // }}}
     // FormView.binaryfile {{{
     /* http://www.quirksmode.org/dom/inputfile.html
@@ -1608,8 +1602,6 @@ $colour4: #8a89ba
             padding: 0
     .oe_form
         .oe_form_field_image
-            > img
-                min-width: 100px
             padding: 0
             position: relative
             display: inline-block
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 5e43fdf58a1..a82e40c06e5 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -764,7 +764,7 @@
 </t>
 <t t-name="FormRenderingGroup">
     <t t-if="string" t-call="FormRenderingSeparator"/>
-    <table border="0" cellpadding="0" cellspacing="0" width="100%" t-attf-class="oe_form_group #{classnames}"/>
+    <table border="0" cellpadding="0" cellspacing="0" t-attf-class="oe_form_group #{classnames}"/>
 </t>
 <t t-name="FormRenderingNotebook">
     <div>
@@ -876,9 +876,6 @@
     <span class="oe_form_field oe_form_field_email oe_form_field_with_button">
         <a t-if="widget.get('effective_readonly')" href="#" class="oe_form_uri"/>
         <t t-if="!widget.get('effective_readonly')">
-            <button class="oe_button" tabindex="-1" type="button" title="Send an e-mail with your default e-mail client">
-                <img t-att-src='_s + "/web/static/src/img/icons/terp-mail-message-new.png"'/>
-            </button>
             <div>
                 <input type="text"
                     t-att-id="widget.id_for_label"