From 3239a583c63276402bbae438ff5936174289e279 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Tue, 19 Jun 2012 15:42:02 +0200
Subject: [PATCH] [IMP] sass form reorganisationa

bzr revid: al@openerp.com-20120619134202-8ueuiytk6lrjrmm3
---
 addons/web/static/src/css/base.css  | 193 +++++++++++++---------------
 addons/web/static/src/css/base.sass | 180 +++++++++++---------------
 2 files changed, 167 insertions(+), 206 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index f1211d2167c..985eba051d1 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1603,13 +1603,13 @@
   max-width: 700px;
   font-size: 125%;
 }
+.openerp .oe_formview {
+  background: white;
+}
 .openerp .oe_form_dropdown_section {
   position: relative;
   display: inline-block;
 }
-.openerp .oe_formview {
-  background: white;
-}
 .openerp .oe_form_invalid input, .openerp .oe_form_invalid select, .openerp .oe_form_invalid textarea {
   background-color: #ff6666 !important;
   border: 1px solid #dd0000 !important;
@@ -1632,6 +1632,19 @@
 .openerp .oe_form_button_save_dirty:hover {
   background: #ed6f6a;
 }
+.openerp .oe_form_invisible {
+  display: none !important;
+}
+.openerp .oe_form_editable .oe_edit_only {
+  display: none !important;
+}
+.openerp .oe_form_readonly .oe_edit_only, .openerp .oe_form_readonly .oe_form_field:empty {
+  display: none !important;
+}
+.openerp .oe_form_nosheet > *:not(.oe_form_topbar) {
+  margin-left: 10px !important;
+  margin-right: 10px !important;
+}
 .openerp .oe_form header {
   position: relative;
   border-bottom: 1px solid #cacaca;
@@ -1733,14 +1746,72 @@
   -webkit-box-shadow: 0 0 10px rgba(0, 0, 0, 0.3);
   box-shadow: 0 0 10px rgba(0, 0, 0, 0.3);
 }
-.openerp .oe_form_invisible {
-  display: none !important;
+.openerp .oe_form td.oe_form_group_cell_label {
+  border-right: 1px solid #dddddd;
+  padding: 2px 0px 2px 0px;
 }
-.openerp .oe_form_editable .oe_edit_only {
-  display: none !important;
+.openerp .oe_form td.oe_form_group_cell_label label {
+  line-height: 18px;
+  display: block;
+  min-width: 120px;
 }
-.openerp .oe_form_readonly .oe_edit_only, .openerp .oe_form_readonly .oe_form_field:empty {
-  display: none !important;
+.openerp .oe_form td.oe_form_group_cell + .oe_form_group_cell {
+  padding-left: 8px;
+}
+.openerp .oe_form .oe_form_label_help[for], .openerp .oe_form .oe_form_label[for] {
+  font-weight: bold;
+  white-space: nowrap;
+  padding-right: 8px;
+}
+.openerp .oe_form .oe_form_label_help[for] span, .openerp .oe_form .oe_form_label[for] span {
+  font-size: 80%;
+  color: darkGreen;
+  vertical-align: top;
+  position: relative;
+  top: -4px;
+  padding: 0 2px;
+}
+.openerp .oe_horizontal_border {
+  border-bottom: 1px solid black;
+}
+.openerp .oe_horizontal_separator {
+  font-weight: bold;
+  font-size: 20px;
+  margin: 20px 0px 10px 0px;
+  color: #aaaabb;
+}
+.openerp .oe_horizontal_separator:empty {
+  height: 5px;
+}
+.openerp .oe_vertical_separator {
+  border-left: 1px solid #666666;
+  padding: 0 4px 0 4px;
+}
+.openerp .oe_form_field_progressbar {
+  display: inline-block;
+  min-width: 70px;
+}
+.openerp .oe_form_field_progressbar.ui-progressbar {
+  height: 22px;
+  font-size: 10px;
+  -webkit-box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  -ms-box-sizing: border-box;
+  box-sizing: border-box;
+  border: 1px solid #999999;
+  -moz-border-radius: 3px;
+  -webkit-border-radius: 3px;
+  border-radius: 3px;
+  background: white;
+  min-width: 50px;
+}
+.openerp .oe_form_field_progressbar.ui-progressbar span {
+  position: absolute;
+  margin-left: 10px;
+  font-weight: bold;
+}
+.openerp .oe_form_field_progressbar.ui-progressbar .ui-widget-header {
+  background: #cccccc url(/web/static/lib/jquery.ui/css/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png) 50% 50% repeat-x;
 }
 .openerp .oe_form .oe_form_field_text {
   width: 100%;
@@ -1770,35 +1841,6 @@
   height: inherit !important;
   font-size: inherit;
 }
-.openerp .oe_form_nosheet > *:not(.oe_form_topbar) {
-  margin-left: 10px !important;
-  margin-right: 10px !important;
-}
-.openerp .oe_form td.oe_form_group_cell_label {
-  border-right: 1px solid #dddddd;
-  padding: 2px 0px 2px 0px;
-}
-.openerp .oe_form td.oe_form_group_cell_label label {
-  line-height: 18px;
-  display: block;
-  min-width: 120px;
-}
-.openerp .oe_form td.oe_form_group_cell + .oe_form_group_cell {
-  padding-left: 8px;
-}
-.openerp .oe_form .oe_form_label_help[for], .openerp .oe_form .oe_form_label[for] {
-  font-weight: bold;
-  white-space: nowrap;
-  padding-right: 8px;
-}
-.openerp .oe_form .oe_form_label_help[for] span, .openerp .oe_form .oe_form_label[for] span {
-  font-size: 80%;
-  color: darkGreen;
-  vertical-align: top;
-  position: relative;
-  top: -4px;
-  padding: 0 2px;
-}
 .openerp .oe_form .oe_form_field {
   width: 100%;
   display: inline-block;
@@ -1820,18 +1862,11 @@
 .openerp .oe_form .oe_form_field_datetime {
   width: 11em;
 }
-.openerp .oe_form input[type="text"],
-.openerp .oe_form input[type="password"],
-.openerp .oe_form input[type="file"],
-.openerp .oe_form select {
+.openerp .oe_form input[type="text"], .openerp .oe_form input[type="password"], .openerp .oe_form input[type="file"], .openerp .oe_form select {
   height: 22px;
   padding-top: 2px;
 }
-.openerp .oe_form input[type="text"],
-.openerp .oe_form input[type="password"],
-.openerp .oe_form input[type="file"],
-.openerp .oe_form select,
-.openerp .oe_form textarea {
+.openerp .oe_form input[type="text"], .openerp .oe_form input[type="password"], .openerp .oe_form input[type="file"], .openerp .oe_form select, .openerp .oe_form textarea {
   -webkit-box-sizing: border-box;
   -moz-box-sizing: border-box;
   -ms-box-sizing: border-box;
@@ -1840,11 +1875,7 @@
   min-width: 70px;
   color: #1f1f1f;
 }
-.openerp .oe_form input[readonly],
-.openerp .oe_form select[readonly],
-.openerp .oe_form textarea[readonly],
-.openerp .oe_form input[disabled],
-.openerp .oe_form select[disabled] {
+.openerp .oe_form input[readonly], .openerp .oe_form select[readonly], .openerp .oe_form textarea[readonly], .openerp .oe_form input[disabled], .openerp .oe_form select[disabled] {
   background: #e5e5e5 !important;
   color: #666666;
 }
@@ -1859,10 +1890,7 @@
   -webkit-border-radius: 0px;
   border-radius: 0px;
 }
-.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_url input {
+.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_url input {
   border-right: none;
   -webkit-border-top-right-radius: 0px;
   -webkit-border-bottom-right-radius: 0px;
@@ -2006,47 +2034,13 @@
 .openerp .oe_form .oe_form_field_image:hover .oe_form_field_image_controls {
   display: block;
 }
-.openerp .oe_horizontal_border {
-  border-bottom: 1px solid black;
+.openerp .oe_form_field_many2one td:first-child {
+  position: relative;
 }
-.openerp .oe_horizontal_separator {
-  font-weight: bold;
-  font-size: 20px;
-  margin: 20px 0px 10px 0px;
-  color: #aaaabb;
-}
-.openerp .oe_horizontal_separator:empty {
-  height: 5px;
-}
-.openerp .oe_vertical_separator {
-  border-left: 1px solid #666666;
-  padding: 0 4px 0 4px;
-}
-.openerp .oe_form_field_progressbar {
-  display: inline-block;
-  min-width: 70px;
-}
-.openerp .oe_form_field_progressbar.ui-progressbar {
-  height: 22px;
-  font-size: 10px;
-  -webkit-box-sizing: border-box;
-  -moz-box-sizing: border-box;
-  -ms-box-sizing: border-box;
-  box-sizing: border-box;
-  border: 1px solid #999999;
-  -moz-border-radius: 3px;
-  -webkit-border-radius: 3px;
-  border-radius: 3px;
-  background: white;
-  min-width: 50px;
-}
-.openerp .oe_form_field_progressbar.ui-progressbar span {
+.openerp .oe_form_field_many2one span.oe-m2o-drop-down-button {
   position: absolute;
-  margin-left: 10px;
-  font-weight: bold;
-}
-.openerp .oe_form_field_progressbar.ui-progressbar .ui-widget-header {
-  background: #cccccc url(/web/static/lib/jquery.ui/css/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png) 50% 50% repeat-x;
+  top: 3px;
+  right: 2px;
 }
 .openerp .oe_form .oe_form_field_one2many > .oe_view_manager .oe_list_pager_single_page {
   display: none;
@@ -2255,12 +2249,3 @@
 .kitten-mode-activated > * {
   opacity: 0.7;
 }
-
-.openerp .oe_form_field_many2one td:first-child {
-  position: relative;
-}
-.openerp .oe_form_field_many2one span.oe-m2o-drop-down-button {
-  position: absolute;
-  top: 3px;
-  right: 2px;
-}
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 89f149b378b..eb442256f36 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -401,7 +401,6 @@ $colour4: #8a89ba
                 @include vertical-gradient(#f0f0fa, #eeeef6)
                 @include box-shadow(none)
     // }}}
-
     // Loading {{{
     .oe_loading
         display: none
@@ -1282,12 +1281,12 @@ $colour4: #8a89ba
             max-width: 700px
             font-size: 125%
     // }}}
-    // FormView.body {{{
+    // FormView.base and dynamic tags {{{
+    .oe_formview
+        background: white
     .oe_form_dropdown_section
         position: relative
         display: inline-block
-    .oe_formview
-        background: white
     .oe_form_invalid
         input, select, textarea
             background-color: #F66 !important
@@ -1300,6 +1299,16 @@ $colour4: #8a89ba
         font-weight: bold
         &:hover
             background: #ED6F6A
+    .oe_form_invisible
+        display: none !important
+    .oe_form_editable .oe_edit_only
+        display: none !important
+    .oe_form_readonly
+        .oe_edit_only, .oe_form_field:empty
+            display: none !important
+    .oe_form_nosheet > *:not(.oe_form_topbar)
+        margin-left: 10px !important
+        margin-right: 10px !important
     // }}}
     // FormView.custom tags and classes {{{
     .oe_form 
@@ -1379,43 +1388,7 @@ $colour4: #8a89ba
             border: 1px solid #afafb6
             @include box-shadow(0 0 10px rgba(0,0,0,0.3))
     // }}}
-    // FormView.layout {{{
-    .oe_form_invisible
-        display: none !important
-    .oe_form_editable .oe_edit_only
-        display: none !important
-    .oe_form_readonly
-        .oe_edit_only, .oe_form_field:empty
-            display: none !important
-    .oe_form
-        .oe_form_field_text
-            width: 100%
-
-        .oe_form_field_char input,
-        .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
-
-        h1 .oe_form_field_float input
-            width: 140px
-
-        h2 .oe_form_field_float input
-            width: 120px
-
-        h1, h2, h3, h4, h5, h6
-            margin: 0 0 4px 0
-            input
-                height: inherit !important
-                font-size: inherit
-    .oe_form_nosheet > *:not(.oe_form_topbar)
-        margin-left: 10px !important
-        margin-right: 10px !important
-
+    // FormView.group {{{
     .oe_form
         td.oe_form_group_cell_label
             border-right: 1px solid #ddd
@@ -1442,8 +1415,61 @@ $colour4: #8a89ba
                 top: -4px
                 padding: 0 2px
     // }}}
+    // FormView.separator {{{
+    .oe_horizontal_border
+        border-bottom: 1px solid black
+    .oe_horizontal_separator
+        font-weight: bold
+        font-size: 20px
+        margin: 20px 0px 10px 0px
+        color: #aab
+    .oe_horizontal_separator:empty
+        height: 5px
+    .oe_vertical_separator
+        border-left: 1px solid #666
+        padding: 0 4px 0 4px
+    // }}}
+    // FormView.progressbar {{{
+    .oe_form_field_progressbar
+        display: inline-block
+        min-width: 70px
+    .oe_form_field_progressbar.ui-progressbar
+        height: 22px
+        font-size: 10px
+        @include box-sizing(border)
+        border: 1px solid #999
+        @include radius(3px)
+        background: white
+        min-width: 50px
+        span
+            position: absolute
+            margin-left: 10px
+            font-weight: bold
+        .ui-widget-header
+            background: #cccccc url(/web/static/lib/jquery.ui/css/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png) 50% 50% repeat-x
+    // }}}
     // FormView.fields {{{
     .oe_form
+        .oe_form_field_text
+            width: 100%
+        .oe_form_field_char input,
+        .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
+        h1 .oe_form_field_float input
+            width: 140px
+        h2 .oe_form_field_float input
+            width: 120px
+        h1, h2, h3, h4, h5, h6
+            margin: 0 0 4px 0
+            input
+                height: inherit !important
+                font-size: inherit
         .oe_form_field
             width: 100%
             display: inline-block
@@ -1459,26 +1485,15 @@ $colour4: #8a89ba
             width: 7em
         .oe_form_field_datetime
             width: 11em
-        input[type="text"],
-        input[type="password"],
-        input[type="file"],
-        select
+        input[type="text"], input[type="password"], input[type="file"], select
             height: 22px
             padding-top: 2px
-        input[type="text"],
-        input[type="password"],
-        input[type="file"],
-        select,
-        textarea
+        input[type="text"], input[type="password"], input[type="file"], select, textarea
             @include box-sizing(border)
             background: white
             min-width: 70px
             color: #1f1f1f
-        input[readonly],
-        select[readonly],
-        textarea[readonly],
-        input[disabled],
-        select[disabled]
+        input[readonly], select[readonly], textarea[readonly], input[disabled], select[disabled]
             background: #E5E5E5 !important
             color: #666
         textarea[disabled]
@@ -1487,10 +1502,7 @@ $colour4: #8a89ba
             padding-left: 8px
             @include box-shadow(none)
             @include radius(0px)
-        .oe_form_field_many2one input,
-        .oe_form_field_binary input,
-        .oe_form_field_binary input,
-        .oe_form_field_url input
+        .oe_form_field_many2one input, .oe_form_field_binary input, .oe_form_field_binary input, .oe_form_field_url input
             border-right: none
             -webkit-border-top-right-radius: 0px
             -webkit-border-bottom-right-radius: 0px
@@ -1558,7 +1570,6 @@ $colour4: #8a89ba
             > div
                 position: relative
                 overflow: hidden
-
         .oe_form_title
             width: 55%
         .oe_form_title:after
@@ -1614,38 +1625,14 @@ $colour4: #8a89ba
             &:hover .oe_form_field_image_controls
                 display: block
     // }}}
-    // FormView.separator {{{
-    .oe_horizontal_border
-        border-bottom: 1px solid black
-    .oe_horizontal_separator
-        font-weight: bold
-        font-size: 20px
-        margin: 20px 0px 10px 0px
-        color: #aab
-    .oe_horizontal_separator:empty
-        height: 5px
-    .oe_vertical_separator
-        border-left: 1px solid #666
-        padding: 0 4px 0 4px
-    // }}}
-    // FormView.progressbar {{{
-    .oe_form_field_progressbar
-        display: inline-block
-        min-width: 70px
-    .oe_form_field_progressbar.ui-progressbar
-        height: 22px
-        font-size: 10px
-        @include box-sizing(border)
-        border: 1px solid #999
-        @include radius(3px)
-        background: white
-        min-width: 50px
-        span
+    // FormView.many2one {{{
+    .oe_form_field_many2one
+        td:first-child
+            position: relative
+        span.oe-m2o-drop-down-button
             position: absolute
-            margin-left: 10px
-            font-weight: bold
-        .ui-widget-header
-            background: #cccccc url(/web/static/lib/jquery.ui/css/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png) 50% 50% repeat-x
+            top: 3px
+            right: 2px
     // }}}
     // FormView.one2many {{{
     .oe_form .oe_form_field_one2many > .oe_view_manager
@@ -1769,7 +1756,6 @@ $colour4: #8a89ba
     .oe_view_editor tr:hover
         background-color: #ecebf2
     // }}}
-
     // Debugging stuff {{{
     .oe_layout_debugging
         .oe_form_group
@@ -1812,16 +1798,6 @@ $colour4: #8a89ba
     >*
         opacity: 0.70
 // }}}
-// Transitional overrides for old styles {{{
-.openerp
-    .oe_form_field_many2one
-        td:first-child
-            position: relative
-        span.oe-m2o-drop-down-button
-            position: absolute
-            top: 3px
-            right: 2px
-// }}}
 
 // au BufWritePost,FileWritePost *.sass :!sass --style expanded --line-numbers <afile> > "%:p:r.css"
 // vim:tabstop=4:shiftwidth=4:softtabstop=4:fdm=marker: