diff --git a/lesscpy/plib/block.py b/lesscpy/plib/block.py index 65adc39..9966bb9 100644 --- a/lesscpy/plib/block.py +++ b/lesscpy/plib/block.py @@ -74,9 +74,11 @@ class Block(Node): inner = ''.join([p.fmt(fills) for p in self.inner]) inner = inner.replace(fills['nl'], fills['nl'] + fills['tab']).rstrip(fills['tab']) + if not fills['nl']: + inner = inner.strip() fills.update({ 'identifier': name, - 'proplist': fills['tab'] + inner, + 'proplist': fills['tab'] + inner }) out.append(f % fills) else: diff --git a/lesscpy/test/css/issues/issue4.min.css b/lesscpy/test/css/issues/issue4.min.css index 2d8ba71..41a3e2d 100644 --- a/lesscpy/test/css/issues/issue4.min.css +++ b/lesscpy/test/css/issues/issue4.min.css @@ -1,2 +1 @@ -@media print{.mixin{color:red;} -} \ No newline at end of file +@media print{.mixin{color:red;}} diff --git a/lesscpy/test/css/keyframes.min.css b/lesscpy/test/css/keyframes.min.css index e029dd3..f5529d2 100644 --- a/lesscpy/test/css/keyframes.min.css +++ b/lesscpy/test/css/keyframes.min.css @@ -1,9 +1,6 @@ @-webkit-keyframes progress-bar-stripes{from{background-position:0 0;} -to{background-position:40px 0;} -} +to{background-position:40px 0;}} @-moz-keyframes progress-bar-stripes{from{background-position:0 0;} -to{background-position:40px 0;} -} +to{background-position:40px 0;}} @keyframes progress-bar-stripes{from{background-position:0 0;} -to{background-position:40px 0;} -} +to{background-position:40px 0;}} diff --git a/lesscpy/test/css/media.min.css b/lesscpy/test/css/media.min.css index f7c9a83..3b68ecb 100644 --- a/lesscpy/test/css/media.min.css +++ b/lesscpy/test/css/media.min.css @@ -1,11 +1,7 @@ @media screen,projection{html{background:#fffef0;color:#330000;} -body{max-width:35em;margin:0 auto;} -} +body{max-width:35em;margin:0 auto;}} @media print{.class{color:blue;} .class .sub{width:42;} -.top,header>h1{color:#444444;} -} -@media screen{body{max-width:480;} -} -@media all and (orientation:portrait){aside{float:none;} -} +.top,header>h1{color:#444444;}} +@media screen{body{max-width:480;}} +@media all and (orientation:portrait){aside{float:none;}} diff --git a/lesscpy/test/css/ws.min.css b/lesscpy/test/css/ws.min.css index 5087239..130df94 100644 --- a/lesscpy/test/css/ws.min.css +++ b/lesscpy/test/css/ws.min.css @@ -8,5 +8,4 @@ .newlines{background:the,great,wall;border:2px solid black;} .no_final_semi{color:white;} .no_final_semi1{color:yellow;color:white;} -@media all{html{padding:src('no semi in media block');} -} +@media all{html{padding:src('no semi in media block');}}