diff options
| author | Christophe Simonis <chs@odoo.com> | 2015-04-17 15:33:00 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2015-04-17 15:33:00 +0200 |
| commit | a9471c43b952a1b3ecd92dcbcc0719723336acf1 (patch) | |
| tree | a26c7f3ddb72af3d75483b20ddf6de2faaf4eb6c /addons/web/static/src/css | |
| parent | ae1583e086f70138332d2342c360d185e7b0a916 (diff) | |
| parent | e941c0f77c868c89273ebf9897414e2930496e48 (diff) | |
[MERGE] forward port of branch saas-6 up to e941c0f
Diffstat (limited to 'addons/web/static/src/css')
| -rw-r--r-- | addons/web/static/src/css/base.css | 7 | ||||
| -rw-r--r-- | addons/web/static/src/css/base.sass | 5 | ||||
| -rw-r--r-- | addons/web/static/src/css/ie.css | 32 |
3 files changed, 44 insertions, 0 deletions
diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 3a208e353ce..8ef5ec07fbb 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -2327,6 +2327,9 @@ .openerp .oe_form .oe_form_field_one2many > .oe_view_manager .oe_list_pager_single_page { display: none; } +.openerp .oe_form .oe_form_field_one2many > .oe-view-manager .oe_list_pager { + float: right; +} .openerp .oe_form_field_one2many > .oe_view_manager .oe_list_pager_single_page, .openerp .oe_form_field_many2many > .oe_view_manager .oe_list_pager_single_page { display: none !important; } @@ -2581,6 +2584,10 @@ filter: alpha(opacity=50); opacity: 0.5; } +.openerp .oe_list_content > tbody > tr > td.oe_list_field_boolean input:-moz-read-only { + filter: alpha(opacity=100); + opacity: 1; +} .openerp .oe_list_content > tbody > tr:nth-child(odd) { background-color: #f0f0fa; background-color: #efeff8; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 97e22f3d042..7ab0e150637 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1912,6 +1912,9 @@ $sheet-padding: 16px .oe_form .oe_form_field_one2many > .oe_view_manager .oe_list_pager_single_page display: none + .oe_form .oe_form_field_one2many > .oe-view-manager + .oe_list_pager + float: right .oe_form_field_one2many,.oe_form_field_many2many // TODO: oe_form_field_one2many_list? > .oe_view_manager @@ -2121,6 +2124,8 @@ $sheet-padding: 16px border-width: 0 > td.oe_list_field_boolean input @include opacity() + > td.oe_list_field_boolean input:-moz-read-only + @include opacity(1.0) > tr:nth-child(odd) background-color: #f0f0fa @include vertical-gradient(#f0f0fa, #eeeef6) diff --git a/addons/web/static/src/css/ie.css b/addons/web/static/src/css/ie.css new file mode 100644 index 00000000000..f628ed1213d --- /dev/null +++ b/addons/web/static/src/css/ie.css @@ -0,0 +1,32 @@ +/** base */ +.openerp .oe_form label + .oe_form_field.oe_form_field_one2many { + display: block; +} +.openerp .oe_leftbar > div > div > div > div.oe_secondary_menus_container { + position: static; +} +.openerp .oe_application > div > .oe_view_manager > .oe_view_manager_wrapper > div > .oe_view_manager_body { + position: static; +} + +/** web_calendar */ +.fc .ui-draggable-dragging .fc-event-bg, /* TODO: something nicer like .fc-opacity */ +.fc-select-helper .fc-event-bg { + display: none; /* for IE6/7/8. nested opacity filters while dragging don't work */ +} + +/** web_graph */ +.openerp svg:not(:root) { /* width and height are not take in consideration */ + overflow: visible; +} +.graph_main_content.graph_chart_mode > div > svg { + min-height: 521px; +} + +/** web_kanban */ +:root .openerp .oe_kanban_view .oe_kanban_group_title_vertical { + writing-mode: lr-tb; +} +.openerp .oe_kanban_column_cards { + min-height: 80px; +} |
