github/less.js
1
1
Fork 0
mirror of https://github.com/less/less.js.git synced 2026-04-09 03:00:20 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge issues and a code review comment. revert unit change that outputs px*px as it is not valid css

Browse Source
This commit is contained in:
Luke Page
2013-01-23 21:43:39 +00:00
parent e6ea7b42ab
commit 3b5ecf5421
4 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
test/css/variables.css
View File

@@ -31,13 +31,13 @@
.units {
width: 1px;
z-index: 1;
square-pixel: 1px*px;
odd-unit: 2em*px/cm;
square-pixel: 1px;
odd-unit: 2em;
percentage: 500%;
pixels: 500px;
conversion-metric-a: 30mm;
conversion-metric-b: 3cm;
conversion-imperial: 3in;
custom-unit: 420cheeseburgers*octocats;
custom-unit: 420cheeseburgers;
custom-unit-cancelling: 2;
}

20
test/less/variables.less
View File

@@ -68,14 +68,14 @@
.units {
width: @onePixel;
z-index: @onePixel / @onePixel;
square-pixel: @onePixel * @onePixel * @onePixel / @onePixel;
odd-unit: @onePixel * 4em / 2cm;
percentage: 10 * 50%;
pixels: 50px * 10;
conversion-metric-a: 20mm + 1cm;
conversion-metric-b: 1cm + 20mm;
conversion-imperial: 1in + 72pt + 6pc;
custom-unit: 42octocats * 10cheeseburgers;
custom-unit-cancelling: 8cats / 4cats;
z-index: (@onePixel / @onePixel);
square-pixel: (@onePixel * @onePixel * @onePixel / @onePixel);
odd-unit: (@onePixel * 4em / 2cm);
percentage: (10 * 50%);
pixels: (50px * 10);
conversion-metric-a: (20mm + 1cm);
conversion-metric-b: (1cm + 20mm);
conversion-imperial: (1in + 72pt + 6pc);
custom-unit: (42octocats * 10cheeseburgers);
custom-unit-cancelling: (8cats / 4cats);
}