diff options
| author | Yannick Tivisse <yti@odoo.com> | 2015-01-20 14:13:19 +0100 |
|---|---|---|
| committer | Yannick Tivisse <yti@odoo.com> | 2015-01-21 16:11:26 +0100 |
| commit | 9207c4645a639bcd67ac3aa27ac1bda22d063638 (patch) | |
| tree | 05bd77b27c03d34dcae14e342126fc5d8ad6abae /addons/note | |
| parent | b96087496022b9ffaf6cf95eaac4752d389182b5 (diff) | |
[IMP] Replace all oe_e class by fontawesome + remove entyporegular library
Diffstat (limited to 'addons/note')
| -rw-r--r-- | addons/note/note_view.xml | 23 | ||||
| -rw-r--r-- | addons/note/static/src/css/note.css | 11 | ||||
| -rw-r--r-- | addons/note/static/src/css/note.sass | 3 |
3 files changed, 21 insertions, 16 deletions
diff --git a/addons/note/note_view.xml b/addons/note/note_view.xml index bd3b6e7767c..47cb89097a8 100644 --- a/addons/note/note_view.xml +++ b/addons/note/note_view.xml @@ -57,21 +57,18 @@ <t t-set="record.group_fancy" t-value="1" groups="note.group_note_fancy"/> <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_global_click_edit oe_semantic_html_override oe_kanban_card #{record.group_fancy==1 ? 'oe_kanban_card_fancy' : ''}"> - <div class="oe_dropdown_kanban"> - + <div class="oe_dropdown_kanban oe_dropdown_toggle"> <!-- dropdown menu --> - <span class="oe_dropdown_toggle"> - <span class="oe_e">i</span> - <ul class="oe_dropdown_menu"> - <li><a type="delete">Delete</a></li> - <li><ul class="oe_kanban_colorpicker" data-field="color"/></li> - </ul> - </span> - <div style="display: inline"> - <a name="onclick_note_is_done" type="object" t-if="record.open.raw_value" class="oe_e">W</a> - <a name="onclick_note_not_done" type="object" t-if="!record.open.raw_value" class="oe_e">W</a> - </div> + <i class="fa fa-bars fa-lg"/> + <ul class="oe_dropdown_menu"> + <li><a type="delete">Delete</a></li> + <li><ul class="oe_kanban_colorpicker" data-field="color"/></li> + </ul> </div> + <div style="display: inline" class="oe_dropdown_kanban"> + <a name="onclick_note_is_done" type="object" t-if="record.open.raw_value"><i class="fa fa-check"/></a> + <a name="onclick_note_not_done" type="object" t-if="!record.open.raw_value"><i class="fa fa-check"/></a> + </div> <!-- kanban note --> <div t-attf-class="oe_kanban_content #{record.open.raw_value ? '' : 'note_text_line_through'}"> <!-- title --> diff --git a/addons/note/static/src/css/note.css b/addons/note/static/src/css/note.css index fe9c8510e7d..4abd5f395b1 100644 --- a/addons/note/static/src/css/note.css +++ b/addons/note/static/src/css/note.css @@ -2,15 +2,16 @@ .oe_kanban_column .note_text_line_through { text-decoration: line-through; } + +.openerp .oe_form .oe_pad.oe_memo { + width: auto; +} .openerp .oe_form .oe_form_field.oe_memo { margin: 0; padding: 0px; width: 100%; min-height: 200px; } -.openerp .oe_form .oe_pad.oe_memo { - width: auto; -} .openerp .oe_form .oe_form_field.oe_memo .cleditorMain { border: none; padding: 0px; @@ -61,6 +62,10 @@ -ms-transition: all 300ms cubic-bezier(0.5, 0, 0.5, 1); transition: all 300ms cubic-bezier(0.5, 0, 0.5, 1); } +.openerp .oe_kanban_record .oe_kanban_card_fancy .fa { + margin-top: 8px; + margin-right: 6px; +} .openerp .oe_kanban_record:nth-of-type(even) .oe_kanban_card_fancy { -webkit-transform: rotate(1deg); -o-transform: rotate(1deg); diff --git a/addons/note/static/src/css/note.sass b/addons/note/static/src/css/note.sass index 6fa76b32d43..69285cfd606 100644 --- a/addons/note/static/src/css/note.sass +++ b/addons/note/static/src/css/note.sass @@ -59,6 +59,9 @@ margin-bottom: 10px @include rotate(-2deg) @include transition(all, 300ms) + .fa + margin-top: 8px + margin-right: 6px .oe_kanban_record:nth-of-type(even) .oe_kanban_card_fancy @include rotate(1deg) |