diff options
| author | Fabien Meghazi <fme@openerp.com> | 2013-12-03 14:51:56 +0100 |
|---|---|---|
| committer | Fabien Meghazi <fme@openerp.com> | 2013-12-03 14:51:56 +0100 |
| commit | 9a3eb7963601e019aa02a0e8628984f445a8cebb (patch) | |
| tree | c6385f8c28551d7a8bf00fa6c49986816155345c /addons/website/static/src | |
| parent | 0d79c96ad69badf4585764b566795c8bc570645c (diff) | |
[FIX] new fa icons for menu
bzr revid: fme@openerp.com-20131203135156-vflspcfkitv667wv
Diffstat (limited to 'addons/website/static/src')
| -rw-r--r-- | addons/website/static/src/css/editor.css | 5 | ||||
| -rw-r--r-- | addons/website/static/src/css/editor.sass | 4 | ||||
| -rw-r--r-- | addons/website/static/src/xml/website.menu.xml | 12 |
3 files changed, 11 insertions, 10 deletions
diff --git a/addons/website/static/src/css/editor.css b/addons/website/static/src/css/editor.css index f8034b52c49..c2ac33008ef 100644 --- a/addons/website/static/src/css/editor.css +++ b/addons/website/static/src/css/editor.css @@ -1,3 +1,4 @@ +@charset "utf-8"; /* ---- CKEditor Minimal Reset ---- */ .navbar.navbar-inverse .cke_chrome { border: none; @@ -150,10 +151,10 @@ div.oe_menu_buttons { right: -8px; } -ul.oe_menu_editor .icon-home { +ul.oe_menu_editor .fa-home { display: none; } -ul.oe_menu_editor > li:first-child > div > span > .icon-home { +ul.oe_menu_editor > li:first-child > div > span > .fa-home { display: block; } ul.oe_menu_editor .oe_menu_placeholder { diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass index cb0876d4212..b44b7c6a4e9 100644 --- a/addons/website/static/src/css/editor.sass +++ b/addons/website/static/src/css/editor.sass @@ -120,9 +120,9 @@ div.oe_menu_buttons right: -8px ul.oe_menu_editor - .icon-home + .fa-home display: none - > li:first-child > div > span > .icon-home + > li:first-child > div > span > .fa-home display: block .oe_menu_placeholder outline: 1px dashed #4183C4 diff --git a/addons/website/static/src/xml/website.menu.xml b/addons/website/static/src/xml/website.menu.xml index 2276076550a..9277b0d4bc2 100644 --- a/addons/website/static/src/xml/website.menu.xml +++ b/addons/website/static/src/xml/website.menu.xml @@ -2,16 +2,16 @@ <t t-name="website.menu.dialog.submenu"> <li t-att-data-menu-id="submenu.id"> <div class="input-group"> - <span class="input-group-addon icon-reorder"/> + <span class="input-group-addon fa fa-bars"/> <span class="form-control" style="padding-top: 0; padding-bottom: 0;"> <span class="js_menu_label"> <t t-esc="submenu.name"/> </span> - <i class="pull-right icon-home" style="margin-top: 3px"/> + <i class="pull-right fa fa-home" style="margin-top: 3px"/> </span> <span class="input-group-btn"> - <button type="button" class="btn btn-primary js_edit_menu icon-edit"/> - <button type="button" class="btn btn-danger js_delete_menu icon-trash"/> + <button type="button" class="btn btn-primary js_edit_menu fa fa-edit"/> + <button type="button" class="btn btn-danger js_delete_menu fa fa-trash-o"/> </span> </div> <t t-set="children" t-value="submenu.children"/> @@ -32,11 +32,11 @@ </ul> <div class="mt16"> <div class="pull-right text-muted"> - <span class="icon-indent-right"/> right indent for multi-level menus + <span class="fa fa-indent"/> right indent for multi-level menus </div> <div> <a href="#" class="js_add_menu"> - <i class="icon-plus-sign"/> Add Menu Entry + <i class="fa fa-plus-circle"/> Add Menu Entry </a> </div> </div> |
