Merge branch 'normalized-urls' of https://github.com/rjgotten/less.js into 1.5.0-wip

Conflicts:
	test/css/static-urls/urls.css
	test/css/urls.css
This commit is contained in:
Luke Page
2013-09-01 18:17:32 +01:00
6 changed files with 50 additions and 11 deletions

View File

@@ -1,4 +1,4 @@
@import "folder (1)/../css/background.css";
@import "css/background.css";
@import "folder (1)/import-test-d.css";
@font-face {
src: url("/fonts/garamond-pro.ttf");
@@ -30,11 +30,11 @@
#logo {
width: 100px;
height: 100px;
background: url('folder (1)/../assets/logo.png');
background: url('assets/logo.png');
}
@font-face {
font-family: xecret;
src: url('folder (1)/../assets/xecret.ttf');
src: url('assets/xecret.ttf');
}
#secret {
font-family: xecret, sans-serif;