pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] new fa icons for menu

Browse Source 
bzr revid: fme@openerp.com-20131203135156-vflspcfkitv667wv
This commit is contained in:
Fabien Meghazi
2013-12-03 14:51:56 +01:00
parent 0d79c96ad6
commit 9a3eb79636
3 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/website/static/src/css/editor.css
+3 -2
View File
@@ -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 {
addons/website/static/src/css/editor.sass
+2 -2
View File
@@ -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
addons/website/static/src/xml/website.menu.xml
+6 -6
View File
@@ -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>