From ed7551a2490c5a62e87cc316e614e5c211f57dbb Mon Sep 17 00:00:00 2001 From: =?utf8?q?Aleksander=20=C5=81ukasz?= Date: Fri, 28 Jun 2013 10:36:51 +0200 Subject: [PATCH] Removing bullet/enum from list item containing nested list --- modules/documentCanvas/canvas.js | 2 +- modules/documentCanvas/nodes.less | 8 ++++++++ modules/documentCanvas/tests/canvas.test.js | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/modules/documentCanvas/canvas.js b/modules/documentCanvas/canvas.js index 9177968..7d75e9e 100644 --- a/modules/documentCanvas/canvas.js +++ b/modules/documentCanvas/canvas.js @@ -166,7 +166,7 @@ Canvas.prototype.listCreate = function(options) { var toret; if(parentNode && parentNode.isOfClass('list-items')) { - list.wrap('
'); + list.wrap('
'); toret = list.parent(); } else { toret = list; diff --git a/modules/documentCanvas/nodes.less b/modules/documentCanvas/nodes.less index af084a7..4e6a817 100644 --- a/modules/documentCanvas/nodes.less +++ b/modules/documentCanvas/nodes.less @@ -98,6 +98,14 @@ span[wlxml-tag] { } } +.canvas-silent-item { + display: block !important; + counter-increment: none !important; + &:before { + content: normal !important; + } +} + [wlxml-class="table"] { display: table; diff --git a/modules/documentCanvas/tests/canvas.test.js b/modules/documentCanvas/tests/canvas.test.js index 57fb308..d336192 100644 --- a/modules/documentCanvas/tests/canvas.test.js +++ b/modules/documentCanvas/tests/canvas.test.js @@ -205,7 +205,7 @@ define([ assertDomEqual(c.getContent(), utils.cleanUp('\
\
alice
\ -
\ +
\
\
cat
\
dog
\ -- 2.20.1