From: Christophe Simonis Date: Wed, 5 Nov 2014 20:10:15 +0000 (+0100) Subject: [MERGE] forward port of branch 7.0 up to 3e3e35e X-Git-Url: http://git.inspyration.org/?a=commitdiff_plain;h=ec277732fec3cb527e508161c4218b16927e0327;p=odoo%2Fodoo.git [MERGE] forward port of branch 7.0 up to 3e3e35e --- ec277732fec3cb527e508161c4218b16927e0327 diff --cc addons/web/static/src/css/base.css index 608b477,2c439c3..eebb304 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@@ -534,17 -528,8 +532,17 @@@ max-width: 650px; } .openerp .oe_grey { - color: #aaaaaa; + color: #aaa; } +.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; @@@ -554,35 -539,12 +552,35 @@@ -webkit-border-radius: 3px; border-radius: 3px; background: #f0f0fa; - color: #4c4c4c; + color: #4C4C4C; } .openerp .oe_tag_dark { - background: #7c7bad; - color: #eeeeee; + background: #7C7BAD; + color: #eee; } +.openerp .oe_form_field_radio.oe_horizontal { + white-space: nowrap; +} +.openerp .oe_form_field_radio.oe_horizontal label { + display: inline-block; + text-align: center; + height: 16px; +} +.openerp .oe_form_field_radio.oe_vertical label { + margin-left: 4px; +} +.openerp .oe_form_field_radio.oe_form_required .oe_radio_input { + border: 2px solid transparent; + display: inline-block; + height: 12px; + width: 12px; + vertical-align: bottom; + border-radius: 10px; + margin: 1px 0; +} +.openerp .oe_form_field_radio.oe_form_required.oe_form_invalid .oe_radio_input { + border-color: red; +} .openerp .oe_tags { margin-bottom: 1px; } @@@ -714,7 -673,7 +712,7 @@@ cursor: pointer; } .openerp .oe_dropdown_toggle { - color: #2b2b2b; - color: #4C4C4C; ++ color: #2B2B2B; font-weight: normal; } .openerp .oe_dropdown_hover:hover .oe_dropdown_menu, .openerp .oe_dropdown_menu.oe_opened { @@@ -877,9 -838,156 +875,9 @@@ 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 #222; - 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: #eee; - border: solid 1px #333; - 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: #eee; - 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: #eee; - margin: 0 8px; -} -.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: #eee; - 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; + background: #fff; + color: #000; text-align: left; } .openerp .oe_database_manager .oe_database_manager_menu { @@@ -901,14 -1021,14 +899,14 @@@ background-color: #dc5f59; color: #eeeeee; 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); - 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: -webkit-gradient(linear, left top, left bottom, from(#FC8787), to(#800000)); + background-image: -webkit-linear-gradient(top, #FC8787, #800000); + background-image: -moz-linear-gradient(top, #FC8787, #800000); + background-image: -ms-linear-gradient(top, #FC8787, #800000); + background-image: -o-linear-gradient(top, #FC8787, #800000); + background-image: linear-gradient(to bottom, #FC8787, #800000); } -.openerp .oe_topbar .oe_topbar_anonymous_login a { +.openerp .navbar .oe_topbar_anonymous_login a { display: block; padding: 5px 10px 7px; line-height: 20px; @@@ -961,20 -1081,20 +959,20 @@@ -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: #333; background: rgba(37, 37, 37, 0.9); - border-color: #999999; + border-color: #999; border-color: rgba(0, 0, 0, 0.2); border-style: solid; - border-width: 0 1px 1px; + border-width: 0 2px 1px; -moz-border-radius: 0 0 6px 6px; -webkit-border-radius: 0 0 6px 6px; border-radius: 0 0 6px 6px; @@@ -986,10 -1106,10 +984,10 @@@ float: none; padding: 3px 12px; } -.openerp .oe_topbar .oe_dropdown_menu li a { +.openerp .navbar .dropdown_menu li a { - color: #eeeeee; + color: #eee; } -.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); @@@ -1029,7 -1149,7 +1027,7 @@@ line-height: 20px; height: 20px; text-decoration: none; - color: #eeeeee !important; - color: #eee; ++ color: #eee !important; vertical-align: top; text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); -webkit-transition: all 0.2s ease-out; @@@ -1126,12 -1246,40 +1124,12 @@@ .openerp .oe_secondary_menu_section { font-weight: bold; margin-left: 8px; - color: #7c7bad; + 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 lightGray; - 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; @@@ -1216,18 -1400,18 +1214,18 @@@ border-radius: 0 0 2px 2px; } .openerp .oe_about .oe_bottom a { - color: #eeeeee; + color: #eee; } +.openerp a.oe_form_uri:hover { + text-decoration: underline; +} .openerp .oe_application { width: 100%; height: 100%; } .openerp .oe_application a { - color: #7c7bad; + color: #7C7BAD; } -.openerp .oe_application a:hover { - text-decoration: underline; -} .openerp .oe_application > div { height: 100%; } @@@ -1284,10 -1462,9 +1282,10 @@@ font-size: 18px; margin: 0; float: left; + line-height: 30px; } .openerp .oe_view_manager table.oe_view_manager_header h2 a { - color: #7c7bad; + color: #7C7BAD; } .openerp .oe_view_manager table.oe_view_manager_header .oe_dropdown_menu { line-height: normal; @@@ -1677,8 -1841,8 +1675,8 @@@ margin: 0; } .openerp .oe_searchview .oe_searchview_drawer h3 { - margin: 8px 4px 4px 12px; + margin: 8px 4px 4px 0px; - color: #7c7bad; + color: #7C7BAD; font-size: 13px; } .openerp .oe_searchview .oe_searchview_drawer h4, .openerp .oe_searchview .oe_searchview_drawer h4 * { @@@ -2003,14 -2144,8 +2001,14 @@@ } .openerp .oe_application .oe_form_sheetbg { background: url(/web/static/src/img/form_sheetbg.png); - border-bottom: 1px solid #dddddd; + border-bottom: 1px solid #ddd; } +.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); @@@ -2101,11 -2235,11 +2099,11 @@@ 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; - border-bottom: 1px solid #ccbb66; + background: #fe9; + border-bottom: 1px solid #cb6; padding: 4px; } .openerp .oe_form .oe_form_box_info > p { @@@ -2263,11 -2385,10 +2261,11 @@@ background: white; min-width: 60px; color: #1f1f1f; + font-family: "Lucida Grande", Helvetica, Verdana, Arial, sans-serif; } .openerp .oe_form input[readonly], .openerp .oe_form select[readonly], .openerp .oe_form textarea[readonly], .openerp .oe_form input[disabled], .openerp .oe_form select[disabled] { - background: #e5e5e5 !important; - color: #666666; + background: #E5E5E5 !important; + color: #666; } .openerp .oe_form textarea[disabled] { border: none; @@@ -2278,10 -2399,9 +2276,10 @@@ -moz-border-radius: 0px; -webkit-border-radius: 0px; border-radius: 0px; + color: #4c4c4c; } .openerp .oe_form textarea.oe_inline[disabled] { - border-left: 8px solid #eeeeee; + border-left: 8px solid #eee; } .openerp .oe_form .oe_form_field_url button img { vertical-align: top; @@@ -2431,8 -2549,11 +2429,8 @@@ } .openerp .oe_fileupload .oe_add button.oe_attach { width: 24px; - overflow: hidden; - width: 24px; - overflow: hidden; background: transparent; - color: #7c7bad; + color: #7C7BAD; box-shadow: none; border: none; text-shadow: none; @@@ -2477,11 -2598,8 +2475,11 @@@ background: white; } .openerp .oe_fileupload .oe_attachments .oe_attachment:nth-child(even) { - background: #f4f5fa; + background: #F4F5FA; } +.openerp .oe_form_field_many2one { + display: inline-block; +} .openerp .oe_form_field_many2one td:first-child { position: relative; } @@@ -2637,8 -2736,8 +2635,8 @@@ background-image: -o-linear-gradient(top, #e8e8e8, #cacaca); background-image: linear-gradient(to bottom, #e8e8e8, #cacaca); } -.openerp ul.oe_form_status_clickable li .label { +.openerp ul.oe_form_status_clickable li > .label { - color: #7c7bad; + color: #7C7BAD; } .openerp ul.oe_form_status_clickable li.oe_active:hover { background-color: #3a699f; @@@ -3044,138 -3143,21 +3042,138 @@@ font-size: 95%; line-height: 1.2em; } -.openerp .oe_debug_view_log label { - display: block; - width: 49%; - text-align: right; - float: left; +.openerp .navbar { + min-height: 32px; + margin-bottom: 0px; + border: none; + z-index: 1; + position: static; + 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; ++ border-top-color: #777 !important; ++ border-bottom-color: #777 !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; - color: #009; } -.openerp .oe_debug_view_log span { +.openerp h3 { + font-size: 1.17em; + font-weight: bold; +} +.openerp p { display: block; - width: 49%; - float: right; - color: #333; + -webkit-margin-before: 1em; + -webkit-margin-after: 1em; + -webkit-margin-start: 0px; + -webkit-margin-end: 0px; +} +.openerp pre { - background-color: white; ++ background-color: #FFFFFF; + border: none; + padding: 10px 0 3px 0; +} +.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; +} + +.jqstooltip { + height: auto !important; + width: auto !important; + padding: 0; } +@-moz-document url-prefix() { + .openerp .oe_searchview .oe_searchview_search { + top: -1px; + } + .openerp .oe_form_field_many2one .oe_m2o_cm_button { + line-height: 18px; + } + .openerp .oe_webclient .oe_star_on, .openerp .oe_webclient .oe_star_off { + top: 0px; + } +} .kitten-mode-activated { background-size: cover; background-attachment: fixed; @@@ -3184,15 -3166,6 +3182,15 @@@ opacity: 0.7; } +.loading-kitten { + -moz-border-radius: 15px; + -webkit-border-radius: 15px; + border-radius: 15px; - -moz-box-shadow: 0 0 5px 5px #999999; - -webkit-box-shadow: 0 0 5px 5px #999999; - box-shadow: 0 0 5px 5px #999999; ++ -moz-box-shadow: 0 0 5px 5px #999; ++ -webkit-box-shadow: 0 0 5px 5px #999; ++ box-shadow: 0 0 5px 5px #999; +} + div.ui-widget-overlay { background: black; filter: alpha(opacity=30); @@@ -3242,33 -3215,6 +3240,33 @@@ padding-bottom: 10px !important; } +body.oe_single_form { - background: #eeeeee url(/web/static/src/img/form_sheetbg.png); ++ background: #eee url(/web/static/src/img/form_sheetbg.png); + height: 100%; +} +body.oe_single_form .oe_single_form_logo { + padding: 10px; + text-align: center; + margin-bottom: 10px; +} +body.oe_single_form .oe_single_form_footer { + position: absolute; + bottom: -30px; + right: 0px; + width: 100%; + text-align: center; +} +body.oe_single_form .oe_single_form_container { + 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; +} + .openerp_ie .placeholder { color: #afafb6 !important; font-style: italic !important;