From 61a8a22f602d735fc891c36033ff0a48b8fb1a42 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Tue, 12 Nov 2013 15:36:35 +0100
Subject: [FIX] web: match base.sass against changes made in base.css in revid
 4014 mat@openerp.com-20130821080933-fiq3zvccgzop02on

bzr revid: chs@openerp.com-20131112143635-ek6yhfifb6ycynku
---
 addons/web/static/src/css/base.sass | 1 +
 1 file changed, 1 insertion(+)

(limited to 'addons/web/static/src/css')

diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index b2cca813331..6add7a3174b 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -1877,6 +1877,7 @@ $sheet-padding: 16px
             width: 100%
             display: inline-block
             padding: 2px 2px 2px 0px
+            vertical-align: top
             input
                 margin: 0px
         input[type="text"], input[type="password"], input[type="file"], select
-- 
cgit v1.2.3


From 6cfb4a03707a5f3330cdfaf369b650a4e0054d6b Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Tue, 12 Nov 2013 15:37:46 +0100
Subject: [FIX] web: do not enforce width of dropdown links

bzr revid: chs@openerp.com-20131112143746-svdfuqvzvvis6vpy
---
 addons/web/static/src/css/base.css  | 3 ---
 addons/web/static/src/css/base.sass | 3 ---
 2 files changed, 6 deletions(-)

(limited to 'addons/web/static/src/css')

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 9e77fc316b5..edd4d4869a5 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -718,9 +718,6 @@
   display: block;
   color: #4c4c4c;
   text-decoration: none;
-  width: 200px;
-  text-overflow: ellipsis;
-  overflow: hidden;
 }
 .openerp .oe_dropdown_menu > li > a:hover {
   text-decoration: none;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 6add7a3174b..4814e64c590 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -611,9 +611,6 @@ $sheet-padding: 16px
                 display: block
                 color: #4c4c4c
                 text-decoration: none
-                width: 200px
-                text-overflow: ellipsis
-                overflow: hidden
                 &:hover
                     text-decoration: none
     .oe_dropdown_arrow:after
-- 
cgit v1.2.3


From 584d21a26fb2bfd0af194f97bc200cfd98a39e92 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Mon, 18 Nov 2013 19:24:16 +0100
Subject: [FIX] field statusbar css color between stages

bzr revid: al@openerp.com-20131118182416-picnqdmcwbqalk2y
---
 addons/web/static/src/css/base.css  | 2 +-
 addons/web/static/src/css/base.sass | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'addons/web/static/src/css')

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 21d5edd5704..a9b4934e4da 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -3399,7 +3399,7 @@ div.ui-widget-overlay {
   background: transparent;
 }
 .openerp_ie ul.oe_form_status li > .arrow span, .openerp_ie ul.oe_form_status_clickable li > .arrow span {
-  background-color: #fefefe !important;
+  background-color: #eeeeee !important;
 }
 .openerp_ie ul.oe_form_status li.oe_active > .label, .openerp_ie ul.oe_form_status_clickable li.oe_active > .label {
   border-bottom: 1px solid #729fcf;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 13f1ab30b17..57d2a855512 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -2681,7 +2681,7 @@ div.ui-widget-overlay
                 background: transparent
             > .arrow
                 span
-                    background-color: #fefefe !important
+                    background-color: #eeeeee !important
         li.oe_active
             > .label
                 border-bottom: 1px solid #729fcf
-- 
cgit v1.2.3


From d6c6f31231070213bfabf0afdadc7a45d6fd626a Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Mon, 2 Dec 2013 14:19:43 +0100
Subject: [MERGE] boostrap3 manually merged

bzr revid: al@openerp.com-20131202131943-b01fb56u0qsgcs53
---
 addons/web/static/src/css/base.css        | 368 ++++++++++++++++++++----------
 addons/web/static/src/css/base.sass       | 287 ++++++++++++++++-------
 addons/web/static/src/css/data_export.css |   5 +
 3 files changed, 460 insertions(+), 200 deletions(-)

(limited to 'addons/web/static/src/css')

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index a9b4934e4da..010585ee4a0 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -111,6 +111,8 @@
 }
 .openerp h4 {
   margin: 4px 0;
+  font-weight: bold;
+  font-size: inherit;
 }
 .openerp a.button:link, .openerp a.button:visited, .openerp button, .openerp input[type='submit'], .openerp .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button {
   display: inline-block;
@@ -199,6 +201,7 @@
 }
 .openerp.ui-dialog {
   display: none;
+  height: auto !important;
   padding: 6px;
   background-color: rgba(60, 60, 60, 0.7);
   border: 1px solid;
@@ -241,6 +244,7 @@
 }
 .openerp.ui-dialog .ui-dialog-content {
   background: white;
+  width: auto !important;
 }
 .openerp.ui-dialog .ui-dialog-buttonpane {
   border-top: 1px solid #e0e0e0;
@@ -529,6 +533,15 @@
 .openerp .oe_grey {
   color: #aaaaaa;
 }
+.openerp .oe_error_detail hr {
+  display: block;
+  -webkit-margin-before: 0.5em;
+  -webkit-margin-after: 0.5em;
+  -webkit-margin-start: auto;
+  -webkit-margin-end: auto;
+  border-style: inset;
+  border-width: 1px;
+}
 .openerp .oe_tag {
   border: 1px solid #afafb6;
   font-size: 11px;
@@ -680,6 +693,9 @@
 .openerp .oe_notebook_page {
   padding: 0;
 }
+.openerp .oe_notebook_page > label:not([for]) {
+  font-weight: normal !important;
+}
 .openerp div.ui-tabs {
   padding: 3px 0px 3px 0px;
 }
@@ -976,7 +992,7 @@
 }
 .openerp .oe_login .oe_login_footer a {
   color: #eeeeee;
-  margin: 0 8px;
+  margin: 0 6px;
 }
 .openerp .oe_login .oe_login_footer a:hover {
   text-decoration: underline;
@@ -1022,19 +1038,7 @@
 .openerp .oe_content_full_screen .oe_topbar, .openerp .oe_content_full_screen .oe_leftbar {
   display: none;
 }
-.openerp .oe_topbar {
-  width: 100%;
-  height: 32px;
-  background-color: #414141;
-  background-color: #454343;
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#646060), to(#262626));
-  background-image: -webkit-linear-gradient(top, #646060, #262626);
-  background-image: -moz-linear-gradient(top, #646060, #262626);
-  background-image: -ms-linear-gradient(top, #646060, #262626);
-  background-image: -o-linear-gradient(top, #646060, #262626);
-  background-image: linear-gradient(to bottom, #646060, #262626);
-}
-.openerp .oe_topbar .oe_topbar_anonymous_login {
+.openerp .navbar .oe_topbar_anonymous_login {
   background-color: #dc5f59;
   color: #eeeeee;
   background-color: #be4343;
@@ -1045,11 +1049,11 @@
   background-image: -o-linear-gradient(top, #fc8787, maroon);
   background-image: linear-gradient(to bottom, #fc8787, maroon);
 }
-.openerp .oe_topbar .oe_topbar_anonymous_login a {
+.openerp .navbar .oe_topbar_anonymous_login a {
   display: block;
   padding: 5px 10px 7px;
   line-height: 20px;
-  height: 20px;
+  height: 30px;
   text-decoration: none;
   color: white;
   background: transparent;
@@ -1059,7 +1063,7 @@
   -o-transition: all 0.2s ease-out;
   transition: all 0.2s ease-out;
 }
-.openerp .oe_topbar .oe_topbar_anonymous_login a:hover {
+.openerp .navbar .oe_topbar_anonymous_login a:hover {
   background: rgba(0, 0, 0, 0.1);
   color: white;
   text-shadow: 0px 0px 3px rgba(0, 0, 0, 0.2);
@@ -1067,9 +1071,9 @@
   -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2) inset;
   box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2) inset;
 }
-.openerp .oe_topbar .oe_topbar_item {
+.openerp .navbar .oe_topbar_item {
   display: block;
-  padding: 5px 10px 7px;
+  padding: 5px 10px 26px;
   line-height: 20px;
   height: 20px;
   text-decoration: none;
@@ -1082,7 +1086,7 @@
   -o-transition: all 0.2s ease-out;
   transition: all 0.2s ease-out;
 }
-.openerp .oe_topbar .oe_topbar_item:hover {
+.openerp .navbar .oe_topbar_item:hover {
   background: rgba(0, 0, 0, 0.2);
   text-shadow: black 0px 0px 3px;
   color: white;
@@ -1090,7 +1094,7 @@
   -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.4) inset;
   box-shadow: 0 1px 2px rgba(0, 0, 0, 0.4) inset;
 }
-.openerp .oe_topbar .oe_topbar_avatar {
+.openerp .navbar .oe_topbar_avatar {
   width: 24px;
   height: 24px;
   margin: -2px 2px 0 0;
@@ -1098,13 +1102,13 @@
   -webkit-border-radius: 3px;
   border-radius: 3px;
 }
-.openerp .oe_topbar .oe_topbar_avatar {
+.openerp .navbar .oe_topbar_avatar {
   vertical-align: top;
 }
-.openerp .oe_topbar .oe_dropdown_arrow:after {
+.openerp .navbar .oe_dropdown_arrow:after {
   border-top: 4px solid white;
 }
-.openerp .oe_topbar .oe_dropdown_menu {
+.openerp .navbar .dropdown_menu {
   top: 32px;
   background: #333333;
   background: rgba(37, 37, 37, 0.9);
@@ -1119,14 +1123,14 @@
   -moz-background-clip: padding-box;
   background-clip: padding-box;
 }
-.openerp .oe_topbar .oe_dropdown_menu li {
+.openerp .navbar .dropdown_menu li {
   float: none;
   padding: 3px 12px;
 }
-.openerp .oe_topbar .oe_dropdown_menu li a {
+.openerp .navbar .dropdown_menu li a {
   color: #eeeeee;
 }
-.openerp .oe_topbar .oe_dropdown_menu li:hover {
+.openerp .navbar .dropdown_menu li:hover {
   background-color: #212121;
   background-image: -webkit-gradient(linear, left top, left bottom, from(#292929), to(#191919));
   background-image: -webkit-linear-gradient(top, #292929, #191919);
@@ -1138,21 +1142,21 @@
   -webkit-box-shadow: none;
   box-shadow: none;
 }
-.openerp .oe_topbar .oe_topbar_name {
+.openerp .navbar .oe_topbar_name {
   max-width: 150px;
-  overflow: hidden;
   display: inline-block;
-  max-height: 100%;
+  height: 15px;
   text-overflow: ellipsis;
   white-space: nowrap;
+  overflow: hidden;
 }
-.openerp .oe_menu {
+.openerp .navbar-nav {
   float: left;
   padding: 0;
   margin: 0;
   font-size: 13px;
 }
-.openerp .oe_menu > li {
+.openerp .navbar-nav > li {
   list-style-type: none;
   padding: 0;
   margin: 0;
@@ -1160,13 +1164,13 @@
   display: block;
   color: #eeeeee;
 }
-.openerp .oe_menu > li > a {
+.openerp .navbar-nav > li > a {
   display: block;
-  padding: 5px 10px 7px;
+  padding: 5px 10px 26px !important;
   line-height: 20px;
   height: 20px;
   text-decoration: none;
-  color: #eeeeee;
+  color: #eeeeee !important;
   vertical-align: top;
   text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
   -webkit-transition: all 0.2s ease-out;
@@ -1175,7 +1179,7 @@
   -o-transition: all 0.2s ease-out;
   transition: all 0.2s ease-out;
 }
-.openerp .oe_menu > li > a:hover {
+.openerp .navbar-nav > li > a:hover {
   background: rgba(0, 0, 0, 0.2);
   text-shadow: black 0px 0px 3px;
   color: white;
@@ -1183,7 +1187,7 @@
   -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.4) inset;
   box-shadow: 0 1px 2px rgba(0, 0, 0, 0.4) inset;
 }
-.openerp .oe_menu > li > .oe_active {
+.openerp .navbar-nav > li > .active {
   background: rgba(0, 0, 0, 0.3);
   text-shadow: black 0px 0px 3px;
   -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.4) inset;
@@ -1214,7 +1218,7 @@
   width: 220px;
   background: #f0eeee;
   border-right: 1px solid #afafb6;
-  text-shadow: 0 1px 1px white;
+  text-shadow: none;
   padding-bottom: 16px;
 }
 .openerp a.oe_logo {
@@ -1266,37 +1270,9 @@
   color: #7c7bad;
 }
 .openerp .oe_secondary_submenu {
-  padding: 2px 0 8px 0;
-  margin: 0;
-}
-.openerp .oe_secondary_submenu li {
-  position: relative;
-  margin: 0;
-  padding: 1px 0 1px 20px !important;
-  list-style-type: none;
-}
-.openerp .oe_secondary_submenu li a {
-  display: block;
-  color: #4c4c4c;
-  padding: 2px 4px 2px 0;
-}
-.openerp .oe_secondary_submenu li .oe_menu_label {
-  position: absolute;
-  top: 1px;
-  right: 1px;
-  font-size: 10px;
-  background: #7c7bad;
-  color: white;
-  padding: 2px 4px;
-  margin: 1px 6px 0 0;
-  border: 1px solid lightgrey;
-  text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
-  -moz-border-radius: 4px;
-  -webkit-border-radius: 4px;
-  border-radius: 4px;
-  -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.2);
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.2);
-  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.2);
+  margin-bottom: 10px !important;
+  line-height: 1.1em;
+  margin-top: 3px;
 }
 .openerp .oe_secondary_submenu .oe_menu_text {
   white-space: nowrap;
@@ -1304,15 +1280,9 @@
   display: inline-block;
   text-overflow: ellipsis;
   max-width: 85%;
+  margin-top: 1px;
 }
-.openerp .oe_secondary_submenu .oe_menu_counter {
-  float: right;
-  text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
-  margin: 1px;
-  padding: 1px 4px;
-  border: none;
-}
-.openerp .oe_secondary_submenu .oe_menu_counter:hover {
+.openerp .oe_secondary_submenu .badge:hover {
   cursor: pointer;
   -webkit-transform: scale(1.1);
   -moz-transform: scale(1.1);
@@ -1320,33 +1290,6 @@
   -o-transform: scale(1.1);
   transform: scale(1.1);
 }
-.openerp .oe_secondary_submenu .oe_active {
-  border-top: 1px solid lightgrey;
-  border-bottom: 1px solid #dedede;
-  text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
-  -moz-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.2), inset 0 -1px 3px rgba(40, 40, 40, 0.2);
-  -webkit-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.2), inset 0 -1px 3px rgba(40, 40, 40, 0.2);
-  box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.2), inset 0 -1px 3px rgba(40, 40, 40, 0.2);
-  background: #7c7bad;
-}
-.openerp .oe_secondary_submenu .oe_active a {
-  color: white;
-}
-.openerp .oe_secondary_submenu .oe_active .oe_menu_label {
-  background: #eeeeee;
-  color: #7c7bad;
-  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);
-  box-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
-}
-.openerp .oe_secondary_submenu .oe_active .oe_menu_counter {
-  background: #eeeeee;
-  color: #7c7bad;
-  -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.2);
-  -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.2);
-  box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.2);
-}
 .openerp .oe_secondary_submenu .oe_menu_toggler:before {
   width: 0;
   height: 0;
@@ -1371,9 +1314,6 @@
   border-right: 4px solid transparent;
   border-top: 4px solid #4c4c4c;
 }
-.openerp .oe_secondary_submenu .oe_secondary_submenu {
-  margin-left: -20px;
-}
 .openerp .oe_secondary_submenu .oe_secondary_submenu li {
   margin-left: 20px;
 }
@@ -1440,6 +1380,7 @@
 .openerp .oe_application .oe_breadcrumb_title > * {
   display: inline-block;
   overflow: hidden;
+  font-weight: bold;
 }
 .openerp .oe_view_manager {
   display: table;
@@ -1482,6 +1423,7 @@
   font-size: 18px;
   margin: 0;
   float: left;
+  line-height: 30px;
 }
 .openerp .oe_view_manager table.oe_view_manager_header h2 a {
   color: #7c7bad;
@@ -1652,9 +1594,12 @@
 .openerp .oe_view_manager_inline > .oe_view_manager_header, .openerp .oe_view_manager_inlineview > .oe_view_manager_header {
   display: none;
 }
-.openerp .oe_popup_form > .oe_formview > .oe_form_pager {
+.openerp .oe_popup_form .oe_formview .oe_form_pager {
   display: none !important;
 }
+.openerp .oe_popup_form table label {
+  font-weight: normal;
+}
 .openerp .oe_popup_list_pager {
   float: right;
 }
@@ -1680,6 +1625,16 @@
   font-size: 12px;
   line-height: 18px;
 }
+.openerp .oe_searchview input:not([type]), .openerp .oe_searchview input[type="text"], .openerp .oe_searchview input[type="number"] {
+  width: 156px;
+  height: 22px;
+}
+.openerp .oe_searchview input[type="checkbox"] {
+  margin: 3px 3px 3px 4px;
+}
+.openerp .oe_searchview select {
+  margin: 2px 4px 2px 0;
+}
 .openerp .oe_searchview.oe_focused {
   border-color: #a6a6fe;
   -moz-box-shadow: 0 1px 2px #a6a6fe inset;
@@ -1904,6 +1859,7 @@
   box-sizing: border-box;
   display: table-cell;
   width: 50%;
+  padding-left: 2px;
 }
 .openerp .oe_searchview .oe_searchview_drawer .oe_searchview_section ul {
   margin: 0 8px 8px;
@@ -1939,7 +1895,7 @@
   line-height: 18px;
 }
 .openerp .oe_searchview .oe_searchview_drawer form button {
-  margin: 0 0 8px 0;
+  margin: 0 0 8px -3px;
 }
 .openerp .oe_searchview .oe_searchview_drawer .oe_searchview_custom {
   padding: 0 8px 8px 8px;
@@ -1967,6 +1923,9 @@
   top: 0;
   right: 5px;
 }
+.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_custom label {
+  font-weight: normal;
+}
 .openerp .oe_searchview .oe_searchview_drawer .oe_searchview_dashboard form {
   display: none;
   margin-top: 2px;
@@ -1994,6 +1953,7 @@
 }
 .openerp .oe_searchview .oe_searchview_drawer .oe_searchview_advanced li:first-child .searchview_extended_prop_or {
   visibility: hidden;
+  margin-left: -14px;
 }
 .openerp .oe_searchview .oe_searchview_drawer .oe_searchview_advanced .searchview_extended_prop_or {
   opacity: 0.5;
@@ -2185,6 +2145,12 @@
   background: url(/web/static/src/img/form_sheetbg.png);
   border-bottom: 1px solid #dddddd;
 }
+.openerp .oe_application .oe_form_sheetbg .oe_subtotal_footer label {
+  font-weight: bold;
+}
+.openerp .oe_application .oe_form_sheetbg table label {
+  font-weight: normal;
+}
 .openerp .oe_application .oe_form_sheet {
   border: 1px solid #c8c8d3;
   -moz-box-shadow: 0 4px 20px rgba(0, 0, 0, 0.15);
@@ -2273,7 +2239,7 @@
   padding: 2px 11px 2px 0px !important;
 }
 .openerp .oe_form .oe_subtotal_footer label.oe_form_label_help {
-  font-weight: normal;
+  font-weight: normal !important;
 }
 .openerp .oe_form .oe_form_box_info {
   background: #ffee99;
@@ -2305,7 +2271,8 @@
 .openerp .oe_form td.oe_form_group_cell_label label {
   line-height: 18px;
   display: block;
-  min-width: 140px;
+  min-width: 150px;
+  font-weight: bold !important;
 }
 .openerp .oe_form td.oe_form_group_cell + .oe_form_group_cell {
   padding: 2px 0 2px 8px;
@@ -2318,13 +2285,12 @@
   padding-left: 20px;
 }
 .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;
+  color: darkGreen;
   vertical-align: top;
   position: relative;
   top: -4px;
@@ -2402,6 +2368,18 @@
   height: inherit !important;
   font-size: inherit;
 }
+.openerp .oe_form .oe_title h1, .openerp .oe_form h1 {
+  font-weight: bold;
+  font-size: 2em;
+}
+.openerp .oe_form h2 {
+  font-size: 1.5em;
+}
+.openerp .oe_form label {
+  font-weight: bold;
+  margin-bottom: 0px;
+  display: inline;
+}
 .openerp .oe_form .oe_form_field {
   width: 100%;
   display: inline-block;
@@ -2539,6 +2517,9 @@
   margin: 0;
   padding: 0;
 }
+.openerp .oe_form .oe_form_field_binary {
+  display: inline-block;
+}
 .openerp .oe_form .oe_form_field_image {
   padding: 0;
   position: relative;
@@ -2570,13 +2551,14 @@
   display: inline-block;
   clear: both;
   width: 100%;
+  margin-bottom: -15px;
 }
 .openerp .oe_fileupload .oe_add {
   float: left;
   position: relative;
   width: 100%;
   left: 2px;
-  top: 7px;
+  margin: 9px 0;
   overflow: hidden;
 }
 .openerp .oe_fileupload .oe_add button {
@@ -2588,9 +2570,6 @@
 }
 .openerp .oe_fileupload .oe_add button.oe_attach {
   width: 24px;
-  overflow: hidden;
-  width: 24px;
-  overflow: hidden;
   background: transparent;
   color: #7c7bad;
   box-shadow: none;
@@ -2639,6 +2618,9 @@
 .openerp .oe_fileupload .oe_attachments .oe_attachment:nth-child(even) {
   background: #f4f5fa;
 }
+.openerp .oe_form_field_many2one {
+  display: inline-block;
+}
 .openerp .oe_form_field_many2one td:first-child {
   position: relative;
 }
@@ -2701,9 +2683,13 @@
   padding-left: 24px;
   margin: 0;
   position: relative;
+  line-height: normal;
+  font-size: 100%;
+  font-weight: normal;
 }
 .openerp ul.oe_form_status li > .arrow, .openerp ul.oe_form_status_clickable li > .arrow {
   width: 17px;
+  height: 30px;
   display: inline-block;
   vertical-align: top;
   overflow: hidden;
@@ -3201,9 +3187,6 @@
   .openerp .oe_form_field_many2one .oe_m2o_cm_button {
     line-height: 18px;
   }
-  .openerp .oe_secondary_submenu {
-    line-height: 14px;
-  }
   .openerp .oe_webclient .oe_star_on, .openerp .oe_webclient .oe_star_off {
     top: 0px;
   }
@@ -3451,6 +3434,151 @@ div.ui-widget-overlay {
     overflow: hidden !important;
   }
 }
+
+.nav li > a {
+  padding: 3px 4px 2px 18px;
+  color: #4c4c4c;
+}
+.nav nav-pills.nav-stacked > li > ul {
+  padding-left: 16px;
+}
+
+.nav-pills > li.active > a, a.list-group-item.active > a {
+  background-color: #7c7bad;
+  color: white;
+  border-radius: 0;
+}
+.nav-pills > li.active a:hover, .nav-pills > li.active a:focus, a.list-group-item.active a:hover, a.list-group-item.active a:focus {
+  background-color: #7c7bad;
+}
+.nav-pills > li.active .badge, a.list-group-item.active .badge {
+  background-color: white;
+  color: #7c7bad;
+  text-shadow: none;
+}
+
+.badge {
+  font-weight: normal;
+  font-size: 11px;
+  background-color: #7c7bad;
+}
+
+button, body {
+  line-height: normal;
+}
+
+h1, h2 {
+  font-weight: bold;
+}
+
+h3 {
+  font-size: 1.17em;
+  font-weight: bold;
+}
+
+p {
+  display: block;
+  -webkit-margin-before: 1em;
+  -webkit-margin-after: 1em;
+  -webkit-margin-start: 0px;
+  -webkit-margin-end: 0px;
+}
+
+pre {
+  background-color: white;
+  border: none;
+  padding: 10px 0 3px 0;
+}
+
+.jqstooltip {
+  height: auto !important;
+  width: auto !important;
+}
+
+h5 {
+  font-weight: bold;
+  font-size: smaller;
+}
+
+.oe_form .oe_subtype label, .oe_subtype label {
+  font-weight: normal;
+}
+
+.oe_msg_subtype_check {
+  margin: 3px 3px 0 !important;
+}
+
+.oe_view_manager_new .oe_form_nosheet {
+  margin-top: 8px;
+}
+.oe_view_manager_new .oe_form_nosheet .oe_form_label {
+  font-weight: normal;
+}
+
+.navbar {
+  min-height: 32px;
+  margin-bottom: 0px;
+  border: none;
+  z-index: 1;
+  background-color: #414141;
+  background-color: #454343;
+  background-image: -webkit-gradient(linear, left top, left bottom, from(#646060), to(#262626));
+  background-image: -webkit-linear-gradient(top, #646060, #262626);
+  background-image: -moz-linear-gradient(top, #646060, #262626);
+  background-image: -ms-linear-gradient(top, #646060, #262626);
+  background-image: -o-linear-gradient(top, #646060, #262626);
+  background-image: linear-gradient(to bottom, #646060, #262626);
+}
+
+.navbar-default .navbar-nav li a:hover, .navbar-default .navbar-nav li a:focus {
+  background: rgba(0, 0, 0, 0.3);
+}
+.navbar-default .navbar-nav .open > a, .navbar-default .navbar-nav a:hover, .navbar-default .navbar-nav a:focus {
+  background: rgba(0, 0, 0, 0.3) !important;
+}
+.navbar-default .navbar-nav .dropdown > a .caret {
+  border-top-color: #777777 !important;
+  border-bottom-color: #777777 !important;
+}
+
+.navbar-nav li a {
+  padding: 4px 32px 4px 12px;
+}
+
+.dropdown-menu {
+  font-size: 13px;
+  padding: 4px 0;
+  background: #333333 !important;
+  background: rgba(37, 37, 37, 0.9) !important;
+  border-color: #999999;
+  border-color: rgba(0, 0, 0, 0.2);
+  background-color: #414141;
+  text-shadow: none;
+  background-color: #454343;
+  background-image: -webkit-gradient(linear, left top, left bottom, from(#646060), to(#262626));
+  background-image: -webkit-linear-gradient(top, #646060, #262626);
+  background-image: -moz-linear-gradient(top, #646060, #262626);
+  background-image: -ms-linear-gradient(top, #646060, #262626);
+  background-image: -o-linear-gradient(top, #646060, #262626);
+  background-image: linear-gradient(to bottom, #646060, #262626);
+  -moz-border-radius: 3px;
+  -webkit-border-radius: 3px;
+  border-radius: 3px;
+}
+.dropdown-menu li a, .dropdown-menu li a:hover, .dropdown-menu li a:focus {
+  color: #eeeeee;
+}
+
+.ui-icon {
+  width: 18px;
+  height: 18px;
+}
+
+input[type="radio"], input[type="checkbox"] {
+  margin-right: 4px;
+  margin-left: 4px;
+}
+
 .blockUI.blockOverlay {
   background-color: black;
   opacity: 0.6;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 57d2a855512..e9a51370192 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -204,6 +204,8 @@ $sheet-padding: 16px
         vertical-align: middle
     h4
         margin: 4px 0
+        font-weight: bold
+        font-size: inherit
     // }}}
     // Button style {{{
     a.button:link, a.button:visited, button, input[type='submit'], .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button
@@ -263,6 +265,7 @@ $sheet-padding: 16px
     // Modal box
     &.ui-dialog
         display: none
+        height: auto !important
         padding: 6px
         //overflow: hidden
         background-color: rgba(60,60,60,0.7)
@@ -287,6 +290,7 @@ $sheet-padding: 16px
             border: none
         .ui-dialog-content
             background: white
+            width: auto !important
         .ui-dialog-buttonpane
             border-top: 1px solid #e0e0e0
             background: #f5f7f9
@@ -467,7 +471,16 @@ $sheet-padding: 16px
         max-width: 650px
     .oe_grey
         color: #aaa
-
+    // Added for generic error message and customize bootstrap3 <pre>,<hr>
+    .oe_error_detail 
+        hr
+            display: block
+            -webkit-margin-before: 0.5em
+            -webkit-margin-after: 0.5em
+            -webkit-margin-start: auto
+            -webkit-margin-end: auto
+            border-style: inset
+            border-width: 1px
     // }}}
 
     // Tags (for many2many tags, among others) {{{
@@ -589,6 +602,10 @@ $sheet-padding: 16px
         cursor: default
     .oe_notebook_page
         padding: 0
+        //Customize label weight according bootstrap3
+        > label:not([for])
+            font-weight: normal !important
+        // End of customize 
     div.ui-tabs
         padding: 3px 0px 3px 0px
     .ui-tabs-hide
@@ -811,7 +828,7 @@ $sheet-padding: 16px
             text-align: center
             a
                 color: #eee
-                margin: 0 8px
+                margin: 0 6px
                 &:hover
                     text-decoration: underline
             span
@@ -854,11 +871,7 @@ $sheet-padding: 16px
     // }}}
     // Top Menu {{{
 
-    .oe_topbar
-        width: 100%
-        height: 32px
-        background-color: #414141
-        @include vertical-gradient(#646060, #262626)
+    .navbar
         .oe_topbar_anonymous_login
             background-color: #dc5f59
             color: #eeeeee
@@ -867,7 +880,7 @@ $sheet-padding: 16px
                 display: block
                 padding: 5px 10px 7px
                 line-height: 20px
-                height: 20px
+                height: 30px
                 text-decoration: none
                 color: white
                 background: transparent
@@ -879,7 +892,7 @@ $sheet-padding: 16px
                 @include box-shadow(0 1px 2px rgba(0,0,0,0.2) inset)
         .oe_topbar_item
             display: block
-            padding: 5px 10px 7px
+            padding: 5px 10px 26px
             line-height: 20px
             height: 20px
             text-decoration: none
@@ -902,7 +915,7 @@ $sheet-padding: 16px
             vertical-align: top
         .oe_dropdown_arrow:after
             border-top: 4px solid white
-        .oe_dropdown_menu
+        .dropdown_menu
             top: 32px
             background: #333
             background: rgba(37,37,37,0.9)
@@ -922,17 +935,17 @@ $sheet-padding: 16px
                     @include box-shadow(none)
         .oe_topbar_name
             max-width: 150px
-            overflow: hidden
             display: inline-block
-            max-height: 100%
+            height: 15px // Customize to manage caret when topbar_name is over sized.
             text-overflow: ellipsis
             white-space: nowrap
+            overflow: hidden // Customize to bring ellipsis when topbar_name is over sized.
 
     // oe menu is the list of the buttons on the left side of the bar.
     // So why aren't the buttons oe_topbar_items ? This sad state of affairs
     // is a leftover from an uncomplete refactoring when the left and top menu
     // were merged. You are welcome to refactor and clean this up
-    .oe_menu
+    .navbar-nav
         float: left
         padding: 0
         margin: 0
@@ -946,11 +959,11 @@ $sheet-padding: 16px
             color: #eeeeee
             > a
                 display: block
-                padding: 5px 10px 7px
+                padding: 5px 10px 26px !important
                 line-height: 20px
                 height: 20px
                 text-decoration: none
-                color: #eee
+                color: #eee !important
                 vertical-align: top
                 text-shadow: 0 1px 1px rgba(0,0,0,0.2)
                 @include transition(all 0.2s ease-out)
@@ -959,7 +972,7 @@ $sheet-padding: 16px
                     text-shadow: black 0px 0px 3px
                     color: white
                     @include box-shadow(0 1px 2px rgba(0,0,0,0.4) inset)
-            > .oe_active
+            > .active
                 background: rgba(0,0,0,0.30)
                 text-shadow: black 0px 0px 3px
                 @include box-shadow(0 1px 2px rgba(0,0,0,0.4) inset)
@@ -987,7 +1000,7 @@ $sheet-padding: 16px
         width: 220px
         background: #f0eeee
         border-right: 1px solid $tag-border
-        text-shadow: 0 1px 1px white
+        text-shadow: none
         padding-bottom: 16px
     a.oe_logo
         position: relative
@@ -1030,62 +1043,20 @@ $sheet-padding: 16px
         margin-left: 8px
         color: $link-color
     .oe_secondary_submenu
-        padding: 2px 0 8px 0
-        margin: 0
-        li
-            position: relative
-            margin: 0
-            padding: 1px 0 1px 20px !important
-            list-style-type: none
-            a
-                display: block
-                color: #4c4c4c
-                padding: 2px 4px 2px 0
-            .oe_menu_label
-                position: absolute
-                top: 1px
-                right: 1px
-                font-size: 10px
-                background: $link-color
-                color: white
-                padding: 2px 4px
-                margin: 1px 6px 0 0
-                border: 1px solid lightGray
-                text-shadow: 0 1px 1px rgba(0,0,0,0.2)
-                @include radius(4px)
-                @include box-shadow(inset 0 1px 1px rgba(0, 0, 0, 0.2))
+        margin-bottom: 10px !important
+        line-height: 1.1em
+        margin-top: 3px
         .oe_menu_text
             white-space: nowrap
             overflow: hidden
             display: inline-block
             text-overflow: ellipsis
             max-width: 85%
-        .oe_menu_counter
-            float: right
-            text-shadow: 0 1px 1px rgba(0,0,0,0.2)
-            margin: 1px
-            padding: 1px 4px
-            border: none
+            margin-top: 1px
+        .badge
             &:hover
                 cursor: pointer
                 @include transform(scale(1.1))
-        .oe_active
-            border-top: 1px solid lightGray
-            border-bottom: 1px solid #dedede
-            text-shadow: 0 1px 1px rgba(0,0,0,0.2)
-            @include box-shadow((inset 0 1px 3px rgba(0, 0, 0, 0.2), inset 0 -1px 3px rgba(40, 40, 40, 0.2)))
-            background: $link-color
-            a
-                color: white
-            .oe_menu_label
-                background: #eee
-                color: $link-color
-                text-shadow: 0 1px 1px white
-                @include box-shadow(0 1px 1px rgba(0, 0, 0, 0.2))
-            .oe_menu_counter
-                background: #eee
-                color: $link-color
-                @include box-shadow(inset 0 1px 2px rgba(0, 0, 0, 0.2))
         .oe_menu_toggler:before
             width: 0
             height: 0
@@ -1107,11 +1078,8 @@ $sheet-padding: 16px
             border-left: 4px solid transparent
             border-right: 4px solid transparent
             border-top: 4px solid #4c4c4c
-        .oe_secondary_submenu
-            margin-left: -20px
         .oe_secondary_submenu li
             margin-left: 20px
-
     // }}}
     // About openerp {{{
     .oe_about
@@ -1157,6 +1125,7 @@ $sheet-padding: 16px
         .oe_breadcrumb_title > *
             display: inline-block
             overflow: hidden
+            font-weight: bold
     // }}}
     // ViewManager common {{{
     .oe_view_manager
@@ -1195,6 +1164,7 @@ $sheet-padding: 16px
                 font-size: 18px
                 margin: 0
                 float: left
+                line-height: 30px
                 a
                     color: $link-color
             .oe_dropdown_menu
@@ -1323,8 +1293,13 @@ $sheet-padding: 16px
             display: none
     // }}}
     // FormPopup {{{
-    .oe_popup_form > .oe_formview > .oe_form_pager
-        display: none !important
+    .oe_popup_form 
+        .oe_formview .oe_form_pager
+            display: none !important
+        // Customize label weight for popup wizard appear from another wizard according bootstrap3
+        table label
+            font-weight: normal
+        // End of customize
     .oe_popup_list_pager
         float: right
     // }}}
@@ -1345,6 +1320,15 @@ $sheet-padding: 16px
             height: 14px
             font-size: 12px
             line-height: 18px
+        //Customize searchview input, select
+        input:not([type]), input[type="text"], input[type="number"]
+            width: 156px
+            height: 22px
+        input[type="checkbox"]
+            margin: 3px 3px 3px 4px
+        select
+            margin: 2px 4px 2px 0 
+        //End of customize
         &.oe_focused
             border-color: $tag-border-selected
             @include box-shadow(0 1px 2px $tag-border-selected inset)
@@ -1509,6 +1493,7 @@ $sheet-padding: 16px
                     @include box-sizing(border)
                     display: table-cell
                     width: 50%
+                    padding-left: 2px // Managed padding-left according bootstrap3
                 ul
                     margin: 0 8px 8px
                     padding: 0
@@ -1538,7 +1523,7 @@ $sheet-padding: 16px
                     margin: 4px 0
                     line-height: 18px
                 button
-                    margin: 0 0 8px 0
+                    margin: 0 0 8px -3px // Managed margin-left according bootstrap3
             .oe_searchview_custom
                 padding: 0 8px 8px 8px
                 div
@@ -1558,6 +1543,10 @@ $sheet-padding: 16px
                         position: absolute
                         top: 0
                         right: 5px
+                //Customize for searchview label
+                label
+                    font-weight: normal
+                //End of Customize
             .oe_searchview_dashboard
                 form
                     display: none
@@ -1583,9 +1572,10 @@ $sheet-padding: 16px
                     white-space: nowrap
                     &:first-child .searchview_extended_prop_or
                         visibility: hidden
+                        margin-left: -14px
                 .searchview_extended_prop_or
                     opacity: 0.5
-                    margin-left: -14px
+                    margin-left: -14px //Customize 'or' in searchview
             .oe_opened
                 h4:before
                     content: "▾ "
@@ -1732,6 +1722,12 @@ $sheet-padding: 16px
         .oe_form_sheetbg
             background: url(/web/static/src/img/form_sheetbg.png)
             border-bottom: 1px solid #ddd
+            // Customize font weight according bootstrap3
+            .oe_subtotal_footer label
+                font-weight: bold
+            table label
+                font-weight: normal
+            // End of customize
         .oe_form_sheet
             border: 1px solid #c8c8d3 //$tag-border
             @include box-shadow(0 4px 20px rgba(0,0,0,0.15))
@@ -1799,7 +1795,7 @@ $sheet-padding: 16px
                 font-weight: bold !important
                 padding: 2px 11px 2px 0px !important
             label.oe_form_label_help
-                font-weight: normal
+                font-weight: normal !important
         .oe_form_box_info
             background: #fe9
             border-bottom: 1px solid #cb6
@@ -1826,7 +1822,8 @@ $sheet-padding: 16px
             label
                 line-height: 18px
                 display: block
-                min-width: 140px
+                min-width: 150px
+                font-weight: bold !important
         td.oe_form_group_cell + .oe_form_group_cell
             padding: 2px 0 2px 8px
         .oe_form_group
@@ -1838,7 +1835,6 @@ $sheet-padding: 16px
     // FormView.label {{{
     .oe_form
         .oe_form_label_help[for], .oe_form_label[for]
-            font-weight: bold
             white-space: nowrap
             padding-right: 8px
             span
@@ -1907,6 +1903,17 @@ $sheet-padding: 16px
             input
                 height: inherit !important
                 font-size: inherit
+        // Customize for formview
+        .oe_title h1, h1
+            font-weight: bold
+            font-size: 2em
+        h2
+            font-size: 1.5em
+        label
+            font-weight: bold
+            margin-bottom: 0px
+            display: inline
+        // End of customize
         .oe_form_field
             width: 100%
             display: inline-block
@@ -2022,6 +2029,8 @@ $sheet-padding: 16px
             margin: 0
             padding: 0
     .oe_form
+        .oe_form_field_binary
+            display: inline-block
         .oe_form_field_image
             padding: 0
             position: relative
@@ -2045,12 +2054,13 @@ $sheet-padding: 16px
         display: inline-block
         clear: both
         width: 100%
+        margin-bottom: -15px
         .oe_add
             float: left
             position: relative
             width: 100%
             left: +2px
-            top: +7px
+            margin: 9px 0 /* Customize margin according bootstrap3 */
             overflow: hidden
             button
                 display: inline
@@ -2060,9 +2070,6 @@ $sheet-padding: 16px
                 vertical-align: middle
             button.oe_attach
                 width: 24px
-                overflow: hidden
-                width: 24px
-                overflow: hidden
                 background: transparent
                 color: #7C7BAD
                 box-shadow: none
@@ -2104,6 +2111,7 @@ $sheet-padding: 16px
     // }}}
     // FormView.many2one {{{
     .oe_form_field_many2one
+        display: inline-block
         td:first-child
             position: relative
         span.oe_m2o_drop_down_button
@@ -2152,8 +2160,14 @@ $sheet-padding: 16px
                 padding-left: 24px
                 margin: 0
                 position: relative
+                // Customize for statusbar label
+                line-height: normal
+                font-size: 100%
+                font-weight: normal
+                // End of customize
             > .arrow
                 width: 17px
+                height: 30px
                 display: inline-block
                 vertical-align: top
                 overflow: hidden
@@ -2522,8 +2536,6 @@ $sheet-padding: 16px
             top: -1px
         .oe_form_field_many2one .oe_m2o_cm_button
             line-height: 18px
-        .oe_secondary_submenu
-            line-height: 14px
         .oe_webclient
             .oe_star_on, .oe_star_off
                 top: 0px
@@ -2728,6 +2740,121 @@ div.ui-widget-overlay
             overflow: hidden !important
 // }}}
 
+// Customize bootstrap3 for leftbar
+.nav
+    li > a
+        padding: 3px 4px 2px 18px
+        color: #4c4c4c
+    nav-pills.nav-stacked > li > ul
+        padding-left: 16px
+.nav-pills > li.active,a.list-group-item.active
+    > a
+        background-color: #7c7bad
+        color: white
+        border-radius: 0
+    a:hover,a:focus
+        background-color: #7c7bad
+    .badge
+        background-color: white
+        color: #7c7bad
+        text-shadow: none
+.badge
+    font-weight: normal
+    font-size: 11px
+    background-color: #7c7bad
+// End of customize
+
+// Customize for global tags
+button, body
+    line-height: normal
+h1,h2
+    font-weight: bold
+h3
+    font-size: 1.17em
+    font-weight: bold
+p
+    display: block
+    -webkit-margin-before: 1em
+    -webkit-margin-after: 1em
+    -webkit-margin-start: 0px
+    -webkit-margin-end: 0px
+pre
+    background-color: #FFFFFF
+    border: none
+    padding: 10px 0 3px 0
+// End of customize
+
+// Customize for kanban tooltip
+.jqstooltip
+    height: auto !important
+    width: auto !important
+// End of kanban tooltip
+
+// Customize for chatter
+h5
+    font-weight: bold
+    font-size: smaller
+.oe_form .oe_subtype label, .oe_subtype label
+    font-weight: normal
+.oe_msg_subtype_check
+    margin: 3px 3px 0 !important
+// End of customize
+
+// Minimized unused white space and label weight for wizard popup
+.oe_view_manager_new .oe_form_nosheet
+    margin-top: 8px
+    .oe_form_label
+        font-weight: normal
+// End of customize
+
+// navbar hack {{{
+.navbar
+    min-height: 32px
+    margin-bottom: 0px
+    border: none
+    z-index: 1
+    background-color: #414141
+    @include vertical-gradient(#646060, #262626)
+.navbar-default
+    .navbar-nav
+        li
+            a:hover,a:focus
+                background: rgba(0, 0, 0, 0.3)
+        .open > a,a:hover,a:focus
+            background: rgba(0, 0, 0, 0.3) !important
+        .dropdown > a .caret
+            border-top-color: #777 !important
+            border-bottom-color: #777 !important
+.navbar-nav
+    li
+        a
+            padding: 4px 32px 4px 12px
+.dropdown-menu
+    font-size: 13px
+    padding: 4px 0
+    background: #333333 !important
+    background: rgba(37, 37, 37, 0.9) !important
+    border-color: #999999
+    border-color: rgba(0, 0, 0, 0.2)
+    background-color: #414141
+    text-shadow: none
+    @include vertical-gradient(#646060, #262626)
+    @include radius(3px)
+    li
+        a,a:hover,a:focus
+            color: #eeeeee
+// End hack }}}
+
+// Hack for ui icon {{{
+.ui-icon
+    width: 18px
+    height: 18px
+// End hack}}}
+
+input[type="radio"], input[type="checkbox"]
+    margin-right: 4px
+    margin-left: 4px
+
 .blockUI.blockOverlay
     background-color: black
     opacity: 0.6000000238418579
diff --git a/addons/web/static/src/css/data_export.css b/addons/web/static/src/css/data_export.css
index 3fa24265b45..b9b885cd8e9 100644
--- a/addons/web/static/src/css/data_export.css
+++ b/addons/web/static/src/css/data_export.css
@@ -1,6 +1,11 @@
 .openerp .oe_export {
     width: 100%;
 }
+/* Customize according bootstrap3 */
+.openerp .oe_export label {
+    font-weight: normal;
+}
+/* End of customize */
 .openerp .oe_export_row tr{
     background-color: #FFFFFF;
     font-size: 0.8em;
-- 
cgit v1.2.3


From bab3b3b8d4a2731e74bcd2b2f28301455d563534 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Mon, 2 Dec 2013 17:28:39 +0100
Subject: [IMP] css small change for bootstrap

bzr revid: chm@openerp.com-20131202162839-9fa0jc7vhyxltje3
---
 addons/web/static/src/css/Makefile  |  5 ++---
 addons/web/static/src/css/base.css  | 32 +++++++++++++++-----------------
 addons/web/static/src/css/base.sass | 21 ++++++++++-----------
 3 files changed, 27 insertions(+), 31 deletions(-)

(limited to 'addons/web/static/src/css')

diff --git a/addons/web/static/src/css/Makefile b/addons/web/static/src/css/Makefile
index d6b4f4b2fc8..f4f1f6d1bb5 100644
--- a/addons/web/static/src/css/Makefile
+++ b/addons/web/static/src/css/Makefile
@@ -1,3 +1,2 @@
-base.css: base.sass
-	sass --trace -t expanded base.sass base.css
-
+sass:
+	sass -t expanded --compass --unix-newlines --watch base.sass:base.css&
\ No newline at end of file
diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 010585ee4a0..51ab81010f8 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -27,7 +27,6 @@
   color: #4c4c4c;
   font-size: 13px;
   background: white;
-  text-shadow: 0 1px 1px rgba(255, 255, 255, 0.5);
   /* http://www.quirksmode.org/dom/inputfile.html
    * http://stackoverflow.com/questions/2855589/replace-input-type-file-by-an-image
    */
@@ -114,7 +113,7 @@
   font-weight: bold;
   font-size: inherit;
 }
-.openerp a.button:link, .openerp a.button:visited, .openerp button, .openerp input[type='submit'], .openerp .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button {
+.openerp a.button:link, .openerp a.button:visited, .openerp .oe_button, .openerp input[type='submit'], .openerp .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button {
   display: inline-block;
   border: 1px solid rgba(0, 0, 0, 0.4);
   color: #4c4c4c;
@@ -139,7 +138,7 @@
   -webkit-font-smoothing: antialiased;
   outline: none;
 }
-.openerp a.button:hover, .openerp button:hover, .openerp input[type='submit']:hover, .openerp .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button.ui-state-hover {
+.openerp a.button:hover, .openerp .oe_button:hover, .openerp input[type='submit']:hover, .openerp .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button.ui-state-hover {
   background-color: #ececec;
   background-image: -webkit-gradient(linear, left top, left bottom, from(#f6f6f6), to(#e3e3e3));
   background-image: -webkit-linear-gradient(top, #f6f6f6, #e3e3e3);
@@ -150,7 +149,7 @@
   cursor: pointer;
   background-position: 0;
 }
-.openerp a.button:focus, .openerp button:focus, .openerp input[type='submit']:focus, .openerp .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button.ui-state-focus {
+.openerp a.button:focus, .openerp .oe_button:focus, .openerp input[type='submit']:focus, .openerp .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button.ui-state-focus {
   border: 1px solid #80bfff;
   background-position: 0;
   background-color: #ececec;
@@ -164,7 +163,7 @@
   -webkit-box-shadow: 0 0 3px #80bfff, 0 1px 1px rgba(255, 255, 255, 0.8) inset;
   box-shadow: 0 0 3px #80bfff, 0 1px 1px rgba(255, 255, 255, 0.8) inset;
 }
-.openerp a.button:active, .openerp a.button.active, .openerp button:active, .openerp button.active, .openerp input[type='submit']:active, .openerp input[type='submit'].active, .openerp .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button.ui-state-active {
+.openerp a.button:active, .openerp a.button.active, .openerp .oe_button:active, .openerp .oe_button.active, .openerp input[type='submit']:active, .openerp input[type='submit'].active, .openerp .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button.ui-state-active {
   background-color: #ececec;
   background-image: -webkit-gradient(linear, left top, left bottom, from(#e3e3e3), to(#f6f6f6));
   background-image: -webkit-linear-gradient(top, #e3e3e3, #f6f6f6);
@@ -176,7 +175,7 @@
   -webkit-box-shadow: none;
   box-shadow: none;
 }
-.openerp a.button.disabled, .openerp button:disabled, .openerp input[type='submit']:disabled {
+.openerp a.button.disabled, .openerp .oe_button:disabled, .openerp input[type='submit']:disabled {
   background: #efefef !important;
   border: 1px solid #d1d1d1 !important;
   -moz-box-shadow: none !important;
@@ -1047,7 +1046,7 @@
   background-image: -moz-linear-gradient(top, #fc8787, maroon);
   background-image: -ms-linear-gradient(top, #fc8787, maroon);
   background-image: -o-linear-gradient(top, #fc8787, maroon);
-  background-image: linear-gradient(to bottom, #fc8787, maroon);
+  background-image: linear-gradient(to bottom, #fc8787, #800000);
 }
 .openerp .navbar .oe_topbar_anonymous_login a {
   display: block;
@@ -1359,16 +1358,16 @@
 .openerp .oe_about .oe_bottom a {
   color: #eeeeee;
 }
-.openerp .oe_application {
-  width: 100%;
-  height: 100%;
-}
-.openerp .oe_application a {
+.openerp .oe_form_uri {
   color: #7c7bad;
 }
-.openerp .oe_application a:hover {
+.openerp .oe_form_uri:hover {
   text-decoration: underline;
 }
+.openerp .oe_application {
+  width: 100%;
+  height: 100%;
+}
 .openerp .oe_application > div {
   height: 100%;
 }
@@ -2290,7 +2289,7 @@
 }
 .openerp .oe_form .oe_form_label_help[for] span, .openerp .oe_form .oe_form_label[for] span {
   font-size: 80%;
-  color: darkGreen;
+  color: darkgreen;
   vertical-align: top;
   position: relative;
   top: -4px;
@@ -3434,7 +3433,6 @@ div.ui-widget-overlay {
     overflow: hidden !important;
   }
 }
-
 .nav li > a {
   padding: 3px 4px 2px 18px;
   color: #4c4c4c;
@@ -3545,7 +3543,7 @@ h5 {
   padding: 4px 32px 4px 12px;
 }
 
-.dropdown-menu {
+.oe_navbar .dropdown-menu {
   font-size: 13px;
   padding: 4px 0;
   background: #333333 !important;
@@ -3565,7 +3563,7 @@ h5 {
   -webkit-border-radius: 3px;
   border-radius: 3px;
 }
-.dropdown-menu li a, .dropdown-menu li a:hover, .dropdown-menu li a:focus {
+.oe_navbar .dropdown-menu li a, .oe_navbar .dropdown-menu li a:hover, .oe_navbar .dropdown-menu li a:focus {
   color: #eeeeee;
 }
 
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index e9a51370192..27f99ccc9d9 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -151,7 +151,6 @@ $sheet-padding: 16px
     color: #4c4c4c
     font-size: 13px
     background: white
-    text-shadow: 0 1px 1px rgba(255, 255, 255, 0.5)
     &.openerp_webclient_container
         height: 100%
     // }}}
@@ -208,7 +207,7 @@ $sheet-padding: 16px
         font-size: inherit
     // }}}
     // Button style {{{
-    a.button:link, a.button:visited, button, input[type='submit'], .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button
+    a.button:link, a.button:visited, .oe_button, input[type='submit'], .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button
         display: inline-block
         border: 1px solid rgba(0,0,0,0.4)
         color: #4c4c4c
@@ -223,22 +222,22 @@ $sheet-padding: 16px
         -webkit-font-smoothing: antialiased
         outline: none
 
-    a.button:hover, button:hover, input[type='submit']:hover, .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button.ui-state-hover
+    a.button:hover, .oe_button:hover, input[type='submit']:hover, .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button.ui-state-hover
         @include vertical-gradient(#f6f6f6, #e3e3e3)
         cursor: pointer
         background-position: 0
 
-    a.button:focus, button:focus, input[type='submit']:focus, .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button.ui-state-focus
+    a.button:focus, .oe_button:focus, input[type='submit']:focus, .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button.ui-state-focus
         border: 1px solid #80bfff
         background-position: 0
         @include vertical-gradient(#f6f6f6, #e3e3e3)
         @include box-shadow((0 0 3px #80bfff, 0 1px 1px rgba(255, 255, 255, .8) inset))
 
-    a.button:active, a.button.active, button:active, button.active, input[type='submit']:active, input[type='submit'].active, .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button.ui-state-active
+    a.button:active, a.button.active, .oe_button:active, .oe_button.active, input[type='submit']:active, input[type='submit'].active, .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button.ui-state-active
         @include vertical-gradient(#e3e3e3, #f6f6f6)
         @include box-shadow(none)
 
-    a.button.disabled, button:disabled, input[type='submit']:disabled
+    a.button.disabled, .oe_button:disabled, input[type='submit']:disabled
         background: #efefef !important
         border: 1px solid #d1d1d1 !important
         @include box-shadow(none !important)
@@ -1109,13 +1108,13 @@ $sheet-padding: 16px
                 color: #eee
     // }}}
     // ActionManager {{{
+    .oe_form_uri
+        color: $link-color
+        &:hover
+            text-decoration: underline
     .oe_application
         width: 100%
         height: 100%
-        a
-            color: $link-color
-            &:hover
-                text-decoration: underline
         > div
             height: 100%
         .oe_breadcrumb_item:not(:last-child)
@@ -2829,7 +2828,7 @@ h5
     li
         a
             padding: 4px 32px 4px 12px
-.dropdown-menu
+.oe_navbar .dropdown-menu
     font-size: 13px
     padding: 4px 0
     background: #333333 !important
-- 
cgit v1.2.3


From f32b87e14d7b1c587389eaabde676060e54b6fb3 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Tue, 10 Dec 2013 12:24:44 +0100
Subject: [FIX] css: avoid tabs in row below to move when selected (opw 601379)

bzr revid: mat@openerp.com-20131210112444-pk9yh8bke1z7eerr
---
 addons/web/static/src/css/base.css  | 4 ++++
 addons/web/static/src/css/base.sass | 3 +++
 2 files changed, 7 insertions(+)

(limited to 'addons/web/static/src/css')

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index edd4d4869a5..fabb8503b34 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -623,6 +623,10 @@
   display: block;
   color: gray;
 }
+.openerp .ui-tabs .oe_notebook.ui-tabs-nav li.ui-tabs-active { 
+  border-bottom: none;
+  padding-bottom: 1px;
+}
 .openerp .oe_notebook > li.ui-tabs-active > a {
   color: #4c4c4c;
 }
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 4814e64c590..c54cd2920c0 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -561,6 +561,9 @@ $sheet-padding: 16px
         text-decoration: none
         background-color: #eee
         border-color: #eee #eee #ddd
+    .ui-tabs .oe_notebook.ui-tabs-nav li.ui-tabs-active
+        border-bottom: none
+        padding-bottom: 1px
     .oe_notebook > li.ui-state-active > a, .oe_notebook > li.ui-state-active > a:hover
         background-color: #ffffff
         border: 1px solid #ddd
-- 
cgit v1.2.3


From 56a78ab3a49e34c66e6e4c01e12729cb3356d166 Mon Sep 17 00:00:00 2001
From: Vidhin Mehta <vme@tinyerp.com>
Date: Tue, 17 Dec 2013 13:00:42 +0530
Subject: [FIX]Issue of trunk in website branch.

bzr revid: vme@tinyerp.com-20131217073042-13d3aa7vgct4l3xw
---
 addons/web/static/src/css/base.css  | 17 ++++++++++-------
 addons/web/static/src/css/base.sass | 12 +++++++-----
 2 files changed, 17 insertions(+), 12 deletions(-)

(limited to 'addons/web/static/src/css')

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 51ab81010f8..5d6a10dcbf6 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");
@@ -113,7 +113,7 @@
   font-weight: bold;
   font-size: inherit;
 }
-.openerp a.button:link, .openerp a.button:visited, .openerp .oe_button, .openerp input[type='submit'], .openerp .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button {
+.openerp a.button:link, .openerp a.button:visited, .openerp button, .openerp .oe_button, .openerp input[type='submit'], .openerp .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button {
   display: inline-block;
   border: 1px solid rgba(0, 0, 0, 0.4);
   color: #4c4c4c;
@@ -138,7 +138,7 @@
   -webkit-font-smoothing: antialiased;
   outline: none;
 }
-.openerp a.button:hover, .openerp .oe_button:hover, .openerp input[type='submit']:hover, .openerp .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button.ui-state-hover {
+.openerp a.button:hover, .openerp button:hover, .openerp .oe_button:hover, .openerp input[type='submit']:hover, .openerp .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button.ui-state-hover {
   background-color: #ececec;
   background-image: -webkit-gradient(linear, left top, left bottom, from(#f6f6f6), to(#e3e3e3));
   background-image: -webkit-linear-gradient(top, #f6f6f6, #e3e3e3);
@@ -149,7 +149,7 @@
   cursor: pointer;
   background-position: 0;
 }
-.openerp a.button:focus, .openerp .oe_button:focus, .openerp input[type='submit']:focus, .openerp .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button.ui-state-focus {
+.openerp a.button:focus, .openerp button:focus, .openerp .oe_button:focus, .openerp input[type='submit']:focus, .openerp .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button.ui-state-focus {
   border: 1px solid #80bfff;
   background-position: 0;
   background-color: #ececec;
@@ -163,7 +163,7 @@
   -webkit-box-shadow: 0 0 3px #80bfff, 0 1px 1px rgba(255, 255, 255, 0.8) inset;
   box-shadow: 0 0 3px #80bfff, 0 1px 1px rgba(255, 255, 255, 0.8) inset;
 }
-.openerp a.button:active, .openerp a.button.active, .openerp .oe_button:active, .openerp .oe_button.active, .openerp input[type='submit']:active, .openerp input[type='submit'].active, .openerp .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button.ui-state-active {
+.openerp a.button:active, .openerp a.button.active, .openerp button:active, .openerp .oe_button:active, .openerp .oe_button.active, .openerp input[type='submit']:active, .openerp input[type='submit'].active, .openerp .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button.ui-state-active {
   background-color: #ececec;
   background-image: -webkit-gradient(linear, left top, left bottom, from(#e3e3e3), to(#f6f6f6));
   background-image: -webkit-linear-gradient(top, #e3e3e3, #f6f6f6);
@@ -175,7 +175,7 @@
   -webkit-box-shadow: none;
   box-shadow: none;
 }
-.openerp a.button.disabled, .openerp .oe_button:disabled, .openerp input[type='submit']:disabled {
+.openerp a.button.disabled, .openerp button:disabled, .openerp .oe_button:disabled, .openerp input[type='submit']:disabled {
   background: #efefef !important;
   border: 1px solid #d1d1d1 !important;
   -moz-box-shadow: none !important;
@@ -1046,7 +1046,7 @@
   background-image: -moz-linear-gradient(top, #fc8787, maroon);
   background-image: -ms-linear-gradient(top, #fc8787, maroon);
   background-image: -o-linear-gradient(top, #fc8787, maroon);
-  background-image: linear-gradient(to bottom, #fc8787, #800000);
+  background-image: linear-gradient(to bottom, #fc8787, maroon);
 }
 .openerp .navbar .oe_topbar_anonymous_login a {
   display: block;
@@ -1368,6 +1368,9 @@
   width: 100%;
   height: 100%;
 }
+.openerp .oe_application a {
+  color: #7c7bad;
+}
 .openerp .oe_application > div {
   height: 100%;
 }
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 27f99ccc9d9..dcaa6484379 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -207,7 +207,7 @@ $sheet-padding: 16px
         font-size: inherit
     // }}}
     // Button style {{{
-    a.button:link, a.button:visited, .oe_button, input[type='submit'], .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button
+    a.button:link, a.button:visited, button, .oe_button, input[type='submit'], .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button
         display: inline-block
         border: 1px solid rgba(0,0,0,0.4)
         color: #4c4c4c
@@ -222,22 +222,22 @@ $sheet-padding: 16px
         -webkit-font-smoothing: antialiased
         outline: none
 
-    a.button:hover, .oe_button:hover, input[type='submit']:hover, .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button.ui-state-hover
+    a.button:hover, button:hover,.oe_button:hover, input[type='submit']:hover, .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button.ui-state-hover
         @include vertical-gradient(#f6f6f6, #e3e3e3)
         cursor: pointer
         background-position: 0
 
-    a.button:focus, .oe_button:focus, input[type='submit']:focus, .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button.ui-state-focus
+    a.button:focus, button:focus, .oe_button:focus, input[type='submit']:focus, .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button.ui-state-focus
         border: 1px solid #80bfff
         background-position: 0
         @include vertical-gradient(#f6f6f6, #e3e3e3)
         @include box-shadow((0 0 3px #80bfff, 0 1px 1px rgba(255, 255, 255, .8) inset))
 
-    a.button:active, a.button.active, .oe_button:active, .oe_button.active, input[type='submit']:active, input[type='submit'].active, .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button.ui-state-active
+    a.button:active, a.button.active, button:active, .oe_button:active, .oe_button.active, input[type='submit']:active, input[type='submit'].active, .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button.ui-state-active
         @include vertical-gradient(#e3e3e3, #f6f6f6)
         @include box-shadow(none)
 
-    a.button.disabled, .oe_button:disabled, input[type='submit']:disabled
+    a.button.disabled, button:disabled, .oe_button:disabled, input[type='submit']:disabled
         background: #efefef !important
         border: 1px solid #d1d1d1 !important
         @include box-shadow(none !important)
@@ -1115,6 +1115,8 @@ $sheet-padding: 16px
     .oe_application
         width: 100%
         height: 100%
+        a
+            color: $link-color
         > div
             height: 100%
         .oe_breadcrumb_item:not(:last-child)
-- 
cgit v1.2.3


From 6f2e3e118f49530ae5538e775462fc675d9be793 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 24 Dec 2013 09:21:57 +0100
Subject: [IMP] CSS fix for statusbar misaligned

bzr revid: fp@tinyerp.com-20131224082157-o2ncgd7rsd0tpd18
---
 addons/web/static/src/css/base.css  | 3 ++-
 addons/web/static/src/css/base.sass | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'addons/web/static/src/css')

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 51ab81010f8..a726df97fec 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");
@@ -2183,6 +2183,7 @@
 }
 .openerp .oe_form header .oe_button {
   margin: 3px 2px 1px;
+  float: left;
 }
 .openerp .oe_form header .oe_button:first-child {
   margin-left: 6px;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 27f99ccc9d9..0bbb0e7ae1a 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -1748,6 +1748,7 @@ $sheet-padding: 16px
             float: right
         .oe_button
             margin: 3px 2px 1px
+            float: left
             &:first-child
                 margin-left: 6px
     // }}}
-- 
cgit v1.2.3


From 7bb4f6da82750fc4b90cc602adf4294ab8215f96 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Tue, 24 Dec 2013 12:22:01 +0100
Subject: [FIX]web: status bar alignment, sometimes wrong on google chrome

bzr revid: dle@openerp.com-20131224112201-0zlxa6fevvj3501h
---
 addons/web/static/src/css/base.css  | 3 ++-
 addons/web/static/src/css/base.sass | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'addons/web/static/src/css')

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index fabb8503b34..0c77ca037c7 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");
@@ -2180,6 +2180,7 @@
 }
 .openerp .oe_form header .oe_button {
   margin: 3px 2px 1px;
+  float: left;
 }
 .openerp .oe_form header .oe_button:first-child {
   margin-left: 6px;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index c54cd2920c0..4ddd2ca8704 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -1719,6 +1719,7 @@ $sheet-padding: 16px
             float: right
         .oe_button
             margin: 3px 2px 1px
+            float: left
             &:first-child
                 margin-left: 6px
     // }}}
-- 
cgit v1.2.3


From 5ba8c98feeb2a80a5ccaec5d416cb9a315375beb Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Fri, 3 Jan 2014 10:44:15 +0100
Subject: [REVERT] rev 4098,
 revid:dle@openerp.com-20131224112201-0zlxa6fevvj3501h. Partialy break the
 design (buttons and status bar not displayed sometimes)

bzr revid: dle@openerp.com-20140103094415-vi99tbbeitzr7r2b
---
 addons/web/static/src/css/base.css  | 3 +--
 addons/web/static/src/css/base.sass | 1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

(limited to 'addons/web/static/src/css')

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 0c77ca037c7..fabb8503b34 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");
@@ -2180,7 +2180,6 @@
 }
 .openerp .oe_form header .oe_button {
   margin: 3px 2px 1px;
-  float: left;
 }
 .openerp .oe_form header .oe_button:first-child {
   margin-left: 6px;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 4ddd2ca8704..c54cd2920c0 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -1719,7 +1719,6 @@ $sheet-padding: 16px
             float: right
         .oe_button
             margin: 3px 2px 1px
-            float: left
             &:first-child
                 margin-left: 6px
     // }}}
-- 
cgit v1.2.3


From 75e02860c25efa49228df411c3656b6a0d3861f1 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Mon, 13 Jan 2014 18:38:08 +0100
Subject: [REM] Removed Login from webclient

bzr revid: fme@openerp.com-20140113173808-1clqlztx6fs79h2k
---
 addons/web/static/src/css/base.css  | 149 +-----------------------------------
 addons/web/static/src/css/base.sass | 102 ------------------------
 2 files changed, 1 insertion(+), 250 deletions(-)

(limited to 'addons/web/static/src/css')

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 51ab81010f8..d467de2946b 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");
@@ -870,153 +870,6 @@
   padding: 5px;
   width: 32px;
 }
-.openerp .oe_login {
-  background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAYAAAAGCAYAAADgzO9IAAAAKUlEQVQIHWO8e/fufwYsgAUkJigoiCIF5DMyoYggcUiXgNnBiGQKmAkARpcEQeriln4AAAAASUVORK5CYII=);
-  text-align: center;
-  font-size: 14px;
-  height: 100%;
-}
-.openerp .oe_login ul, .openerp .oe_login li {
-  margin: 0;
-  list-style-type: none;
-  padding: 0 0 4px 0;
-}
-.openerp .oe_login button {
-  cursor: pointer;
-  padding: 6px 16px;
-  border: 1px solid #222222;
-  color: white;
-  margin: 0;
-  background-color: #8c1313;
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#b92020), to(#600606));
-  background-image: -webkit-linear-gradient(top, #b92020, #600606);
-  background-image: -moz-linear-gradient(top, #b92020, #600606);
-  background-image: -ms-linear-gradient(top, #b92020, #600606);
-  background-image: -o-linear-gradient(top, #b92020, #600606);
-  background-image: linear-gradient(to bottom, #b92020, #600606);
-  -moz-border-radius: 4px;
-  -webkit-border-radius: 4px;
-  border-radius: 4px;
-  -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(155, 155, 155, 0.4) inset;
-  -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(155, 155, 155, 0.4) inset;
-  box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(155, 155, 155, 0.4) inset;
-}
-.openerp .oe_login input, .openerp .oe_login select {
-  width: 252px;
-  font-family: "Lucida Grande", Helvetica, Verdana, Arial;
-  border: 1px solid #999999;
-  background: whitesmoke;
-  -moz-box-shadow: inset 0 1px 4px rgba(0, 0, 0, 0.4);
-  -webkit-box-shadow: inset 0 1px 4px rgba(0, 0, 0, 0.4);
-  box-shadow: inset 0 1px 4px rgba(0, 0, 0, 0.4);
-  -moz-border-radius: 3px;
-  -webkit-border-radius: 3px;
-  border-radius: 3px;
-}
-.openerp .oe_login input {
-  margin-bottom: 9px;
-  padding: 5px 6px;
-}
-.openerp .oe_login select {
-  padding: 1px;
-}
-.openerp .oe_login .oe_login_dbpane {
-  position: fixed;
-  top: 0;
-  right: 8px;
-  padding: 5px 10px;
-  color: #eeeeee;
-  border: solid 1px #333333;
-  background: #1e1e1e;
-  background: rgba(30, 30, 30, 0.94);
-  -moz-border-radius: 0 0 8px 8px;
-  -webkit-border-radius: 0 0 8px 8px;
-  border-radius: 0 0 8px 8px;
-}
-.openerp .oe_login .oe_login_dbpane input {
-  padding: 2px 4px;
-  margin: 4px 0;
-}
-.openerp .oe_login .oe_login_bottom {
-  position: absolute;
-  top: 50%;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  text-shadow: 0 1px 1px #999999;
-  background-color: #8a0e0e;
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#b41616), to(#600606));
-  background-image: -webkit-linear-gradient(top, #b41616, #600606);
-  background-image: -moz-linear-gradient(top, #b41616, #600606);
-  background-image: -ms-linear-gradient(top, #b41616, #600606);
-  background-image: -o-linear-gradient(top, #b41616, #600606);
-  background-image: linear-gradient(to bottom, #b41616, #600606);
-}
-.openerp .oe_login .oe_login_pane {
-  position: absolute;
-  top: 50%;
-  left: 50%;
-  margin: -160px -166px;
-  border: solid 1px #333333;
-  background: #1e1e1e;
-  background: rgba(30, 30, 30, 0.94);
-  padding: 22px 32px;
-  color: #eeeeee;
-  text-align: left;
-  -moz-border-radius: 8px;
-  -webkit-border-radius: 8px;
-  border-radius: 8px;
-  -moz-box-shadow: 0 0 18px rgba(0, 0, 0, 0.9);
-  -webkit-box-shadow: 0 0 18px rgba(0, 0, 0, 0.9);
-  box-shadow: 0 0 18px rgba(0, 0, 0, 0.9);
-}
-.openerp .oe_login .oe_login_pane h2 {
-  margin-top: 0;
-  font-size: 18px;
-}
-.openerp .oe_login .oe_login_logo {
-  position: absolute;
-  top: -70px;
-  left: 0;
-  width: 100%;
-  margin: 0 auto;
-  text-align: center;
-}
-.openerp .oe_login .oe_login_footer {
-  position: absolute;
-  bottom: -40px;
-  left: 0;
-  width: 100%;
-  text-align: center;
-}
-.openerp .oe_login .oe_login_footer a {
-  color: #eeeeee;
-  margin: 0 6px;
-}
-.openerp .oe_login .oe_login_footer a:hover {
-  text-decoration: underline;
-}
-.openerp .oe_login .oe_login_footer span {
-  font-weight: bold;
-  font-size: 16px;
-}
-.openerp .oe_login .oe_login_error_message {
-  display: none;
-  background-color: #b41616;
-  color: #eeeeee;
-  padding: 14px 18px;
-  margin-top: 15px;
-  text-align: center;
-  -moz-border-radius: 4px;
-  -webkit-border-radius: 4px;
-  border-radius: 4px;
-  -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.8);
-  -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.8);
-  box-shadow: 0 1px 4px rgba(0, 0, 0, 0.8);
-}
-.openerp .oe_login_invalid .oe_login_error_message {
-  display: inline-block;
-}
 .openerp .oe_database_manager {
   background: white;
   color: black;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 27f99ccc9d9..ff40c3c67db 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -744,108 +744,6 @@ $sheet-padding: 16px
         padding: 5px
         width: 32px
     // }}}
-    // Login {{{
-    .oe_login
-        background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAYAAAAGCAYAAADgzO9IAAAAKUlEQVQIHWO8e/fufwYsgAUkJigoiCIF5DMyoYggcUiXgNnBiGQKmAkARpcEQeriln4AAAAASUVORK5CYII=)
-        text-align: center
-        font-size: 14px
-        height: 100%
-        ul, li
-            margin: 0
-            list-style-type: none
-            padding: 0 0 4px 0
-        button
-            cursor: pointer
-            padding: 6px 16px
-            border: 1px solid #222
-            color: white
-            margin: 0
-            @include vertical-gradient(#b92020, #600606)
-            @include radius(4px)
-            @include box-shadow((0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(155, 155, 155, 0.4) inset))
-        input, select
-            width: 252px
-            font-family: "Lucida Grande", Helvetica, Verdana, Arial
-            border: 1px solid #999999
-            background: whitesmoke
-            @include box-shadow(inset 0 1px 4px rgba(0, 0, 0, 0.4))
-            @include radius(3px)
-        input
-            margin-bottom: 9px
-            padding: 5px 6px
-        select
-            padding: 1px
-        .oe_login_dbpane
-            position: fixed
-            top: 0
-            right: 8px
-            padding: 5px 10px
-            color: #eee
-            border: solid 1px #333
-            background: #1e1e1e
-            background: rgba(30,30,30,0.94)
-            @include radius(0 0 8px 8px)
-            input
-                padding: 2px 4px
-                margin: 4px 0
-        .oe_login_bottom
-            position: absolute
-            top: 50%
-            left: 0
-            right: 0
-            bottom: 0
-            text-shadow: 0 1px 1px #999999
-            @include vertical-gradient(#b41616, #600606)
-        .oe_login_pane
-            position: absolute
-            top: 50%
-            left: 50%
-            margin: -160px -166px
-            border: solid 1px #333333
-            background: #1e1e1e
-            background: rgba(30,30,30,0.94)
-            padding: 22px 32px
-            color: #eee
-            text-align: left
-            @include radius(8px)
-            @include box-shadow(0 0 18px rgba(0, 0, 0, 0.9))
-            h2
-                margin-top: 0
-                font-size: 18px
-        .oe_login_logo
-            position: absolute
-            top: -70px
-            left: 0
-            width: 100%
-            margin: 0 auto
-            text-align: center
-        .oe_login_footer
-            position: absolute
-            bottom: -40px
-            left: 0
-            width: 100%
-            text-align: center
-            a
-                color: #eee
-                margin: 0 6px
-                &:hover
-                    text-decoration: underline
-            span
-                font-weight: bold
-                font-size: 16px
-        .oe_login_error_message
-            display: none
-            background-color: #b41616
-            color: #eee
-            padding: 14px 18px
-            margin-top: 15px
-            text-align: center
-            @include radius(4px)
-            @include box-shadow(0 1px 4px rgba(0, 0, 0, 0.8))
-    .oe_login_invalid
-        .oe_login_error_message
-            display: inline-block
-    // }}}
     // DatabaseManager {{{
     .oe_database_manager
         background: #fff
-- 
cgit v1.2.3


From 7960f9fc59235fe37adbc346f81e9f605cc65d5b Mon Sep 17 00:00:00 2001
From: Xavier ALT <xal@openerp.com>
Date: Tue, 14 Jan 2014 12:59:47 +0100
Subject: [FIX] web: list view: fix wrong css for fields.reference in editable
 tree view

bzr revid: xal@openerp.com-20140114115947-gkh09tb2vxsjyksk
---
 addons/web/static/src/css/base.css  | 3 +++
 addons/web/static/src/css/base.sass | 2 ++
 2 files changed, 5 insertions(+)

(limited to 'addons/web/static/src/css')

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index fabb8503b34..f1c99512118 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -2850,6 +2850,9 @@
 .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field.oe_form_field_datetime input.oe_datepicker_master, .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field.oe_form_field_date input.oe_datepicker_master {
   width: 100% !important;
 }
+.openerp .oe_list.oe_list_editable.oe_editing .oe_form_field.oe_form_field_reference {
+  display: table;
+}
 .openerp .oe_list_group_name {
   white-space: nowrap;
 }
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index c54cd2920c0..28947b3b467 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -2243,6 +2243,8 @@ $sheet-padding: 16px
             &.oe_form_field_datetime,&.oe_form_field_date
                 input.oe_datepicker_master
                     width: 100% !important
+            &.oe_form_field_reference
+                display: table
     .oe_list_group_name
         white-space: nowrap
     // }}}
-- 
cgit v1.2.3


From cedc2bd2773e9bc9fc688ede49c942bb4b6f342a Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 14 Jan 2014 14:44:27 +0100
Subject: [IMP] Better look for login and db selector forms

bzr revid: fme@openerp.com-20140114134427-fu1zu5xxce9j8vrl
---
 addons/web/static/src/css/base.css  | 38 +++++++++++++++++++++++++++++++++++++
 addons/web/static/src/css/base.sass | 32 +++++++++++++++++++++++++++++++
 2 files changed, 70 insertions(+)

(limited to 'addons/web/static/src/css')

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 29e91ed79b4..52a84f9a0ff 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -3114,6 +3114,44 @@ div.ui-widget-overlay {
   padding-bottom: 10px !important;
 }
 
+.oe_single_form {
+  background: #eeeeee url(/web/static/src/img/form_sheetbg.png);
+  height: 100%;
+}
+
+.oe_single_form_logo {
+  padding: 10px;
+  text-align: center;
+  margin-bottom: 10px;
+}
+
+.oe_single_form_footer {
+  position: absolute;
+  bottom: -30px;
+}
+
+.oe_login_form {
+  padding: 10px;
+  position: absolute;
+  left: 50%;
+  top: 50%;
+  width: 400px;
+  /* Set margins to offset 50% of the w/h */
+  margin-top: -200px;
+  margin-left: -200px;
+}
+
+.oe_dbselector_form {
+  padding: 10px;
+  position: absolute;
+  left: 50%;
+  top: 50%;
+  width: 300px;
+  /* Set margins to offset 50% of the w/h */
+  margin-top: -150px;
+  margin-left: -150px;
+}
+
 .openerp_ie .placeholder {
   color: #afafb6 !important;
   font-style: italic !important;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index a9ef3b643a3..4e49c8e3c94 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -2491,6 +2491,38 @@ div.ui-widget-overlay
         td
             padding-bottom: 10px !important
 
+// Server side single forms {{{
+@mixin single-form($width: 400px)
+    padding: 10px
+    position: absolute
+    left: 50%
+    top: 50%
+    width: $width
+    /* Set margins to offset 50% of the w/h */
+    margin-top: -($width / 2)
+    margin-left: -($width / 2)
+
+.oe_single_form
+    background: #eee url(/web/static/src/img/form_sheetbg.png)
+    height: 100%
+
+.oe_single_form_logo
+    padding: 10px
+    text-align: center
+    margin-bottom: 10px
+
+.oe_single_form_footer
+    position: absolute
+    bottom: -30px
+
+.oe_login_form
+    @include single-form(400px)
+
+.oe_dbselector_form
+    @include single-form(300px)
+
+// }}}
+
 // Internet Explorer 9+ specifics {{{
 .openerp_ie
     .placeholder
-- 
cgit v1.2.3


From 0275c4ecef2a319a6f5f3d8b77a4fbb1aede6e0c Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 14 Jan 2014 15:52:10 +0100
Subject: [IMP] Improve login footer

bzr revid: fme@openerp.com-20140114145210-omve768o1t50xjdk
---
 addons/web/static/src/css/base.css  | 5 ++++-
 addons/web/static/src/css/base.sass | 3 +++
 2 files changed, 7 insertions(+), 1 deletion(-)

(limited to 'addons/web/static/src/css')

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 52a84f9a0ff..916497f1e82 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -899,7 +899,7 @@
   background-image: -moz-linear-gradient(top, #fc8787, maroon);
   background-image: -ms-linear-gradient(top, #fc8787, maroon);
   background-image: -o-linear-gradient(top, #fc8787, maroon);
-  background-image: linear-gradient(to bottom, #fc8787, maroon);
+  background-image: linear-gradient(to bottom, #fc8787, #800000);
 }
 .openerp .navbar .oe_topbar_anonymous_login a {
   display: block;
@@ -3128,6 +3128,9 @@ div.ui-widget-overlay {
 .oe_single_form_footer {
   position: absolute;
   bottom: -30px;
+  right: 0px;
+  width: 100%;
+  text-align: center;
 }
 
 .oe_login_form {
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 4e49c8e3c94..7d4d1f87297 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -2514,6 +2514,9 @@ div.ui-widget-overlay
 .oe_single_form_footer
     position: absolute
     bottom: -30px
+    right: 0px
+    width: 100%
+    text-align: center
 
 .oe_login_form
     @include single-form(400px)
-- 
cgit v1.2.3


From 178379794981aea2b5c56d57f1873f11b880e272 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 15 Jan 2014 11:06:31 +0100
Subject: [FIX] database manager link

bzr revid: fme@openerp.com-20140115100631-9wrchrrvoei4llo0
---
 addons/web/static/src/css/base.css  | 13 +------------
 addons/web/static/src/css/base.sass |  5 +----
 2 files changed, 2 insertions(+), 16 deletions(-)

(limited to 'addons/web/static/src/css')

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 916497f1e82..09e0f73e2aa 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -3133,7 +3133,7 @@ div.ui-widget-overlay {
   text-align: center;
 }
 
-.oe_login_form {
+.oe_single_form form {
   padding: 10px;
   position: absolute;
   left: 50%;
@@ -3144,17 +3144,6 @@ div.ui-widget-overlay {
   margin-left: -200px;
 }
 
-.oe_dbselector_form {
-  padding: 10px;
-  position: absolute;
-  left: 50%;
-  top: 50%;
-  width: 300px;
-  /* Set margins to offset 50% of the w/h */
-  margin-top: -150px;
-  margin-left: -150px;
-}
-
 .openerp_ie .placeholder {
   color: #afafb6 !important;
   font-style: italic !important;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 7d4d1f87297..9f2f28dbb42 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -2518,12 +2518,9 @@ div.ui-widget-overlay
     width: 100%
     text-align: center
 
-.oe_login_form
+.oe_single_form form
     @include single-form(400px)
 
-.oe_dbselector_form
-    @include single-form(300px)
-
 // }}}
 
 // Internet Explorer 9+ specifics {{{
-- 
cgit v1.2.3


From f00e6711f5205ee7ddcc77d32e063e43e2194d1e Mon Sep 17 00:00:00 2001
From: Cecile Tonglet <cto@openerp.com>
Date: Wed, 15 Jan 2014 15:26:08 +0100
Subject: [FIX] Fix the missing border-bottom of the notebook in dialogs

bzr revid: cto@openerp.com-20140115142608-rjemiq5lq8ju8zc0
---
 addons/web/static/src/css/base.css  | 16 ++++++++--------
 addons/web/static/src/css/base.sass |  5 +++--
 2 files changed, 11 insertions(+), 10 deletions(-)

(limited to 'addons/web/static/src/css')

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index f1c99512118..efe220bf02b 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");
@@ -220,6 +220,9 @@
   padding: 16px;
 }
 .openerp.ui-dialog .ui-dialog-titlebar {
+  border-top: none;
+  border-left: none;
+  border-right: none;
   border-bottom: 1px solid #cacaca;
   -moz-border-radius: 2px 2px 0 0;
   -webkit-border-radius: 2px 2px 0 0;
@@ -236,9 +239,6 @@
   margin: 0;
   padding: 0;
 }
-.openerp.ui-dialog .ui-widget-header {
-  border: none;
-}
 .openerp.ui-dialog .ui-dialog-content {
   background: white;
 }
@@ -623,10 +623,6 @@
   display: block;
   color: gray;
 }
-.openerp .ui-tabs .oe_notebook.ui-tabs-nav li.ui-tabs-active { 
-  border-bottom: none;
-  padding-bottom: 1px;
-}
 .openerp .oe_notebook > li.ui-tabs-active > a {
   color: #4c4c4c;
 }
@@ -652,6 +648,10 @@
   background-color: #eeeeee;
   border-color: #eeeeee #eeeeee #dddddd;
 }
+.openerp .ui-tabs .oe_notebook.ui-tabs-nav li.ui-tabs-active {
+  border-bottom: none;
+  padding-bottom: 1px;
+}
 .openerp .oe_notebook > li.ui-state-active > a, .openerp .oe_notebook > li.ui-state-active > a:hover {
   background-color: white;
   border: 1px solid #dddddd;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 28947b3b467..cc6c044f804 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -277,14 +277,15 @@ $sheet-padding: 16px
         .ui-dialog-titlebar, .ui-dialog-content, .ui-dialog-buttonpane
             padding: 16px
         .ui-dialog-titlebar
+            border-top: none
+            border-left: none
+            border-right: none
             border-bottom: 1px solid #cacaca
             @include radius(2px 2px 0 0)
             @include vertical-gradient(#FCFCFC, #DEDEDE)
             .ui-dialog-title
                 margin: 0
                 padding: 0
-        .ui-widget-header
-            border: none
         .ui-dialog-content
             background: white
         .ui-dialog-buttonpane
-- 
cgit v1.2.3


From 6f2f02625a31a503de9aaf78f8cf9423805d9a53 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 16 Jan 2014 11:15:54 +0100
Subject: [IMP] Changed login template for inheritance

bzr revid: fme@openerp.com-20140116101554-vvqu8aeim246lj1i
---
 addons/web/static/src/css/base.css  | 11 ++++-------
 addons/web/static/src/css/base.sass | 26 +++++++++++++-------------
 2 files changed, 17 insertions(+), 20 deletions(-)

(limited to 'addons/web/static/src/css')

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 09e0f73e2aa..400245a7570 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -3114,26 +3114,23 @@ div.ui-widget-overlay {
   padding-bottom: 10px !important;
 }
 
-.oe_single_form {
+body.oe_single_form {
   background: #eeeeee url(/web/static/src/img/form_sheetbg.png);
   height: 100%;
 }
-
-.oe_single_form_logo {
+body.oe_single_form .oe_single_form_logo {
   padding: 10px;
   text-align: center;
   margin-bottom: 10px;
 }
-
-.oe_single_form_footer {
+body.oe_single_form .oe_single_form_footer {
   position: absolute;
   bottom: -30px;
   right: 0px;
   width: 100%;
   text-align: center;
 }
-
-.oe_single_form form {
+body.oe_single_form .oe_single_form_container {
   padding: 10px;
   position: absolute;
   left: 50%;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 9f2f28dbb42..89b00cd7917 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -2502,24 +2502,24 @@ div.ui-widget-overlay
     margin-top: -($width / 2)
     margin-left: -($width / 2)
 
-.oe_single_form
+body.oe_single_form
     background: #eee url(/web/static/src/img/form_sheetbg.png)
     height: 100%
 
-.oe_single_form_logo
-    padding: 10px
-    text-align: center
-    margin-bottom: 10px
+    .oe_single_form_logo
+        padding: 10px
+        text-align: center
+        margin-bottom: 10px
 
-.oe_single_form_footer
-    position: absolute
-    bottom: -30px
-    right: 0px
-    width: 100%
-    text-align: center
+    .oe_single_form_footer
+        position: absolute
+        bottom: -30px
+        right: 0px
+        width: 100%
+        text-align: center
 
-.oe_single_form form
-    @include single-form(400px)
+    .oe_single_form_container
+        @include single-form(400px)
 
 // }}}
 
-- 
cgit v1.2.3


From 153df3aeacfce1a184bf3930376435bd691d19a3 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 16 Jan 2014 17:54:39 +0100
Subject: [IMP] Moved web client stuff under .openerp

bzr revid: fme@openerp.com-20140116165439-wvltptsqr69lv9ee
---
 addons/web/static/src/css/base.css  | 251 +++++++++++++++++-------------------
 addons/web/static/src/css/base.sass | 204 ++++++++++++++---------------
 2 files changed, 217 insertions(+), 238 deletions(-)

(limited to 'addons/web/static/src/css')

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index da2c93f6555..ae3ce185f73 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -3189,6 +3189,123 @@
   float: right;
   color: #333333;
 }
+.openerp .navbar {
+  min-height: 32px;
+  margin-bottom: 0px;
+  border: none;
+  z-index: 1;
+  background-color: #414141;
+  background-color: #454343;
+  background-image: -webkit-gradient(linear, left top, left bottom, from(#646060), to(#262626));
+  background-image: -webkit-linear-gradient(top, #646060, #262626);
+  background-image: -moz-linear-gradient(top, #646060, #262626);
+  background-image: -ms-linear-gradient(top, #646060, #262626);
+  background-image: -o-linear-gradient(top, #646060, #262626);
+  background-image: linear-gradient(to bottom, #646060, #262626);
+}
+.openerp .navbar-default .navbar-nav li a:hover, .openerp .navbar-default .navbar-nav li a:focus {
+  background: rgba(0, 0, 0, 0.3);
+}
+.openerp .navbar-default .navbar-nav .open > a, .openerp .navbar-default .navbar-nav a:hover, .openerp .navbar-default .navbar-nav a:focus {
+  background: rgba(0, 0, 0, 0.3) !important;
+}
+.openerp .navbar-default .navbar-nav .dropdown > a .caret {
+  border-top-color: #777777 !important;
+  border-bottom-color: #777777 !important;
+}
+.openerp .navbar-nav li a {
+  padding: 4px 32px 4px 12px;
+}
+.openerp .oe_navbar .dropdown-menu {
+  font-size: 13px;
+  padding: 4px 0;
+  background: #333333 !important;
+  background: rgba(37, 37, 37, 0.9) !important;
+  border-color: #999999;
+  border-color: rgba(0, 0, 0, 0.2);
+  background-color: #414141;
+  text-shadow: none;
+  background-color: #454343;
+  background-image: -webkit-gradient(linear, left top, left bottom, from(#646060), to(#262626));
+  background-image: -webkit-linear-gradient(top, #646060, #262626);
+  background-image: -moz-linear-gradient(top, #646060, #262626);
+  background-image: -ms-linear-gradient(top, #646060, #262626);
+  background-image: -o-linear-gradient(top, #646060, #262626);
+  background-image: linear-gradient(to bottom, #646060, #262626);
+  -moz-border-radius: 3px;
+  -webkit-border-radius: 3px;
+  border-radius: 3px;
+}
+.openerp .oe_navbar .dropdown-menu li a, .openerp .oe_navbar .dropdown-menu li a:hover, .openerp .oe_navbar .dropdown-menu li a:focus {
+  color: #eeeeee;
+}
+.openerp .oe_view_manager_new .oe_form_nosheet {
+  margin-top: 8px;
+}
+.openerp .oe_view_manager_new .oe_form_nosheet .oe_form_label {
+  font-weight: normal;
+}
+.openerp .nav li > a {
+  padding: 3px 4px 2px 18px;
+  color: #4c4c4c;
+}
+.openerp .nav nav-pills.nav-stacked > li > ul {
+  padding-left: 16px;
+}
+.openerp .nav-pills > li.active > a, .openerp a.list-group-item.active > a {
+  background-color: #7c7bad;
+  color: white;
+  border-radius: 0;
+}
+.openerp .nav-pills > li.active a:hover, .openerp .nav-pills > li.active a:focus, .openerp a.list-group-item.active a:hover, .openerp a.list-group-item.active a:focus {
+  background-color: #7c7bad;
+}
+.openerp .nav-pills > li.active .badge, .openerp a.list-group-item.active .badge {
+  background-color: white;
+  color: #7c7bad;
+  text-shadow: none;
+}
+.openerp .badge {
+  font-weight: normal;
+  font-size: 11px;
+  background-color: #7c7bad;
+}
+.openerp button, .openerp body {
+  line-height: normal;
+}
+.openerp h1, .openerp h2 {
+  font-weight: bold;
+}
+.openerp h3 {
+  font-size: 1.17em;
+  font-weight: bold;
+}
+.openerp p {
+  display: block;
+  -webkit-margin-before: 1em;
+  -webkit-margin-after: 1em;
+  -webkit-margin-start: 0px;
+  -webkit-margin-end: 0px;
+}
+.openerp pre {
+  background-color: white;
+  border: none;
+  padding: 10px 0 3px 0;
+}
+.openerp .jqstooltip {
+  height: auto !important;
+  width: auto !important;
+}
+.openerp h5 {
+  font-weight: bold;
+  font-size: smaller;
+}
+.openerp .oe_form .oe_subtype label, .openerp .oe_subtype label {
+  font-weight: normal;
+}
+.openerp .oe_msg_subtype_check {
+  margin: 3px 3px 0 !important;
+}
 
 @-moz-document url-prefix() {
   .openerp .oe_searchview .oe_searchview_search {
@@ -3444,140 +3561,6 @@ div.ui-widget-overlay {
     overflow: hidden !important;
   }
 }
-.nav li > a {
-  padding: 3px 4px 2px 18px;
-  color: #4c4c4c;
-}
-.nav nav-pills.nav-stacked > li > ul {
-  padding-left: 16px;
-}
-
-.nav-pills > li.active > a, a.list-group-item.active > a {
-  background-color: #7c7bad;
-  color: white;
-  border-radius: 0;
-}
-.nav-pills > li.active a:hover, .nav-pills > li.active a:focus, a.list-group-item.active a:hover, a.list-group-item.active a:focus {
-  background-color: #7c7bad;
-}
-.nav-pills > li.active .badge, a.list-group-item.active .badge {
-  background-color: white;
-  color: #7c7bad;
-  text-shadow: none;
-}
-
-.badge {
-  font-weight: normal;
-  font-size: 11px;
-  background-color: #7c7bad;
-}
-
-button, body {
-  line-height: normal;
-}
-
-h1, h2 {
-  font-weight: bold;
-}
-
-h3 {
-  font-size: 1.17em;
-  font-weight: bold;
-}
-
-p {
-  display: block;
-  -webkit-margin-before: 1em;
-  -webkit-margin-after: 1em;
-  -webkit-margin-start: 0px;
-  -webkit-margin-end: 0px;
-}
-
-pre {
-  background-color: white;
-  border: none;
-  padding: 10px 0 3px 0;
-}
-
-.jqstooltip {
-  height: auto !important;
-  width: auto !important;
-}
-
-h5 {
-  font-weight: bold;
-  font-size: smaller;
-}
-
-.oe_form .oe_subtype label, .oe_subtype label {
-  font-weight: normal;
-}
-
-.oe_msg_subtype_check {
-  margin: 3px 3px 0 !important;
-}
-
-.oe_view_manager_new .oe_form_nosheet {
-  margin-top: 8px;
-}
-.oe_view_manager_new .oe_form_nosheet .oe_form_label {
-  font-weight: normal;
-}
-
-.navbar {
-  min-height: 32px;
-  margin-bottom: 0px;
-  border: none;
-  z-index: 1;
-  background-color: #414141;
-  background-color: #454343;
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#646060), to(#262626));
-  background-image: -webkit-linear-gradient(top, #646060, #262626);
-  background-image: -moz-linear-gradient(top, #646060, #262626);
-  background-image: -ms-linear-gradient(top, #646060, #262626);
-  background-image: -o-linear-gradient(top, #646060, #262626);
-  background-image: linear-gradient(to bottom, #646060, #262626);
-}
-
-.navbar-default .navbar-nav li a:hover, .navbar-default .navbar-nav li a:focus {
-  background: rgba(0, 0, 0, 0.3);
-}
-.navbar-default .navbar-nav .open > a, .navbar-default .navbar-nav a:hover, .navbar-default .navbar-nav a:focus {
-  background: rgba(0, 0, 0, 0.3) !important;
-}
-.navbar-default .navbar-nav .dropdown > a .caret {
-  border-top-color: #777777 !important;
-  border-bottom-color: #777777 !important;
-}
-
-.navbar-nav li a {
-  padding: 4px 32px 4px 12px;
-}
-
-.oe_navbar .dropdown-menu {
-  font-size: 13px;
-  padding: 4px 0;
-  background: #333333 !important;
-  background: rgba(37, 37, 37, 0.9) !important;
-  border-color: #999999;
-  border-color: rgba(0, 0, 0, 0.2);
-  background-color: #414141;
-  text-shadow: none;
-  background-color: #454343;
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#646060), to(#262626));
-  background-image: -webkit-linear-gradient(top, #646060, #262626);
-  background-image: -moz-linear-gradient(top, #646060, #262626);
-  background-image: -ms-linear-gradient(top, #646060, #262626);
-  background-image: -o-linear-gradient(top, #646060, #262626);
-  background-image: linear-gradient(to bottom, #646060, #262626);
-  -moz-border-radius: 3px;
-  -webkit-border-radius: 3px;
-  border-radius: 3px;
-}
-.oe_navbar .dropdown-menu li a, .oe_navbar .dropdown-menu li a:hover, .oe_navbar .dropdown-menu li a:focus {
-  color: #eeeeee;
-}
-
 .ui-icon {
   width: 18px;
   height: 18px;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 76907656a08..4ed3a10870f 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -2537,6 +2537,106 @@ $sheet-padding: 16px
         float: right
         color: #333
     // }}}
+    // Bootstrap HACKS {{{
+    .navbar
+        min-height: 32px
+        margin-bottom: 0px
+        border: none
+        z-index: 1
+        background-color: #414141
+        @include vertical-gradient(#646060, #262626)
+    .navbar-default
+        .navbar-nav
+            li
+                a:hover,a:focus
+                    background: rgba(0, 0, 0, 0.3)
+            .open > a,a:hover,a:focus
+                background: rgba(0, 0, 0, 0.3) !important
+            .dropdown > a .caret
+                border-top-color: #777 !important
+                border-bottom-color: #777 !important
+    .navbar-nav
+        li
+            a
+                padding: 4px 32px 4px 12px
+    .oe_navbar .dropdown-menu
+        font-size: 13px
+        padding: 4px 0
+        background: #333333 !important
+        background: rgba(37, 37, 37, 0.9) !important
+        border-color: #999999
+        border-color: rgba(0, 0, 0, 0.2)
+        background-color: #414141
+        text-shadow: none
+        @include vertical-gradient(#646060, #262626)
+        @include radius(3px)
+        li
+            a,a:hover,a:focus
+                color: #eeeeee
+
+    // Minimized unused white space and label weight for wizard popup
+    .oe_view_manager_new .oe_form_nosheet
+        margin-top: 8px
+        .oe_form_label
+            font-weight: normal
+
+    // Customize bootstrap3 for leftbar
+    .nav
+        li > a
+            padding: 3px 4px 2px 18px
+            color: #4c4c4c
+        nav-pills.nav-stacked > li > ul
+            padding-left: 16px
+    .nav-pills > li.active,a.list-group-item.active
+        > a
+            background-color: #7c7bad
+            color: white
+            border-radius: 0
+        a:hover,a:focus
+            background-color: #7c7bad
+        .badge
+            background-color: white
+            color: #7c7bad
+            text-shadow: none
+    .badge
+        font-weight: normal
+        font-size: 11px
+        background-color: #7c7bad
+
+    // Customize for global tags
+    button, body
+        line-height: normal
+    h1,h2
+        font-weight: bold
+    h3
+        font-size: 1.17em
+        font-weight: bold
+    p
+        display: block
+        -webkit-margin-before: 1em
+        -webkit-margin-after: 1em
+        -webkit-margin-start: 0px
+        -webkit-margin-end: 0px
+    pre
+        background-color: #FFFFFF
+        border: none
+        padding: 10px 0 3px 0
+
+    // Customize for kanban tooltip
+    .jqstooltip
+        height: auto !important
+        width: auto !important
+
+    // Customize for chatter
+    h5
+        font-weight: bold
+        font-size: smaller
+    .oe_form .oe_subtype label, .oe_subtype label
+        font-weight: normal
+    .oe_msg_subtype_check
+        margin: 3px 3px 0 !important
+    // }}}
+
 @-moz-document url-prefix()
     .openerp
         .oe_searchview .oe_searchview_search
@@ -2747,110 +2847,6 @@ div.ui-widget-overlay
             overflow: hidden !important
 // }}}
 
-// Customize bootstrap3 for leftbar
-.nav
-    li > a
-        padding: 3px 4px 2px 18px
-        color: #4c4c4c
-    nav-pills.nav-stacked > li > ul
-        padding-left: 16px
-.nav-pills > li.active,a.list-group-item.active
-    > a
-        background-color: #7c7bad
-        color: white
-        border-radius: 0
-    a:hover,a:focus
-        background-color: #7c7bad
-    .badge
-        background-color: white
-        color: #7c7bad
-        text-shadow: none
-.badge
-    font-weight: normal
-    font-size: 11px
-    background-color: #7c7bad
-// End of customize
-
-// Customize for global tags
-button, body
-    line-height: normal
-h1,h2
-    font-weight: bold
-h3
-    font-size: 1.17em
-    font-weight: bold
-p
-    display: block
-    -webkit-margin-before: 1em
-    -webkit-margin-after: 1em
-    -webkit-margin-start: 0px
-    -webkit-margin-end: 0px
-pre
-    background-color: #FFFFFF
-    border: none
-    padding: 10px 0 3px 0
-// End of customize
-
-// Customize for kanban tooltip
-.jqstooltip
-    height: auto !important
-    width: auto !important
-// End of kanban tooltip
-
-// Customize for chatter
-h5
-    font-weight: bold
-    font-size: smaller
-.oe_form .oe_subtype label, .oe_subtype label
-    font-weight: normal
-.oe_msg_subtype_check
-    margin: 3px 3px 0 !important
-// End of customize
-
-// Minimized unused white space and label weight for wizard popup
-.oe_view_manager_new .oe_form_nosheet
-    margin-top: 8px
-    .oe_form_label
-        font-weight: normal
-// End of customize
-
-// navbar hack {{{
-.navbar
-    min-height: 32px
-    margin-bottom: 0px
-    border: none
-    z-index: 1
-    background-color: #414141
-    @include vertical-gradient(#646060, #262626)
-.navbar-default
-    .navbar-nav
-        li
-            a:hover,a:focus
-                background: rgba(0, 0, 0, 0.3)
-        .open > a,a:hover,a:focus
-            background: rgba(0, 0, 0, 0.3) !important
-        .dropdown > a .caret
-            border-top-color: #777 !important
-            border-bottom-color: #777 !important
-.navbar-nav
-    li
-        a
-            padding: 4px 32px 4px 12px
-.oe_navbar .dropdown-menu
-    font-size: 13px
-    padding: 4px 0
-    background: #333333 !important
-    background: rgba(37, 37, 37, 0.9) !important
-    border-color: #999999
-    border-color: rgba(0, 0, 0, 0.2)
-    background-color: #414141
-    text-shadow: none
-    @include vertical-gradient(#646060, #262626)
-    @include radius(3px)
-    li
-        a,a:hover,a:focus
-            color: #eeeeee
-// End hack }}}
 
 // Hack for ui icon {{{
 .ui-icon
-- 
cgit v1.2.3


From c3e31842e027d082e8d1e1607167d4b406223ce4 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Mon, 20 Jan 2014 16:06:06 +0100
Subject: [FIX] css: unify lines in view log menu This prevents lines in bold
 font to be larger than normal one and produce a gap in lines (in Firefox at
 least)

bzr revid: mat@openerp.com-20140120150606-dvoetrbp3cavtuc3
---
 addons/web/static/src/css/base.css  | 1 +
 addons/web/static/src/css/base.sass | 1 +
 2 files changed, 2 insertions(+)

(limited to 'addons/web/static/src/css')

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index efe220bf02b..3f15c36c9b1 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -3127,6 +3127,7 @@
 }
 .openerp .oe_debug_view_log {
   font-size: 95%;
+  line-height: 1.2em;
 }
 .openerp .oe_debug_view_log label {
   display: block;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index cc6c044f804..aac54d52744 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -2459,6 +2459,7 @@ $sheet-padding: 16px
         float: left
     .oe_debug_view_log
         font-size: 95%
+        line-height: 1.2em
     .oe_debug_view_log label
         display: block
         width: 49%
-- 
cgit v1.2.3


From c09798bfbb469ed75dc54c7ce140e531dd925d75 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Mon, 20 Jan 2014 17:35:54 +0100
Subject: [FIX] css: remove useless css properties float:left with cleartext
 hack is the same as no properties, and it's working in firefox

bzr revid: mat@openerp.com-20140120163554-zf0sq98ko8qqc9fb
---
 addons/web/static/src/css/base.css  | 11 -----------
 addons/web/static/src/css/base.sass |  9 ---------
 2 files changed, 20 deletions(-)

(limited to 'addons/web/static/src/css')

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 3f15c36c9b1..1e353ed31b5 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -437,17 +437,6 @@
 .openerp .oe_form_dirty button.oe_highlight_on_dirty:hover {
   background: #ed6f6a;
 }
-.openerp .oe_title {
-  width: 50%;
-  float: left;
-}
-.openerp .oe_title:after {
-  content: ".";
-  display: block;
-  height: 0;
-  clear: both;
-  visibility: hidden;
-}
 .openerp .oe_button_box {
   width: 270px;
   text-align: right;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index aac54d52744..9936168ee5b 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -413,15 +413,6 @@ $sheet-padding: 16px
             @include box-shadow(none)
             &:hover
                 background: #ED6F6A
-    .oe_title
-        width: 50%
-        float: left
-    .oe_title:after
-        content: "."
-        display: block
-        height: 0
-        clear: both
-        visibility: hidden
     .oe_button_box
         width: 270px
         text-align: right
-- 
cgit v1.2.3


From 9f8bd865dc313339474db4ca0806f02f6e63039f Mon Sep 17 00:00:00 2001
From: jke-openerp <jke@openerp.com>
Date: Mon, 27 Jan 2014 18:24:14 +0100
Subject: [IMP] Fix css with header of no_form, Fix css for Entypo lin height,
 Fix js positionning for search no_result, allow click on + in kanban when
 no_result (ask of fp)

bzr revid: jke@openerp.com-20140127172414-qftefwct3zbgfvrt
---
 addons/web/static/src/css/base.css  | 39 ++++++++++++++++++++-----------------
 addons/web/static/src/css/base.sass | 18 ++++++++++-------
 2 files changed, 32 insertions(+), 25 deletions(-)

(limited to 'addons/web/static/src/css')

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index ea57a7b8bdb..3220d6a10c2 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");
@@ -349,6 +349,7 @@
   font-family: "entypoRegular" !important;
   font-size: 34px;
   font-weight: 300 !important;
+  line-height: 100%;
 }
 .openerp .oe_left {
   float: left;
@@ -658,10 +659,6 @@
   display: block;
   color: gray;
 }
-.openerp .ui-tabs .oe_notebook.ui-tabs-nav li.ui-tabs-active { 
-  border-bottom: none;
-  padding-bottom: 1px;
-}
 .openerp .oe_notebook > li.ui-tabs-active > a {
   color: #4c4c4c;
 }
@@ -687,6 +684,10 @@
   background-color: #eeeeee;
   border-color: #eeeeee #eeeeee #dddddd;
 }
+.openerp .ui-tabs .oe_notebook.ui-tabs-nav li.ui-tabs-active {
+  border-bottom: none;
+  padding-bottom: 1px;
+}
 .openerp .oe_notebook > li.ui-state-active > a, .openerp .oe_notebook > li.ui-state-active > a:hover {
   background-color: white;
   border: 1px solid #dddddd;
@@ -2022,8 +2023,21 @@
 .openerp .oe_application .oe_form_sheet .oe_notebook_page {
   padding: 0 16px;
 }
+.openerp .oe_form > :not(.oe_form_nosheet) header {
+  padding-left: 2px;
+}
+.openerp .oe_form > :not(.oe_form_nosheet) header ul {
+  display: inline-block;
+  float: right;
+}
+.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;
+}
 .openerp .oe_form header {
-  position: relative;
   border-bottom: 1px solid #cacaca;
   padding-left: 2px;
   background-color: #ededed;
@@ -2037,17 +2051,6 @@
 .openerp .oe_form header > span {
   margin-left: 4px;
 }
-.openerp .oe_form header ul {
-  display: inline-block;
-  float: right;
-}
-.openerp .oe_form header .oe_button {
-  margin: 3px 2px 1px;
-  float: left;
-}
-.openerp .oe_form header .oe_button:first-child {
-  margin-left: 6px;
-}
 .openerp .oe_form header .oe_tags {
   margin: 5px 0 0 5px;
   width: 400px;
@@ -2150,7 +2153,7 @@
 }
 .openerp .oe_form .oe_form_label_help[for] span, .openerp .oe_form .oe_form_label[for] span {
   font-size: 80%;
-  color: darkgreen;
+  color: darkGreen;
   vertical-align: top;
   position: relative;
   top: -4px;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index b280c8209a4..9f1b000704a 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -369,6 +369,7 @@ $sheet-padding: 16px
         font-family: "entypoRegular" !important
         font-size: 34px
         font-weight: 300 !important
+        line-height: 100%
     .oe_left
         float: left
         margin-right: 8px
@@ -1639,13 +1640,8 @@ $sheet-padding: 16px
                 padding: 0 16px
     // }}}
     // FormView.header {{{
-    .oe_form header
-        position: relative
-        border-bottom: 1px solid #cacaca
+    .oe_form > :not(.oe_form_nosheet) header
         padding-left: 2px
-        @include vertical-gradient(#fcfcfc, #dedede)
-        > span
-            margin-left: 4px
         ul
             display: inline-block
             float: right
@@ -1654,6 +1650,14 @@ $sheet-padding: 16px
             float: left
             &:first-child
                 margin-left: 6px
+
+    .oe_form  header
+        border-bottom: 1px solid #cacaca
+        padding-left: 2px
+        @include vertical-gradient(#fcfcfc, #dedede)
+        > span
+            margin-left: 4px        
+        
     // }}}
     // FormView.custom tags and classes {{{
     .oe_form
@@ -1981,7 +1985,7 @@ $sheet-padding: 16px
                 .oe_e
                     position: relative
                     top: -1px
-                    left: -9px
+                    left: -9px                    
             input.oe_form_binary_file
                 display: inline-block
                 margin-left: -85px
-- 
cgit v1.2.3


From 41f66b8835e589f76c4ed64d401d38355d453c51 Mon Sep 17 00:00:00 2001
From: jke-openerp <jke@openerp.com>
Date: Mon, 3 Feb 2014 18:39:26 +0100
Subject: [TYPO] Fix bug css revert rev 4122 and add clear:both

revert because was breaking the rendering of forms using oe_title as clearfix hack
adding clear on .oe_form_group to fix the journal form on firefox (block was unaligned, some fields out of the screen)

bzr revid: jke@openerp.com-20140203173926-ohabh1vahcwqijug
---
 addons/web/static/src/css/base.css  | 24 +++++++++++++++++++-----
 addons/web/static/src/css/base.sass | 11 +++++++++++
 2 files changed, 30 insertions(+), 5 deletions(-)

(limited to 'addons/web/static/src/css')

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 1e353ed31b5..2af82aee478 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");
@@ -79,6 +79,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;
@@ -1015,7 +1029,7 @@
   background-image: -moz-linear-gradient(top, #fc8787, maroon);
   background-image: -ms-linear-gradient(top, #fc8787, maroon);
   background-image: -o-linear-gradient(top, #fc8787, maroon);
-  background-image: linear-gradient(to bottom, #fc8787, maroon);
+  background-image: linear-gradient(to bottom, #fc8787, #800000);
 }
 .openerp .oe_topbar .oe_topbar_anonymous_login a {
   display: block;
@@ -1261,7 +1275,7 @@
   color: white;
   padding: 2px 4px;
   margin: 1px 6px 0 0;
-  border: 1px solid lightgrey;
+  border: 1px solid lightGray;
   text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
   -moz-border-radius: 4px;
   -webkit-border-radius: 4px;
@@ -1293,7 +1307,7 @@
   transform: scale(1.1);
 }
 .openerp .oe_secondary_submenu .oe_active {
-  border-top: 1px solid lightgrey;
+  border-top: 1px solid lightGray;
   border-bottom: 1px solid #dedede;
   text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
   -moz-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.2), inset 0 -1px 3px rgba(40, 40, 40, 0.2);
@@ -2275,7 +2289,7 @@
 }
 .openerp .oe_form .oe_form_label_help[for] span, .openerp .oe_form .oe_form_label[for] span {
   font-size: 80%;
-  color: darkgreen;
+  color: darkGreen;
   vertical-align: top;
   position: relative;
   top: -4px;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 9936168ee5b..67a088c9d1d 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -190,6 +190,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)
-- 
cgit v1.2.3


From 14631ed6c59e81e998da65590b6c9d3e490b46f9 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Tue, 4 Feb 2014 16:50:46 +0100
Subject: [FIX] css: remove height: 18px on .oe_facet_value property to avoid
 long filter name to exceed the size of the box (on 2 lines)

bzr revid: mat@openerp.com-20140204155046-ifqts8mpaqhgvjnj
---
 addons/web/static/src/css/base.css  | 1 -
 addons/web/static/src/css/base.sass | 1 -
 2 files changed, 2 deletions(-)

(limited to 'addons/web/static/src/css')

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 2af82aee478..894a410041d 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1773,7 +1773,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 {
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 67a088c9d1d..e19becc8624 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -1408,7 +1408,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
-- 
cgit v1.2.3


From ff89abba855a2348aec2bd00714bf5adda2565fe Mon Sep 17 00:00:00 2001
From: Gery Debongnie <ged@openerp.com>
Date: Mon, 10 Feb 2014 11:04:39 +0100
Subject: [FIX] correctly displays tooltips in sales/sales team (they
 previously were cut in half by incorrect padding) (addon web)

bzr revid: ged@openerp.com-20140210100439-icqps10dvtdhlvv0
---
 addons/web/static/src/css/base.css  | 12 +++++++-----
 addons/web/static/src/css/base.sass | 12 +++++++-----
 2 files changed, 14 insertions(+), 10 deletions(-)

(limited to 'addons/web/static/src/css')

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 6b568f8846e..bf9362a1e09 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -2142,7 +2142,7 @@
 }
 .openerp .oe_form .oe_form_label_help[for] span, .openerp .oe_form .oe_form_label[for] span {
   font-size: 80%;
-  color: darkGreen;
+  color: darkgreen;
   vertical-align: top;
   position: relative;
   top: -4px;
@@ -3138,10 +3138,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 +3149,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 5bb2bb9b448..c79deecddb5 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -2517,10 +2517,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 +2528,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
-- 
cgit v1.2.3


From 6a29b0ae0fcfc23136fcbbd0e8097116ee60d779 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Wed, 12 Feb 2014 15:19:59 +0100
Subject: [FIX] Layout was broken in the debugging `View Logs` (perm_read)
 popup, fixed + boostrapified

bzr revid: odo@openerp.com-20140212141959-w2s4f960jwbknzx4
---
 addons/web/static/src/css/base.css  | 14 --------------
 addons/web/static/src/css/base.sass | 12 ------------
 2 files changed, 26 deletions(-)

(limited to 'addons/web/static/src/css')

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index bf9362a1e09..35b6fcc582d 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -3021,20 +3021,6 @@
   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;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index c79deecddb5..5021644a062 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -2419,18 +2419,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
-- 
cgit v1.2.3


From 9d670cd45fe2f1e2d06bb27df8d249fec1ef83b0 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Wed, 12 Feb 2014 19:09:32 +0100
Subject: [FIX] web: navbar must have a z-index at 0 to be hidden when passing
 pad in fullscreen

bzr revid: chs@openerp.com-20140212180932-z1vtcfrif0rzsozu
---
 addons/web/static/src/css/base.css  | 4 ++--
 addons/web/static/src/css/base.sass | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'addons/web/static/src/css')

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 35b6fcc582d..c5c9af94479 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");
@@ -3025,7 +3025,7 @@
   min-height: 32px;
   margin-bottom: 0px;
   border: none;
-  z-index: 1;
+  z-index: 0;
   background-color: #414141;
   background-color: #454343;
   background-image: -webkit-gradient(linear, left top, left bottom, from(#646060), to(#262626));
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 5021644a062..95c30e5dc93 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -2425,7 +2425,7 @@ $sheet-padding: 16px
         min-height: 32px
         margin-bottom: 0px
         border: none
-        z-index: 1
+        z-index: 0
         background-color: #414141
         @include vertical-gradient(#646060, #262626)
     .navbar-default
-- 
cgit v1.2.3


From a8943b416a892c4da76aa0887886622e525db8b8 Mon Sep 17 00:00:00 2001
From: "Mohammed Shekha (OpenERP)" <msh@openerp.com>
Date: Thu, 13 Feb 2014 17:25:56 +0530
Subject: [FIX]Web, Statusbar: Fixed the issue of statubar in chrome is
 aligned, it is aligned in inline block.

bzr revid: msh@openerp.com-20140213115556-irdodahpw0atgy5u
---
 addons/web/static/src/css/base.css  | 11 ++++++-----
 addons/web/static/src/css/base.sass |  1 +
 2 files changed, 7 insertions(+), 5 deletions(-)

(limited to 'addons/web/static/src/css')

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 894a410041d..c07c53889d4 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");
@@ -1029,7 +1029,7 @@
   background-image: -moz-linear-gradient(top, #fc8787, maroon);
   background-image: -ms-linear-gradient(top, #fc8787, maroon);
   background-image: -o-linear-gradient(top, #fc8787, maroon);
-  background-image: linear-gradient(to bottom, #fc8787, #800000);
+  background-image: linear-gradient(to bottom, #fc8787, maroon);
 }
 .openerp .oe_topbar .oe_topbar_anonymous_login a {
   display: block;
@@ -1275,7 +1275,7 @@
   color: white;
   padding: 2px 4px;
   margin: 1px 6px 0 0;
-  border: 1px solid lightGray;
+  border: 1px solid lightgrey;
   text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
   -moz-border-radius: 4px;
   -webkit-border-radius: 4px;
@@ -1307,7 +1307,7 @@
   transform: scale(1.1);
 }
 .openerp .oe_secondary_submenu .oe_active {
-  border-top: 1px solid lightGray;
+  border-top: 1px solid lightgrey;
   border-bottom: 1px solid #dedede;
   text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
   -moz-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.2), inset 0 -1px 3px rgba(40, 40, 40, 0.2);
@@ -2163,6 +2163,7 @@
 }
 .openerp .oe_form header {
   position: relative;
+  overflow: hidden;
   border-bottom: 1px solid #cacaca;
   padding-left: 2px;
   background-color: #ededed;
@@ -2288,7 +2289,7 @@
 }
 .openerp .oe_form .oe_form_label_help[for] span, .openerp .oe_form .oe_form_label[for] span {
   font-size: 80%;
-  color: darkGreen;
+  color: darkgreen;
   vertical-align: top;
   position: relative;
   top: -4px;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index e19becc8624..1c02018da9d 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -1711,6 +1711,7 @@ $sheet-padding: 16px
     // FormView.header {{{
     .oe_form header
         position: relative
+        overflow: hidden
         border-bottom: 1px solid #cacaca
         padding-left: 2px
         @include vertical-gradient(#fcfcfc, #dedede)
-- 
cgit v1.2.3


From 9e6c1114090c6bcb4efe48cc2e86c6588315af33 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Thu, 13 Feb 2014 15:26:43 +0100
Subject: [FIX] web: correct navbar position

bzr revid: chs@openerp.com-20140213142643-y0wtmbv3fzh8f0wt
---
 addons/web/static/src/css/base.css  | 3 ++-
 addons/web/static/src/css/base.sass | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'addons/web/static/src/css')

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index c5c9af94479..899ea2df34b 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -3025,7 +3025,8 @@
   min-height: 32px;
   margin-bottom: 0px;
   border: none;
-  z-index: 0;
+  z-index: 1;
+  position: static;
   background-color: #414141;
   background-color: #454343;
   background-image: -webkit-gradient(linear, left top, left bottom, from(#646060), to(#262626));
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 95c30e5dc93..e0e1df0c1fc 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -2425,7 +2425,8 @@ $sheet-padding: 16px
         min-height: 32px
         margin-bottom: 0px
         border: none
-        z-index: 0
+        z-index: 1
+        position: static
         background-color: #414141
         @include vertical-gradient(#646060, #262626)
     .navbar-default
-- 
cgit v1.2.3


From 487dee485132b9d1b6bc010815d7244719b5d2e4 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Thu, 13 Feb 2014 15:28:42 +0100
Subject: [IMP] web: generic sass/css Makefile

bzr revid: chs@openerp.com-20140213142842-u7r5axxewqjfsd1c
---
 addons/web/static/src/css/Makefile | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'addons/web/static/src/css')

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 .:.
-- 
cgit v1.2.3


From 2c4466258dc2eeb89017eda3ade1e1b9b19fd9de Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Wed, 19 Feb 2014 17:32:13 +0100
Subject: [FIX] web: do not float buttons in header bar to the left. This make
 them invisible if they are the sole children of the header.

bzr revid: odo@openerp.com-20140219163213-8z4fxio7p7nzesf0
---
 addons/web/static/src/css/base.css  | 3 +--
 addons/web/static/src/css/base.sass | 1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

(limited to 'addons/web/static/src/css')

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 81ca509f4f9..567091708a4 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");
@@ -2034,7 +2034,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;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index f51e806d1ee..2844d094599 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -1649,7 +1649,6 @@ $sheet-padding: 16px
             float: right
         .oe_button
             margin: 3px 2px 1px
-            float: left
             &:first-child
                 margin-left: 6px
 
-- 
cgit v1.2.3


From b0f1e57269f62f57ae97d8e562ee81927257b75c Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Thu, 20 Feb 2014 14:50:30 +0100
Subject: [FIX] web: oe_form_uri is not always a link (many2one readonly
 no_open for instance), therefore, apply css only for a.oe_form_uri, to add
 the underline. Color was already added by another rule.

bzr revid: dle@openerp.com-20140220135030-tt6isdwum15zt6i8
---
 addons/web/static/src/css/base.css  | 7 ++-----
 addons/web/static/src/css/base.sass | 6 ++----
 2 files changed, 4 insertions(+), 9 deletions(-)

(limited to 'addons/web/static/src/css')

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 567091708a4..e43a2fb654e 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");
@@ -1219,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 {
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 2844d094599..b19db9e4ebd 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -1013,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%
-- 
cgit v1.2.3