diff options
| author | Fabien Meghazi <fme@openerp.com> | 2012-12-12 22:26:17 +0100 |
|---|---|---|
| committer | Fabien Meghazi <fme@openerp.com> | 2012-12-12 22:26:17 +0100 |
| commit | 141f32f878387c764af8d5a8bf916a8587ecd8ad (patch) | |
| tree | 48726096fa68646f6dee4ef1969a8e92cde3f21d /addons/web/static/src/css | |
| parent | 3069f5ffbb816e150d886ce73512547ec0109c14 (diff) | |
| parent | bc038c36dbe676fb12f394ad86281e127f1a762d (diff) | |
[MERGE] Internet Explorer specific css
bzr revid: fme@openerp.com-20121212212617-cnvnwun9vqax82to
Diffstat (limited to 'addons/web/static/src/css')
| -rw-r--r-- | addons/web/static/src/css/base.css | 77 | ||||
| -rw-r--r-- | addons/web/static/src/css/base.sass | 67 |
2 files changed, 140 insertions, 4 deletions
diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 6daf4ba9707..ee0fe56e35b 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -43,6 +43,10 @@ color: #afafb6 !important; font-style: italic !important; } +.openerp :-ms-input-placeholder { + color: #afafb6 !important; + font-style: italic !important; +} .openerp a { text-decoration: none; cursor: pointer !important; @@ -1328,12 +1332,14 @@ height: 100%; } .openerp .oe_application .oe_breadcrumb_item:not(:last-child) { - display: inline-block; max-width: 7em; white-space: nowrap; - overflow: hidden; text-overflow: ellipsis; } +.openerp .oe_application .oe_breadcrumb_title > * { + display: inline-block; + overflow: hidden; +} .openerp .oe_view_manager .oe_view_manager_body { height: inherit; } @@ -1341,6 +1347,7 @@ height: inherit; } .openerp .oe_view_manager table.oe_view_manager_header { + border-collapse: separate; width: 100%; table-layout: fixed; } @@ -2544,6 +2551,7 @@ background: -moz-linear-gradient(135deg, #dedede, #fcfcfc); background: -o-linear-gradient(135deg, #fcfcfc, #dedede); background: -webkit-gradient(linear, left top, right bottom, from(#fcfcfc), to(#dedede)); + background: -ms-linear-gradient(top, #fcfcfc, #dedede); -moz-border-radius: 3px; -webkit-border-radius: 3px; border-radius: 3px; @@ -2567,6 +2575,7 @@ background: -moz-linear-gradient(135deg, #3465a4, #729fcf); background: -o-linear-gradient(135deg, #729fcf, #3465a4); background: -webkit-gradient(linear, left top, right bottom, from(#729fcf), to(#3465a4)); + background: -ms-linear-gradient(top, #729fcf, #3465a4); } .openerp ul.oe_form_status li.oe_active .label, .openerp ul.oe_form_status_clickable li.oe_active .label { color: white; @@ -2616,6 +2625,7 @@ background: -moz-linear-gradient(135deg, #284d7d, #4c85c2); background: -o-linear-gradient(135deg, #4c85c2, #284d7d); background: -webkit-gradient(linear, left top, right bottom, from(#4c85c2), to(#284d7d)); + background: -ms-linear-gradient(top, #4c85c2, #284d7d); } .openerp .oe_form .oe_form_field_one2many > .oe_view_manager .oe_list_pager_single_page { display: none; @@ -3048,6 +3058,69 @@ div.ui-widget-overlay { border-radius: 3px; } +.openerp_ie input[type='checkbox'] { + border: none; + background: none; + box-shadow: none; +} +.openerp_ie .oe_logo img { + border: none; +} +.openerp_ie .oe_header_row button.oe_highlight { + padding-top: 0; + padding-bottom: 0; +} +.openerp_ie .oe_view_manager_buttons button.oe_write_full { + padding-top: 0; + padding-bottom: 0; +} +.openerp_ie .oe_view_manager_buttons button.oe_highlight { + padding-top: 0; + padding-bottom: 0; +} +.openerp_ie .oe_view_manager_buttons button .oe_form_button_edit { + padding-top: 0; + padding-bottom: 0; +} +.openerp_ie .oe_view_manager_buttons button .oe_form_button_create { + padding-top: 0; + padding-bottom: 0; +} +.openerp_ie .oe_kanban_image { + border: none; +} +.openerp_ie .oe_msg_icon { + border: none; +} +.openerp_ie .oe_form header ul { + height: 29px; +} +.openerp_ie .oe_attach { + filter: none; +} +.openerp_ie .oe_link { + filter: none; +} +.openerp_ie .oe_kanban_show_more { + clear: both; + text-align: center; +} +.openerp_ie.oe_kanban_grouped .oe_kanban_show_more .oe_button { + width: 100%; + padding: 3px 12px; +} +.openerp_ie .oe_form_buttons button { + padding-top: 0; + padding-bottom: 0; +} +.openerp_ie .oe_sidebar button { + padding-top: 0; + padding-bottom: 0; +} +.openerp_ie .oe_form_field.oe_tags { + float: left; +} + @media print { .openerp { text-shadow: none; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index d30e8935a0c..f6df43394c9 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -95,6 +95,7 @@ $sheet-padding: 16px background: -moz-linear-gradient(135deg, $endColor, $startColor) background: -o-linear-gradient(135deg, $startColor, $endColor) background: -webkit-gradient(linear, left top, right bottom, from($startColor), to($endColor)) + background: -ms-linear-gradient(top, $startColor, $endColor) /* IE10 */ @mixin transform($transform) -webkit-transform: $transform @@ -159,6 +160,9 @@ $sheet-padding: 16px \::-webkit-input-placeholder color: $tag-border !important font-style: italic !important + \:-ms-input-placeholder + color: $tag-border !important + font-style: italic !important //}}} // Tag reset {{{ a @@ -1074,11 +1078,12 @@ $sheet-padding: 16px > div height: 100% .oe_breadcrumb_item:not(:last-child) - display: inline-block max-width: 7em white-space: nowrap - overflow: hidden text-overflow: ellipsis + .oe_breadcrumb_title > * + display: inline-block + overflow: hidden // }}} // ViewManager common {{{ .oe_view_manager @@ -1088,6 +1093,7 @@ $sheet-padding: 16px height: inherit table.oe_view_manager_header + border-collapse: separate width: 100% table-layout: fixed .oe_header_row @@ -2416,6 +2422,63 @@ div.ui-widget-overlay @include radius(3px) // }}} +// Internet Explorer 9+ specifics {{{ +.openerp_ie + input[type='checkbox'] + border: none + background: none + box-shadow: none + .oe_logo + img + border: none + .oe_header_row + button.oe_highlight + padding-top: 0 + padding-bottom: 0 + .oe_view_manager_buttons + button.oe_write_full + padding-top: 0 + padding-bottom: 0 + button.oe_highlight + padding-top: 0 + padding-bottom: 0 + button .oe_form_button_edit + padding-top: 0 + padding-bottom: 0 + button .oe_form_button_create + padding-top: 0 + padding-bottom: 0 + .oe_kanban_image + border: none + .oe_msg_icon + border: none + .oe_form + header + ul + height: 29px + .oe_attach + filter: none + .oe_link + filter: none + + .oe_kanban_show_more + clear: both + text-align: center + &.oe_kanban_grouped .oe_kanban_show_more .oe_button + width: 100% + padding: 3px 12px + + .oe_form_buttons button + padding-top: 0 + padding-bottom: 0 + .oe_sidebar button + padding-top: 0 + padding-bottom: 0 + + .oe_form_field.oe_tags + float: left +// }}} + // @media print {{{ @media print .openerp |
