diff options
| author | Antony Lesuisse <al@openerp.com> | 2012-07-23 19:43:41 +0200 |
|---|---|---|
| committer | Antony Lesuisse <al@openerp.com> | 2012-07-23 19:43:41 +0200 |
| commit | 6f9fbb5d7a9645107eabed87147292b9f4c544f8 (patch) | |
| tree | 59b92cc0808d6a1c1775fc5d76bfc2374601d024 /addons/web/static/src/css | |
| parent | 04c5130c8d60a0fe42de43ca114c8eeaf210885b (diff) | |
| parent | 07fb6d88b9c0ca87545735c83afc8f271db090dd (diff) | |
[MERGE] overlay editable list a la rache
bzr revid: al@openerp.com-20120723174341-byh5ep8pg15kpeg9
Diffstat (limited to 'addons/web/static/src/css')
| -rw-r--r-- | addons/web/static/src/css/base.css | 41 | ||||
| -rw-r--r-- | addons/web/static/src/css/base.sass | 31 |
2 files changed, 63 insertions, 9 deletions
diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 0a3d24d41f4..2e26de30d5f 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -2180,9 +2180,33 @@ height: auto; line-height: 16px; } +.openerp .oe_form_field_one2many .oe_list_buttons.oe_editing .oe_list_save { + visibility: hidden; +} .openerp .oe_form .oe_form_field_many2many > .oe_list .oe_list_pager_single_page { display: none; } +.openerp .oe_list_buttons .oe_list_save, .openerp .oe_list_buttons .oe_list_discard { + display: none; +} +.openerp .oe_list_buttons.oe_editing .oe_list_add, .openerp .oe_list_buttons.oe_editing .oe_list_button_import { + display: none; +} +.openerp .oe_list_buttons.oe_editing .oe_list_save { + display: inline-block; +} +.openerp .oe_list_buttons.oe_editing .oe_list_discard { + display: inline; +} +.openerp .oe_list { + position: relative; +} +.openerp .oe_list .oe_form .oe_form_field { + width: auto; + position: absolute; + margin: 0 !important; + padding: 0; +} .openerp .oe_list_content { width: 100%; } @@ -2240,6 +2264,7 @@ } .openerp .oe_list_content > tbody > tr > td.oe_list_field_cell { padding: 3px 6px; + white-space: pre-line; } .openerp .oe_list_content > tbody > tr > td.oe_list_field_cell progress { width: 100%; @@ -2290,9 +2315,6 @@ .openerp .oe_list_content .numeric input { text-align: right; } -.openerp .oe_list_content .oe_list_edit_row_save:before { - content: "S"; -} .openerp .oe_trad_field.touched { border: 1px solid green !important; } @@ -2419,6 +2441,19 @@ .kitten-mode-activated > * { opacity: 0.7; } +.kitten-mode-activated .oe_footer a { + background-image: url(http://www.risacher.com/la-rache/zfiles/la-rache.png); + font-size: 1px; + letter-spacing: -1px; + color: transparent; + display: inline-block; + height: 15px; + width: 80px; + vertical-align: top; +} +.kitten-mode-activated .oe_footer a span { + display: none; +} div.ui-widget-overlay { background: black; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index fb67945a02d..c4314923867 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -92,9 +92,8 @@ $sheet-max-width: 860px letter-spacing: -1px color: transparent &:before - font-family: "mnmliconsRegular" + font: 21px "mnmliconsRegular" content: $icon-name - font-size: 20px color: $color // }}} @@ -1721,6 +1720,9 @@ $sheet-max-width: 860px li height: auto line-height: 16px + .oe_list_buttons.oe_editing .oe_list_save + // keep "save row" button hidden in o2m + visibility: hidden // }}} // FormView.many2many {{{ .oe_form .oe_form_field_many2many > .oe_list @@ -1728,6 +1730,25 @@ $sheet-max-width: 860px display: none // }}} // ListView {{{ + .oe_list_buttons + .oe_list_save, .oe_list_discard + display: none + &.oe_editing + .oe_list_add, .oe_list_button_import + display: none + .oe_list_save + display: inline-block + .oe_list_discard + display: inline + + .oe_list + position: relative + .oe_form .oe_form_field + width: auto + position: absolute + margin: 0 !important // dammit + padding: 0 + .oe_list_content width: 100% td:first-child, th:first-child @@ -1771,8 +1792,7 @@ $sheet-max-width: 860px border-top: 1px solid #ddd > td.oe_list_field_cell padding: 3px 6px - progress - width: 100% + white-space: pre-line > td, > th > button border: none @@ -1800,8 +1820,6 @@ $sheet-max-width: 860px width: 82px input text-align: right - .oe_list_edit_row_save:before - content: "S" // }}} // Translation {{{ .oe_trad_field.touched @@ -1910,6 +1928,7 @@ $sheet-max-width: 860px background-attachment: fixed >* opacity: 0.70 + // }}} div.ui-widget-overlay |
