diff options
| author | Fabien Meghazi <fme@openerp.com> | 2012-05-23 17:09:50 +0200 |
|---|---|---|
| committer | Fabien Meghazi <fme@openerp.com> | 2012-05-23 17:09:50 +0200 |
| commit | 888d3cedcfc1a9a3a06faa8379050963821c25c2 (patch) | |
| tree | 9d0db2a1c40334e86239eb47c83ce80b1aa97fcf /addons/web/static/src/css | |
| parent | 13e782908b6a448a61ad4091d62f4c4e478d82a6 (diff) | |
| parent | 4f4e48c96fe40f543e33dedf1bc16fcdf4f93ab2 (diff) | |
[MERGE] Merge perfect views
bzr revid: fme@openerp.com-20120523150950-ncef6xvpn9b21s2h
Diffstat (limited to 'addons/web/static/src/css')
| -rw-r--r-- | addons/web/static/src/css/base.css | 55 | ||||
| -rw-r--r-- | addons/web/static/src/css/base.sass | 50 |
2 files changed, 1 insertions, 104 deletions
diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index f2fcc9abf33..1f4f8c2ddd2 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"); @@ -2031,59 +2031,6 @@ .openerp .oe-listview-content .numeric input { text-align: right; } -.openerp .oe_kanban_group_title { - margin: 1px 1px 4px; - font-size: 15px; - font-weight: bold; - text-shadow: 0 1px 0 white; -} -.openerp .oe_kanban_column, .openerp .oe_kanban_group_header { - width: 240px; - vertical-align: top; - padding: 6px 7px 6px 6px; - background: #f0eeee; - border-left: 1px solid #f0f8f8; - border-right: 1px solid #b9b9b9; -} -.openerp .oe_kanban_record { - position: relative; - display: block; - min-height: 50px; - margin: 6px 0; - display: block; - -moz-border-radius: 4px; - -webkit-border-radius: 4px; - border-radius: 4px; -} -.openerp .oe_kanban_record:last-child { - margin-bottom: 0; -} -.openerp .oe_kanban_record .oe_kanban_title { - font-weight: bold; - margin: 2px 4px; -} -.openerp .oe_kanban_gravatar { - width: 20px; - height: 20px; - -moz-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius: 3px; - -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2); - -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2); - -box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2); -} -.openerp .oe_kanban_avatar_toto { - height: 40px; - width: 40px; - border: 1px solid; - border-color: #e5e5e5 #dbdbdb #d2d2d2; - -moz-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius: 3px; - -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2); - -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2); - -box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2); -} .openerp .oe_trad_field.touched { border: 1px solid green !important; } diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 3dcde9c9f70..aa77aca7287 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -863,18 +863,6 @@ $colour4: #8a89ba content: "k" .oe_vm_switch_diagram:after content: "f" - //.oe_vm_switch_list:after, .oe_vm_switch_tree:after - //content: "ö" - //.oe_vm_switch_graph:after - //content: "ó" - //.oe_vm_switch_gantt:after - //content: "y" - //.oe_vm_switch_calendar:after - //content: "b" - //.oe_vm_switch_kanban:after - //content: "ó" - //.oe_vm_switch_diagram:after - //content: "}" // }}} // ViewManager.sidebar {{{ .oe_form_dropdown_section @@ -1682,44 +1670,6 @@ $colour4: #8a89ba input text-align: right // }}} - // KanbanView {{{ - .oe_kanban_group_title - margin: 1px 1px 4px - font-size: 15px - font-weight: bold - text-shadow: 0 1px 0 white - .oe_kanban_column, .oe_kanban_group_header - width: 240px - vertical-align: top - padding: 6px 7px 6px 6px - background: #f0eeee - border-left: 1px solid #f0f8f8 - border-right: 1px solid #b9b9b9 - .oe_kanban_record - position: relative - display: block - min-height: 50px - margin: 6px 0 - display: block - @include radius(4px) - &:last-child - margin-bottom: 0 - .oe_kanban_title - font-weight: bold - margin: 2px 4px - .oe_kanban_gravatar - width: 20px - height: 20px - @include radius(3px) - @include box-shadow(0 1px 2px rgba(0,0,0,0.2)) - .oe_kanban_avatar_toto - height: 40px - width: 40px - border: 1px solid - border-color: #e5e5e5 #dbdbdb #d2d2d2 - @include radius(3px) - @include box-shadow(0 1px 2px rgba(0,0,0,0.2)) - // }}} // Translation {{{ .oe_trad_field.touched border: 1px solid green !important |
