[FIX] move boostrap css fix in base.sass

bzr revid: al@openerp.com-20120608171452-rls5mopqqd3hdfmn

2 files changed, 70 insertions, 196 deletions

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 435a90b65fa..e4131eb6450 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -25,6 +25,20 @@
   position: relative;
 }
 
+.ui-widget {
+  font-family: "Lucida Grande", Helvetica, Verdana, Arial, sans-serif;
+  font-size: 13px;
+}
+
+.ui-menu .ui-menu-item {
+  margin: 0 8px 0 0;
+  padding: 0 0 0 12px;
+  width: auto;
+}
+.ui-menu .ui-menu-item a.ui-state-active {
+  background: #f0f0fa;
+}
+
 .openerp {
   padding: 0;
   margin: 0;
@@ -852,96 +866,6 @@
 .openerp .oe_application a:hover {
   text-decoration: underline;
 }
-.openerp .oe-view-manager-header {
-  border-top: 1px solid #cacaca;
-  border-bottom: 1px solid #cacaca;
-  background-color: #fcfcfc;
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#fcfcfc), to(#dedede));
-  background-image: -webkit-linear-gradient(top, #fcfcfc, #dedede);
-  background-image: -moz-linear-gradient(top, #fcfcfc, #dedede);
-  background-image: -ms-linear-gradient(top, #fcfcfc, #dedede);
-  background-image: -o-linear-gradient(top, #fcfcfc, #dedede);
-  background-image: linear-gradient(to bottom, #fcfcfc, #dedede);
-  -moz-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.4), 0 0 9px rgba(0, 0, 0, 0.1);
-  -webkit-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.4), 0 0 9px rgba(0, 0, 0, 0.1);
-  -box-shadow: 0 1px 0 rgba(255, 255, 255, 0.4), 0 0 9px rgba(0, 0, 0, 0.1);
-}
-.openerp .oe-view-manager-header h2 {
-  float: left;
-  font-size: 18px;
-  margin: 1px 0;
-}
-.openerp .oe-view-manager-header h2 a {
-  color: #8a89ba;
-}
-.openerp .oe-view-manager-header .buttons {
-  padding-right: 8px;
-}
-.openerp .oe-view-manager-header .buttons li {
-  float: left;
-  margin-right: 12px;
-}
-.openerp .oe-view-manager-header .filter {
-  vertical-align: top;
-}
-.openerp .oe-view-manager-header .filter li {
-  height: 24px;
-  line-height: 24px;
-  padding: 0 8px;
-}
-.openerp .oe-view-manager-header .header-row {
-  height: 26px;
-  line-height: 26px;
-  margin: 8px;
-  clear: both;
-  text-shadow: 0 1px 1px white;
-}
-.openerp .oe-view-manager-header .header-row .dropdown-toggle:after {
-  margin-top: 7px;
-  margin-left: 6px;
-  border-top-color: #404040;
-}
-.openerp .oe-view-manager-header .oe_vm_switch li {
-  padding-left: 1px;
-  text-align: center;
-  width: 24px;
-  height: 24px;
-  line-height: 24px;
-}
-.openerp .oe-view-manager-header .pagination li {
-  height: 24px;
-  line-height: 24px;
-  padding: 0 8px;
-}
-.openerp .oe-view-manager-header .button-group {
-  display: inline-block;
-  border: 1px solid #ababab;
-  -moz-border-radius: 5px;
-  -webkit-border-radius: 5px;
-  border-radius: 5px;
-}
-.openerp .oe-view-manager-header .button-group li {
-  float: left;
-  border-right: 1px solid #ababab;
-}
-.openerp .oe-view-manager-header .button-group li:last-child {
-  border: none;
-}
-.openerp .oe-view-manager-header .button-group a {
-  color: #4c4c4c;
-}
-.openerp .oe-view-manager-header .button-group a:hover {
-  text-decoration: none;
-}
-.openerp .oe-view-manager-header .button-group .active {
-  width: 100%;
-  background: #999999;
-  -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3) inset;
-  -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3) inset;
-  -box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3) inset;
-  color: white;
-  text-shadow: 0 1px 2px rgba(0, 0, 0, 0.4);
-}
 .openerp .oe_view_manager_header {
   width: 100%;
   border-top: 1px solid #cacaca;
@@ -2273,6 +2197,27 @@
 .openerp.oe_tooltip .oe_tooltip_technical_title {
   font-weight: bold;
 }
+.openerp .oe_view_editor {
+  width: 100%;
+  border-collapse: collapse;
+  margin-left: -12px;
+  width: 100%;
+  background-color: white;
+  border-spacing: 0;
+}
+.openerp .oe_view_editor td {
+  text-align: center;
+  white-space: nowrap;
+  border: 1px solid #d8d8d8;
+  cursor: pointer;
+  font-size: 90%;
+}
+.openerp .oe_view_editor_field td {
+  border: 0px !important;
+}
+.openerp .oe_view_editor tr:hover {
+  background-color: #ecebf2;
+}
 .openerp .oe_layout_debugging .oe_form_group {
   outline: 2px dashed green;
 }
@@ -2314,28 +2259,6 @@
   color: #333333;
 }
 
-.openerp .oe_view_editor {
-  width: 100%;
-  border-collapse: collapse;
-  margin-left: -12px;
-  width: 100%;
-  background-color: white;
-  border-spacing: 0;
-}
-.openerp .oe_view_editor td {
-  text-align: center;
-  white-space: nowrap;
-  border: 1px solid #d8d8d8;
-  cursor: pointer;
-  font-size: 90%;
-}
-.openerp .oe_view_editor_field td {
-  border: 0px !important;
-}
-.openerp .oe_view_editor tr:hover {
-  background-color: #ecebf2;
-}
-
 .kitten-mode-activated {
   background-image: url(http://placekitten.com/g/1365/769);
   background-size: cover;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index a4660ff24bc..7bac593f43c 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -89,10 +89,24 @@ $colour4: #8a89ba
 
 // }}}
 
+
 .openerp.openerp-web-client-container
     height: 100%
     position: relative
 
+// Jquery ui Overrides {{{
+.ui-widget
+    font-family: "Lucida Grande", Helvetica, Verdana, Arial, sans-serif
+    font-size: 13px
+.ui-menu
+    .ui-menu-item
+        margin: 0 8px 0 0
+        padding: 0 0 0 12px
+        width: auto
+        a.ui-state-active
+            background: #f0f0fa
+// }}}
+
 .openerp
     // Global style {{{
     padding: 0
@@ -688,71 +702,6 @@ $colour4: #8a89ba
             &:hover
                 text-decoration: underline
     // }}}
-    // Content Header MIT {{{
-    .oe-view-manager-header
-        border-top: 1px solid #cacaca
-        border-bottom: 1px solid #cacaca
-        @include vertical-gradient(#fcfcfc, #dedede)
-        @include box-shadow((0 1px 0 rgba(255,255,255,0.4), 0 0 9px rgba(0,0,0,0.1)))
-        h2
-            float: left
-            font-size: 18px
-            margin: 1px 0
-            a
-                color: $colour4
-        .buttons
-            padding-right: 8px
-            li
-                float: left
-                margin-right: 12px
-        .filter
-            vertical-align: top
-            li
-                height: 24px
-                line-height: 24px
-                padding: 0 8px
-        .header-row
-            height: 26px
-            line-height: 26px
-            margin: 8px
-            clear: both
-            text-shadow: 0 1px 1px white
-            .dropdown-toggle:after
-                margin-top: 7px
-                margin-left: 6px
-                border-top-color: #404040
-        .oe_vm_switch
-            li
-                padding-left: 1px
-                text-align: center
-                width: 24px
-                height: 24px
-                line-height: 24px
-        .pagination
-            li
-                height: 24px
-                line-height: 24px
-                padding: 0 8px
-        .button-group
-            display: inline-block
-            border: 1px solid #ababab
-            @include radius(5px)
-            li
-                float: left
-                border-right: 1px solid #ababab
-                &:last-child
-                    border: none
-            a
-                color: #4c4c4c
-                &:hover
-                    text-decoration: none
-            .active
-                width: 100%
-                background: #999
-                @include box-shadow(0 1px 4px rgba(0,0,0,0.3) inset)
-                color: #fff
-                text-shadow: 0 1px 2px rgba(0,0,0,0.4)
-    // }}}
     // ViewManager.header {{{
     .oe_view_manager_header
         width: 100%
@@ -1858,6 +1807,25 @@ $colour4: #8a89ba
         .oe_tooltip_technical_title
             font-weight: bold
     // }}}
+    // View Editor {{{
+    .oe_view_editor
+        width: 100%
+        border-collapse: collapse
+        margin-left: -12px
+        width: 100%
+        background-color: white
+        border-spacing: 0
+        td
+            text-align: center
+            white-space: nowrap
+            border: 1px solid #D8D8D8
+            cursor: pointer
+            font-size: 90%
+    .oe_view_editor_field td
+        border: 0px !important
+    .oe_view_editor tr:hover
+        background-color: #ecebf2
+    // }}}
     // Debugging stuff {{{
     .oe_layout_debugging
         .oe_form_group
@@ -1893,32 +1861,15 @@ $colour4: #8a89ba
         float: right
         color: #333
     // }}}
-//view editor
-.openerp
-    .oe_view_editor
-        width: 100%
-        border-collapse: collapse
-        margin-left: -12px
-        width: 100%
-        background-color: white
-        border-spacing: 0
-        td
-            text-align: center
-            white-space: nowrap
-            border: 1px solid #D8D8D8
-            cursor: pointer
-            font-size: 90%
-    .oe_view_editor_field td
-        border: 0px !important
-    .oe_view_editor tr:hover
-        background-color: #ecebf2
 
+// Kitten Mode {{{
 .kitten-mode-activated
     background-image: url(http://placekitten.com/g/1365/769)
     background-size: cover
     background-attachment: fixed
     >*
         opacity: 0.70
+// }}}
 
 // Transitional overrides for old styles {{{
 .openerp