diff options
| author | Quentin (OpenERP) <qdp-launchpad@openerp.com> | 2014-03-26 16:27:51 +0100 |
|---|---|---|
| committer | Quentin (OpenERP) <qdp-launchpad@openerp.com> | 2014-03-26 16:27:51 +0100 |
| commit | e0b27b4ee8e2d26eeae98a4dbc69a3485f39a8a8 (patch) | |
| tree | a3887e48d1bdeaf27b04c5c4e636e677b9e1c586 /addons/website/static/src/css/editor.sass | |
| parent | 78457a17ea7175c02baf823c296b5cefe1a52a03 (diff) | |
| parent | 0d4d9af5f4b7ca695e33af370848350b437c132e (diff) | |
[MERGE] merged trunk up to revision 9251
bzr revid: qdp-launchpad@openerp.com-20140326152751-b6bo0fawrzmd71f0
Diffstat (limited to 'addons/website/static/src/css/editor.sass')
| -rw-r--r-- | addons/website/static/src/css/editor.sass | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass index 2e6513f7c1d..4571dcd257e 100644 --- a/addons/website/static/src/css/editor.sass +++ b/addons/website/static/src/css/editor.sass @@ -23,6 +23,7 @@ background: transparent border: none +box-shadow(none) + -ms-filter: "alpha(opacity=50)" // }}} @@ -210,9 +211,27 @@ ul.oe_menu_editor .font-icons-selected background-color: #ddd +$attachment-border-color: #848490 +.existing-attachments + .pager .disabled + display: none -.existing-attachments .pager .disabled - display: none + .existing-attachment-cell + position: relative + .img + border: 1px solid $attachment-border-color + .existing-attachment-remove + position: absolute + top: 0 + left: 15px // padding-left on col-* + + cursor: pointer + background: white + padding: 2px + border: 1px solid $attachment-border-color + border-top: none + border-left: none + +border-bottom-right-radius(8px) // wrapper positioned relatively for drag&drop widget which is disabled below. // Breaks completely horribly crazy products listing page, so take it out. |