diff options
| author | Vidhin Mehta <vme@tinyerp.com> | 2013-01-28 11:48:43 +0530 |
|---|---|---|
| committer | Vidhin Mehta <vme@tinyerp.com> | 2013-01-28 11:48:43 +0530 |
| commit | 7246f41f4be65eaddace08d692f65c9a74579b14 (patch) | |
| tree | a48071f815e8cd656b77fc78577a56ea1e349c37 /addons/web/static/src/css | |
| parent | 72a75850533fb1b8a45130852fef568e2aaff740 (diff) | |
| parent | e2d5e0df9e47e836cab143d1b77b0d253d1df4b8 (diff) | |
[MERGE]trunk.
bzr revid: vme@tinyerp.com-20121214103420-yyheqz6izvrvajun
bzr revid: vme@tinyerp.com-20130128061843-o1gzb1cns9ytl246
Diffstat (limited to 'addons/web/static/src/css')
| -rw-r--r-- | addons/web/static/src/css/base.css | 237 | ||||
| -rw-r--r-- | addons/web/static/src/css/base.sass | 141 | ||||
| -rw-r--r-- | addons/web/static/src/css/full.css | 8 |
3 files changed, 321 insertions, 65 deletions
diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 280a7c1da22..58a92cc1280 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); @@ -485,7 +485,7 @@ box-shadow: none; } .openerp .oe_button.oe_link img { - display: none; + display: inline-block; } .openerp .oe_button.oe_link span { border: none; @@ -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); @@ -819,6 +819,16 @@ margin-top: 1px; background-color: #f6cf3b; } +.openerp .oe_dialog_warning { + width: 100%; +} +.openerp .oe_dialog_warning p { + text-align: center; +} +.openerp .oe_dialog_icon { + padding: 5px; + width: 32px; +} .openerp .oe_login { background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAYAAAAGCAYAAADgzO9IAAAAKUlEQVQIHWO8e/fufwYsgAUkJigoiCIF5DMyoYggcUiXgNnBiGQKmAkARpcEQeriln4AAAAASUVORK5CYII=); text-align: center; @@ -836,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); @@ -893,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); @@ -990,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); @@ -998,6 +1008,39 @@ background-image: -o-linear-gradient(top, #646060, #262626); background-image: linear-gradient(to bottom, #646060, #262626); } +.openerp .oe_topbar .oe_topbar_anonymous_login { + 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, maroon); +} +.openerp .oe_topbar .oe_topbar_anonymous_login a { + display: block; + padding: 5px 10px 7px; + line-height: 20px; + height: 20px; + text-decoration: none; + color: white; + background: transparent; + -webkit-transition: all 0.2s ease-out; + -moz-transition: all 0.2s ease-out; + -ms-transition: all 0.2s ease-out; + -o-transition: all 0.2s ease-out; + transition: all 0.2s ease-out; +} +.openerp .oe_topbar .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); + -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2) inset; + -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 { display: block; padding: 5px 10px 7px; @@ -1058,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); @@ -1149,18 +1192,33 @@ padding-bottom: 16px; } .openerp a.oe_logo { + position: relative; width: 220px; display: block; text-align: center; - height: 70px; - line-height: 70px; } .openerp a.oe_logo img { - height: 40px; - width: 157px; margin: 14px 0; border: 0; } +.openerp a.oe_logo .oe_logo_edit { + margin: 14px 0; + position: absolute; + top: 1px; + padding: 4px; + width: 100%; + display: none; + text-align: center; + color: #eeeeee; + background: rgba(37, 37, 37, 0.9); + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + -ms-box-sizing: border-box; + box-sizing: border-box; +} +.openerp a.oe_logo:hover .oe_logo_edit_admin { + display: block; +} .openerp .oe_footer { position: fixed; bottom: 0; @@ -1170,14 +1228,11 @@ text-align: center; } .openerp .oe_footer a { - font-weight: 800; - font-family: serif; - font-size: 16px; + font-weight: bold; color: black; } .openerp .oe_footer a span { color: #c81010; - font-style: italic; } .openerp .oe_secondary_menu_section { font-weight: bold; @@ -1187,7 +1242,7 @@ .openerp .oe_secondary_submenu { padding: 2px 0 8px 0; margin: 0; - width: 100%; + width: 220px; display: inline-block; } .openerp .oe_secondary_submenu li { @@ -1219,6 +1274,13 @@ -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_menu_text { + white-space: nowrap; + overflow: hidden; + display: inline-block; + text-overflow: ellipsis; + max-width: 85%; +} .openerp .oe_secondary_submenu .oe_menu_counter { float: right; text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); @@ -1285,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=); @@ -1311,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); @@ -1329,6 +1397,7 @@ } .openerp .oe_application { width: 100%; + height: 100%; } .openerp .oe_application a { color: #7c7bad; @@ -1530,7 +1599,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); @@ -1991,7 +2060,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); @@ -2003,7 +2072,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); @@ -2015,7 +2084,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); @@ -2042,6 +2111,12 @@ margin: -16px -16px 0 -16px; padding: 0; } +.openerp .oe_form_nosheet.oe_form_nomargin { + margin: 0; +} +.openerp .oe_form_nosheet.oe_form_nomargin > header { + margin: 0; +} .openerp .oe_form_sheetbg { padding: 16px 0; } @@ -2078,7 +2153,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); @@ -2513,7 +2588,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); @@ -2573,7 +2648,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); @@ -2596,7 +2671,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); @@ -2608,7 +2683,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); @@ -2620,7 +2695,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); @@ -2776,7 +2851,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); @@ -2813,8 +2888,8 @@ position: relative; } .openerp .oe_list_content th.oe_sortable div:after { - position: absolute; - right: 6px; + float: right; + margin-right: 6px; content: ""; margin-top: 7px; border-width: 0 4px 4px; @@ -2827,6 +2902,9 @@ filter: alpha(opacity=60); opacity: 0.6; } +.openerp .oe_list_content .oe_list_header_many2many_tags { + min-width: 70px; +} .openerp .oe_list_content th.sortdown div:after { border-bottom: none; border-left: 4px solid transparent; @@ -2870,7 +2948,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); @@ -3069,6 +3147,12 @@ div.ui-widget-overlay { border-radius: 3px; } +.openerp_ie .oe_form_field_boolean input { + background: white; +} +.openerp_ie .db_option_table .oe_form_field_selection { + width: auto; +} .openerp_ie input[type='checkbox'] { border: none; background: none; @@ -3128,8 +3212,65 @@ div.ui-widget-overlay { padding-top: 0; padding-bottom: 0; } -.openerp_ie .oe_form_field.oe_tags { - float: left; +.openerp_ie img { + border: none; +} +.openerp_ie .oe_dropdown_arrow { + line-height: 1.7em; +} +.openerp_ie .oe_form_buttons button, .openerp_ie .oe_view_manager_buttons button { + line-height: 1.7em; +} +.openerp_ie .oe_form_buttons .oe_highlight, .openerp_ie .oe_view_manager_buttons .oe_highlight { + line-height: 1.7em; +} +.openerp_ie .oe_topbar { + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#646060', endColorstr='#262626'); +} +.openerp_ie .ui-state-error, .openerp_ie .ui-widget-content .ui-state-error, .openerp_ie .ui-widget-header .ui-state-error { + filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); +} +.openerp_ie .oe_popup_form { + width: 99% !important; +} +.openerp_ie .oe_form_label { + white-space: normal !important; +} +.openerp_ie ul.oe_form_status li, .openerp_ie ul.oe_form_status_clickable li { + display: inline-block; + clear: both; +} +.openerp_ie ul.oe_form_status li:last-child, .openerp_ie ul.oe_form_status_clickable li:last-child { + overflow: hidden; + border-right: 1px solid #cacaca; +} +.openerp_ie ul.oe_form_status li:last-child .label, .openerp_ie ul.oe_form_status_clickable li:last-child .label { + padding-right: 14px; + border-right: none; +} +.openerp_ie ul.oe_form_status li:last-child .arrow, .openerp_ie ul.oe_form_status_clickable li:last-child .arrow { + display: inline-block; + opacity: 0; + filter: alpha(opacity=0); + border: none; + width: 0; + border-right: none; +} +.openerp_ie ul.oe_form_status .label, .openerp_ie ul.oe_form_status_clickable .label { + border-bottom: 1px solid #cacaca; + background: transparent; +} +.openerp_ie ul.oe_form_status .arrow span, .openerp_ie ul.oe_form_status_clickable .arrow span { + background-color: #fefefe !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; +} +.openerp_ie ul.oe_form_status li.oe_active .arrow span, .openerp_ie ul.oe_form_status_clickable li.oe_active .arrow span { + background-color: #729fcf !important; +} +.openerp_ie .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button { + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#EFEFEF', endColorstr='#D8D8D8'); } @media print { @@ -3172,3 +3313,7 @@ div.ui-widget-overlay { overflow: hidden !important; } } +.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 d5d0bd2d4f6..9ed551772f4 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 */ @@ -439,7 +439,7 @@ $sheet-padding: 16px .oe_button.oe_link @include reset() img - display: none + display: inline-block span @include reset() color: $link-color @@ -696,6 +696,15 @@ $sheet-padding: 16px margin-top: 1px background-color: #f6cf3b // }}} + // CrashManager {{{ + .oe_dialog_warning + width: 100% + p + text-align: center + .oe_dialog_icon + padding: 5px + width: 32px + // }}} // Login {{{ .oe_login background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAYAAAAGCAYAAADgzO9IAAAAKUlEQVQIHWO8e/fufwYsgAUkJigoiCIF5DMyoYggcUiXgNnBiGQKmAkARpcEQeriln4AAAAASUVORK5CYII=) @@ -827,6 +836,24 @@ $sheet-padding: 16px height: 32px background-color: #414141 @include vertical-gradient(#646060, #262626) + .oe_topbar_anonymous_login + background-color: #dc5f59 + color: #eeeeee + @include vertical-gradient(#FC8787, #800000) + a + display: block + padding: 5px 10px 7px + line-height: 20px + height: 20px + text-decoration: none + color: white + background: transparent + @include transition(all 0.2s ease-out) + a:hover + background: rgba(0,0,0,0.1) + color: white + text-shadow: 0px 0px 3px rgba(0,0,0,0.2) + @include box-shadow(0 1px 2px rgba(0,0,0,0.2) inset) .oe_topbar_item display: block padding: 5px 10px 7px @@ -940,16 +967,26 @@ $sheet-padding: 16px text-shadow: 0 1px 1px white padding-bottom: 16px a.oe_logo + position: relative width: 220px display: block text-align: center - height: 70px - line-height: 70px img - height: 40px - width: 157px margin: 14px 0 border: 0 + .oe_logo_edit + margin: 14px 0 + position: absolute + top: 1px + padding: 4px + width: 100% + display: none + text-align: center + color: #eee + background: rgba(37,37,37,0.9) + @include box-sizing(border) + &:hover .oe_logo_edit_admin + display: block .oe_footer position: fixed bottom: 0 @@ -958,13 +995,10 @@ $sheet-padding: 16px width: 220px text-align: center a - font-weight: 800 - font-family: serif - font-size: 16px + font-weight: bold color: black span color: #c81010 - font-style: italic // }}} // Webclient.leftbar items {{{ @@ -975,7 +1009,7 @@ $sheet-padding: 16px .oe_secondary_submenu padding: 2px 0 8px 0 margin: 0 - width: 100% + width: 220px display: inline-block li position: relative @@ -999,6 +1033,12 @@ $sheet-padding: 16px 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)) + .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) @@ -1046,6 +1086,10 @@ $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 {{{ @@ -1078,6 +1122,7 @@ $sheet-padding: 16px // ActionManager {{{ .oe_application width: 100% + height: 100% a color: $link-color &:hover @@ -1626,6 +1671,10 @@ $sheet-padding: 16px > header margin: -16px -16px 0 -16px padding: 0 + .oe_form_nosheet.oe_form_nomargin + margin: 0 + > header + margin: 0 .oe_form_sheetbg padding: 16px 0 .oe_form_sheet_width @@ -1675,7 +1724,7 @@ $sheet-padding: 16px width: 400px padding-bottom: 0 div.oe_chatter - box-sizing: border-box + box-sizing: border-box min-width: $sheet-min-width + 2* $sheet-padding max-width: $sheet-max-width + 2* $sheet-padding margin: 0 auto @@ -1947,7 +1996,7 @@ $sheet-padding: 16px overflow: hidden width: 24px overflow: hidden - background: transparent + background: transparent color: #7C7BAD box-shadow: none border: none @@ -2234,8 +2283,8 @@ $sheet-padding: 16px th.oe_sortable div position: relative th.oe_sortable div:after - position: absolute - right: 6px + float: right + margin-right: 6px content: "" margin-top: 7px border-width: 0 4px 4px @@ -2245,6 +2294,8 @@ $sheet-padding: 16px th.sortup div:after visibility: visible @include opacity(0.6) + .oe_list_header_many2many_tags + min-width: 70px th.sortdown div:after border-bottom: none border-left: 4px solid transparent @@ -2433,6 +2484,10 @@ div.ui-widget-overlay // Internet Explorer 9+ specifics {{{ .openerp_ie + .oe_form_field_boolean input + background: #fff + .db_option_table .oe_form_field_selection + width: auto input[type='checkbox'] border: none background: none @@ -2469,7 +2524,6 @@ div.ui-widget-overlay filter: none .oe_link filter: none - .oe_kanban_show_more clear: both text-align: center @@ -2483,9 +2537,56 @@ div.ui-widget-overlay .oe_sidebar button padding-top: 0 padding-bottom: 0 + img + border: none + //buttons. + .oe_dropdown_arrow + line-height: 1.7em + .oe_form_buttons, .oe_view_manager_buttons + button + line-height: 1.7em + .oe_highlight + line-height: 1.7em + .oe_topbar + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#646060', endColorstr='#262626') + .ui-state-error, .ui-widget-content .ui-state-error, .ui-widget-header .ui-state-error + filter: progid:DXImageTransform.Microsoft.gradient(enabled=false) + .oe_popup_form + width: 99% !important + .oe_form_label + white-space: normal !important + ul.oe_form_status, ul.oe_form_status_clickable + li + display: inline-block + clear: both + &:last-child + overflow: hidden + border-right: 1px solid #cacaca + .label + padding-right: 14px + border-right: none + .arrow + display: inline-block + opacity: 0 + filter: alpha(opacity = 0) + border: none + width: 0 + border-right: none + .label + border-bottom: 1px solid #cacaca + background: transparent + .arrow + span + background-color: #fefefe !important + li.oe_active + .label + border-bottom: 1px solid #729fcf + .arrow span + background-color: #729fcf !important - .oe_form_field.oe_tags - float: left + // jquery ui for ie + .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#EFEFEF', endColorstr='#D8D8D8') // }}} // @media print {{{ @@ -2523,5 +2624,9 @@ div.ui-widget-overlay overflow: hidden !important // }}} +.blockUI.blockOverlay + background-color: black + opacity: 0.6000000238418579 + // au BufWritePost,FileWritePost *.sass :!sass --style expanded --line-numbers <afile> > "%:p:r.css" // vim:tabstop=4:shiftwidth=4:softtabstop=4:fdm=marker: diff --git a/addons/web/static/src/css/full.css b/addons/web/static/src/css/full.css index 7f3a2f60ea4..2692792d46d 100644 --- a/addons/web/static/src/css/full.css +++ b/addons/web/static/src/css/full.css @@ -1,6 +1,12 @@ +/* This css contains the styling specific to the 'normal mode'. (as opposite to the embedded mode) */ +/* In embedded mode [1], this stylesheet won't be loaded. */ + +/* [1] The web client features an embedded mode in which the webclient */ +/* or a part of it can be started in any element of any webpage host. */ + body { padding: 0; margin: 0; overflow-y: scroll; height: 100%; -}
\ No newline at end of file +} |
