[IMP] merge Format and Styles dropdowns

bzr revid: xmo@openerp.com-20130904131745-ro5c0c7myvyv98xw
This commit is contained in:
Xavier Morel
2013-09-04 15:17:45 +02:00
parent 4932521377
commit b56cd5e2be
+10 -1
View File
@@ -291,11 +291,20 @@
"Image", "Table"
]},{
name: 'styles', items: [
"Format", "Styles"
"Styles"
]}
],
// styles dropdown in toolbar
stylesSet: [
{name: "Normal", element: 'p'},
{name: "Heading 1", element: 'h1'},
{name: "Heading 2", element: 'h2'},
{name: "Heading 3", element: 'h3'},
{name: "Heading 4", element: 'h4'},
{name: "Heading 5", element: 'h5'},
{name: "Heading 6", element: 'h6'},
{name: "Formatted", element: 'pre'},
{name: "Address", element: 'address'},
// emphasis
{name: "Muted", element: 'span', attributes: {'class': 'text-muted'}},
{name: "Primary", element: 'span', attributes: {'class': 'text-primary'}},