merge from trunk

bzr revid: mit@openerp.com-20120817144404-sxy9g3druktsu579

1 files changed, 14 insertions, 14 deletions

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index ab74e92ac69..87a83b4c70e 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1,4 +1,4 @@
-@charset "UTF-8";
+@charset "utf-8";
 @font-face {
   font-family: "mnmliconsRegular";
   src: url("/web/static/src/font/mnmliconsv21-webfont.eot") format("eot");
@@ -234,7 +234,7 @@
   font-size: 13px;
 }
 .openerp .ui-widget-content a {
-  color: #7c7bad;
+  color: #8a89ba;
 }
 .openerp .ui-menu .ui-menu-item {
   margin: 0 8px 0 0;
@@ -336,7 +336,7 @@
   border-radius: 0 0 2px 2px;
 }
 .openerp.ui-dialog .oe_about a {
-  color: #7c7bad;
+  color: #8a89ba;
 }
 .openerp.ui-dialog .oe_about a:hover {
   text-decoration: underline;
@@ -547,7 +547,7 @@
   -moz-box-shadow: none;
   -webkit-box-shadow: none;
   box-shadow: none;
-  color: #7c7bad;
+  color: #8a89ba;
   font-weight: bold;
 }
 .openerp .oe_button.oe_link span:hover {
@@ -578,7 +578,7 @@
   color: #4c4c4c;
 }
 .openerp .oe_tag_dark {
-  background: #7c7bad;
+  background: #8786b7;
   color: #eeeeee;
 }
 .openerp .oe_tags.oe_inline {
@@ -1180,7 +1180,7 @@
 .openerp .oe_secondary_menu_section {
   font-weight: bold;
   margin-left: 8px;
-  color: #7c7bad;
+  color: #8a89ba;
 }
 .openerp .oe_secondary_submenu {
   padding: 2px 0 8px 0;
@@ -1202,7 +1202,7 @@
   top: 1px;
   right: 1px;
   font-size: 10px;
-  background: #7c7bad;
+  background: #8a89ba;
   color: white;
   padding: 2px 4px;
   margin: 1px 6px 0 0;
@@ -1222,7 +1222,7 @@
   padding: 1px 4px;
 }
 .openerp .oe_secondary_submenu .oe_active {
-  background: #7c7bad;
+  background: #8a89ba;
   border-top: 1px solid lightGray;
   border-bottom: 1px solid lightGray;
   text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
@@ -1235,7 +1235,7 @@
 }
 .openerp .oe_secondary_submenu .oe_active .oe_menu_label {
   background: #eeeeee;
-  color: #7c7bad;
+  color: #8a89ba;
   text-shadow: 0 1px 1px white;
   -moz-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
   -webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
@@ -1243,7 +1243,7 @@
 }
 .openerp .oe_secondary_submenu .oe_active .oe_menu_counter {
   background: #eeeeee;
-  color: #7c7bad;
+  color: #8a89ba;
 }
 .openerp .oe_secondary_submenu .oe_menu_toggler:before {
   width: 0;
@@ -1273,7 +1273,7 @@
   width: 100%;
 }
 .openerp .oe_application a {
-  color: #7c7bad;
+  color: #8a89ba;
 }
 .openerp .oe_application a:hover {
   text-decoration: underline;
@@ -1314,7 +1314,7 @@
   float: left;
 }
 .openerp .oe_view_manager table.oe_view_manager_header h2 a {
-  color: #7c7bad;
+  color: #8a89ba;
 }
 .openerp .oe_view_manager table.oe_view_manager_header .oe_button_group {
   display: inline-block;
@@ -1673,7 +1673,7 @@
 }
 .openerp .oe_searchview .oe_searchview_drawer h3 {
   margin: 8px 4px 4px 12px;
-  color: #7c7bad;
+  color: #8786b7;
   font-size: 13px;
 }
 .openerp .oe_searchview .oe_searchview_drawer h4, .openerp .oe_searchview .oe_searchview_drawer h4 * {
@@ -2074,7 +2074,7 @@
   background-image: linear-gradient(to bottom, #e8e8e8, #cacaca);
 }
 .openerp ul.oe_form_steps_clickable li .label {
-  color: #7c7bad;
+  color: #8a89ba;
 }
 .openerp ul.oe_form_steps_clickable li.oe_active:hover {
   background-color: #4c85c2;