diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index c9718479534..638f446c5ba 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"); @@ -81,7 +81,7 @@ } .openerp .zebra tbody tr:nth-child(odd) td { background-color: #f0f0fa; - background-color: #f0f0fa; + background-color: #efeff8; background-image: -webkit-gradient(linear, left top, left bottom, from(#f0f0fa), to(#eeeef6)); background-image: -webkit-linear-gradient(top, #f0f0fa, #eeeef6); background-image: -moz-linear-gradient(top, #f0f0fa, #eeeef6); @@ -90,7 +90,7 @@ background-image: linear-gradient(to bottom, #f0f0fa, #eeeef6); } .openerp .zebra tbody tr:hover td { - background-color: #eeeeee; + background-color: #e6e6e6; background-image: -webkit-gradient(linear, left top, left bottom, from(#eeeeee), to(#dedede)); background-image: -webkit-linear-gradient(top, #eeeeee, #dedede); background-image: -moz-linear-gradient(top, #eeeeee, #dedede); @@ -120,7 +120,7 @@ padding: 3px 12px; font-size: 13px; text-align: center; - background-color: #efefef; + background-color: #e3e3e3; background-image: -webkit-gradient(linear, left top, left bottom, from(#efefef), to(#d8d8d8)); background-image: -webkit-linear-gradient(top, #efefef, #d8d8d8); background-image: -moz-linear-gradient(top, #efefef, #d8d8d8); @@ -138,7 +138,7 @@ 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 { - background-color: #f6f6f6; + background-color: #ececec; background-image: -webkit-gradient(linear, left top, left bottom, from(#f6f6f6), to(#e3e3e3)); background-image: -webkit-linear-gradient(top, #f6f6f6, #e3e3e3); background-image: -moz-linear-gradient(top, #f6f6f6, #e3e3e3); @@ -151,7 +151,7 @@ .openerp a.button:focus, .openerp 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: #f6f6f6; + background-color: #ececec; background-image: -webkit-gradient(linear, left top, left bottom, from(#f6f6f6), to(#e3e3e3)); background-image: -webkit-linear-gradient(top, #f6f6f6, #e3e3e3); background-image: -moz-linear-gradient(top, #f6f6f6, #e3e3e3); @@ -163,7 +163,7 @@ 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 { - background-color: #e3e3e3; + background-color: #ececec; background-image: -webkit-gradient(linear, left top, left bottom, from(#e3e3e3), to(#f6f6f6)); background-image: -webkit-linear-gradient(top, #e3e3e3, #f6f6f6); background-image: -moz-linear-gradient(top, #e3e3e3, #f6f6f6); @@ -224,7 +224,7 @@ -moz-border-radius: 2px 2px 0 0; -webkit-border-radius: 2px 2px 0 0; border-radius: 2px 2px 0 0; - background-color: #fcfcfc; + background-color: #ededed; background-image: -webkit-gradient(linear, left top, left bottom, from(#fcfcfc), to(#dedede)); background-image: -webkit-linear-gradient(top, #fcfcfc, #dedede); background-image: -moz-linear-gradient(top, #fcfcfc, #dedede); @@ -307,7 +307,7 @@ right: 0; bottom: 0; text-shadow: 0 1px 1px #999999; - background-color: #b41616; + 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); @@ -379,7 +379,7 @@ background: #dc5f59; } .openerp button.oe_highlight { - background-color: #df3f3f; + background-color: #c02c2c; background-image: -webkit-gradient(linear, left top, left bottom, from(#df3f3f), to(#a21a1a)); background-image: -webkit-linear-gradient(top, #df3f3f, #a21a1a); background-image: -moz-linear-gradient(top, #df3f3f, #a21a1a); @@ -391,7 +391,7 @@ box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(155, 155, 155, 0.4) inset; } .openerp button.oe_highlight:hover { - background-color: #e25858; + background-color: #c63939; background-image: -webkit-gradient(linear, left top, left bottom, from(#e25858), to(#ab1b1b)); background-image: -webkit-linear-gradient(top, #e25858, #ab1b1b); background-image: -moz-linear-gradient(top, #e25858, #ab1b1b); @@ -400,7 +400,7 @@ background-image: linear-gradient(to bottom, #e25858, #ab1b1b); } .openerp button.oe_highlight:active { - background-color: #c52020; + background-color: #cb2121; background-image: -webkit-gradient(linear, left top, left bottom, from(#c52020), to(#d22323)); background-image: -webkit-linear-gradient(top, #c52020, #d22323); background-image: -moz-linear-gradient(top, #c52020, #d22323); @@ -417,7 +417,7 @@ font-weight: bold; } .openerp .oe_form_dirty button.oe_highlight_on_dirty { - background-color: #dc5f59; + background-color: #c74a44; background-image: -webkit-gradient(linear, left top, left bottom, from(#dc5f59), to(#b33630)); background-image: -webkit-linear-gradient(top, #dc5f59, #b33630); background-image: -moz-linear-gradient(top, #dc5f59, #b33630); @@ -694,7 +694,7 @@ padding: 2px 8px; } .openerp .oe_dropdown_menu > li:hover { - background-color: #f0f0fa; + background-color: #efeff8; background-image: -webkit-gradient(linear, left top, left bottom, from(#f0f0fa), to(#eeeef6)); background-image: -webkit-linear-gradient(top, #f0f0fa, #eeeef6); background-image: -moz-linear-gradient(top, #f0f0fa, #eeeef6); @@ -748,7 +748,7 @@ width: 200px; } .openerp .oe_sidebar .oe_dropdown_menu .oe_sidebar_add_attachment:hover { - background-color: #f0f0fa; + background-color: #efeff8; background-image: -webkit-gradient(linear, left top, left bottom, from(#f0f0fa), to(#eeeef6)); background-image: -webkit-linear-gradient(top, #f0f0fa, #eeeef6); background-image: -moz-linear-gradient(top, #f0f0fa, #eeeef6); @@ -846,7 +846,7 @@ border: 1px solid #222222; color: white; margin: 0; - background-color: #b92020; + 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); @@ -903,7 +903,7 @@ right: 0; bottom: 0; text-shadow: 0 1px 1px #999999; - background-color: #b41616; + 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); @@ -1000,7 +1000,7 @@ width: 100%; height: 32px; background-color: #414141; - background-color: #646060; + 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); @@ -1011,7 +1011,7 @@ .openerp .oe_topbar .oe_topbar_anonymous_login { background-color: #dc5f59; color: #eeeeee; - background-color: #fc8787; + background-color: #be4343; background-image: -webkit-gradient(linear, left top, left bottom, from(#fc8787), to(maroon)); background-image: -webkit-linear-gradient(top, #fc8787, maroon); background-image: -moz-linear-gradient(top, #fc8787, maroon); @@ -1101,7 +1101,7 @@ color: #eeeeee; } .openerp .oe_topbar .oe_dropdown_menu li:hover { - background-color: #292929; + background-color: #212121; background-image: -webkit-gradient(linear, left top, left bottom, from(#292929), to(#191919)); background-image: -webkit-linear-gradient(top, #292929, #191919); background-image: -moz-linear-gradient(top, #292929, #191919); @@ -1274,12 +1274,6 @@ -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); } -.openerp .oe_secondary_submenu .oe_secondary_submenu { - margin-left: -20px; -} -.openerp .oe_secondary_submenu .oe_secondary_submenu li { - margin-left: 20px; -} .openerp .oe_secondary_submenu .oe_menu_text { white-space: nowrap; overflow: hidden; @@ -1353,6 +1347,12 @@ 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; +} .openerp .oe_about { background-color: white; background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAYAAAAGCAYAAADgzO9IAAAAKUlEQVQIHWO8e/fufwYsgAUkJigoiCIF5DMyoYggcUiXgNnBiGQKmAkARpcEQeriln4AAAAASUVORK5CYII=); @@ -1379,7 +1379,7 @@ right: 0; bottom: 0; text-shadow: 0 1px 1px #999999; - background-color: #b41616; + 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); @@ -1596,7 +1596,7 @@ } .openerp .oe_view_manager_current > .oe_view_manager_header { border-bottom: 1px solid #cacaca; - background-color: #fcfcfc; + background-color: #ededed; background-image: -webkit-gradient(linear, left top, left bottom, from(#fcfcfc), to(#dedede)); background-image: -webkit-linear-gradient(top, #fcfcfc, #dedede); background-image: -moz-linear-gradient(top, #fcfcfc, #dedede); @@ -2057,7 +2057,7 @@ background: none; } .openerp .oe_view_manager_current .oe_form_editable button.oe_highlight { - background-color: #efefef; + background-color: #e3e3e3; background-image: -webkit-gradient(linear, left top, left bottom, from(#efefef), to(#d8d8d8)); background-image: -webkit-linear-gradient(top, #efefef, #d8d8d8); background-image: -moz-linear-gradient(top, #efefef, #d8d8d8); @@ -2069,7 +2069,7 @@ box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(255, 255, 255, 0.8) inset; } .openerp .oe_view_manager_current .oe_form_editable button.oe_highlight:active { - background-color: #e3e3e3; + background-color: #ececec; background-image: -webkit-gradient(linear, left top, left bottom, from(#e3e3e3), to(#f6f6f6)); background-image: -webkit-linear-gradient(top, #e3e3e3, #f6f6f6); background-image: -moz-linear-gradient(top, #e3e3e3, #f6f6f6); @@ -2081,7 +2081,7 @@ box-shadow: none; } .openerp .oe_view_manager_current .oe_form_editable button.oe_highlight:hover { - background-color: #f6f6f6; + background-color: #ececec; background-image: -webkit-gradient(linear, left top, left bottom, from(#f6f6f6), to(#e3e3e3)); background-image: -webkit-linear-gradient(top, #f6f6f6, #e3e3e3); background-image: -moz-linear-gradient(top, #f6f6f6, #e3e3e3); @@ -2150,7 +2150,7 @@ position: relative; border-bottom: 1px solid #cacaca; padding-left: 2px; - background-color: #fcfcfc; + background-color: #ededed; background-image: -webkit-gradient(linear, left top, left bottom, from(#fcfcfc), to(#dedede)); background-image: -webkit-linear-gradient(top, #fcfcfc, #dedede); background-image: -moz-linear-gradient(top, #fcfcfc, #dedede); @@ -2585,7 +2585,7 @@ list-style-type: none; margin: 0 -18px 0 0; padding: 0; - background-color: #fcfcfc; + background-color: #ededed; background-image: -webkit-gradient(linear, left top, left bottom, from(#fcfcfc), to(#dedede)); background-image: -webkit-linear-gradient(top, #fcfcfc, #dedede); background-image: -moz-linear-gradient(top, #fcfcfc, #dedede); @@ -2645,7 +2645,7 @@ transform: rotate(45deg); } .openerp ul.oe_form_status li.oe_active, .openerp ul.oe_form_status_clickable li.oe_active { - background-color: #729fcf; + background-color: #5382b9; background-image: -webkit-gradient(linear, left top, left bottom, from(#729fcf), to(#3465a4)); background-image: -webkit-linear-gradient(top, #729fcf, #3465a4); background-image: -moz-linear-gradient(top, #729fcf, #3465a4); @@ -2668,7 +2668,7 @@ cursor: pointer; } .openerp ul.oe_form_status_clickable li:hover { - background-color: #e8e8e8; + background-color: #d9d9d9; background-image: -webkit-gradient(linear, left top, left bottom, from(#e8e8e8), to(#cacaca)); background-image: -webkit-linear-gradient(top, #e8e8e8, #cacaca); background-image: -moz-linear-gradient(top, #e8e8e8, #cacaca); @@ -2680,7 +2680,7 @@ text-shadow: 0 -1px 1px #fcfcfc, 0 1px 1px #dedede; } .openerp ul.oe_form_status_clickable li:hover .arrow span { - background-color: #e8e8e8; + background-color: #d9d9d9; background-image: -webkit-gradient(linear, left top, left bottom, from(#e8e8e8), to(#cacaca)); background-image: -webkit-linear-gradient(top, #e8e8e8, #cacaca); background-image: -moz-linear-gradient(top, #e8e8e8, #cacaca); @@ -2692,7 +2692,7 @@ color: #7c7bad; } .openerp ul.oe_form_status_clickable li.oe_active:hover { - background-color: #4c85c2; + background-color: #3a699f; background-image: -webkit-gradient(linear, left top, left bottom, from(#4c85c2), to(#284d7d)); background-image: -webkit-linear-gradient(top, #4c85c2, #284d7d); background-image: -moz-linear-gradient(top, #4c85c2, #284d7d); @@ -2848,7 +2848,7 @@ padding: 1px 6px 3px; } .openerp .oe_list .oe_list_content .oe_group_header { - background-color: #fcfcfc; + background-color: #ededed; background-image: -webkit-gradient(linear, left top, left bottom, from(#fcfcfc), to(#dedede)); background-image: -webkit-linear-gradient(top, #fcfcfc, #dedede); background-image: -moz-linear-gradient(top, #fcfcfc, #dedede); @@ -2945,7 +2945,7 @@ } .openerp .oe_list_content > tbody > tr:nth-child(odd) { background-color: #f0f0fa; - background-color: #f0f0fa; + background-color: #efeff8; background-image: -webkit-gradient(linear, left top, left bottom, from(#f0f0fa), to(#eeeef6)); background-image: -webkit-linear-gradient(top, #f0f0fa, #eeeef6); background-image: -moz-linear-gradient(top, #f0f0fa, #eeeef6); @@ -3149,7 +3149,7 @@ div.ui-widget-overlay { } .openerp_ie .db_option_table .oe_form_field_selection { width: auto; -} +} .openerp_ie input[type='checkbox'] { border: none; background: none; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index b6ac4204812..42ade77ccbb 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -42,7 +42,7 @@ $sheet-padding: 16px @include box-shadow(none) @mixin vertical-gradient($startColor: #555, $endColor: #333) - background-color: $startColor + background-color: mix($startColor, $endColor) background-image: -webkit-gradient(linear, left top, left bottom, from($startColor), to($endColor)) /* Saf4+, Chrome */ background-image: -webkit-linear-gradient(top, $startColor, $endColor) /* Chrome 10+, Saf5.1+, iOS 5+ */ background-image: -moz-linear-gradient(top, $startColor, $endColor) /* FF3.6 */