[Pkg-javascript-commits] [less.js] 15/25: Moved @font-face property merge test into urls.less and re-enabled merge.less in jasmine tests.

[Jonas Smedegaard]

This is an automated email from the git hooks/post-receive script.

js pushed a commit to annotated tag v1.7.4
in repository less.js.

commit c6cf6a8a6a06bcf47d87656f7ee6253e8ec1d0eb
Author: jurcovicovam <meri at meri.org>
Date:   Sun Jul 27 14:12:57 2014 +0200

    Moved @font-face property merge test into urls.less and re-enabled
    merge.less in jasmine tests.
---
 Gruntfile.js         |  2 +-
 test/css/merge.css   |  5 -----
 test/css/urls.css    |  5 +++++
 test/less/merge.less | 11 -----------
 test/less/urls.less  | 11 +++++++++++
 5 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/Gruntfile.js b/Gruntfile.js
index deea8fc..9b4e314 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -127,7 +127,7 @@ module.exports = function(grunt) {
       },
       main: {
         // src is used to build list of less files to compile
-        src: ['test/less/*.less', '!test/less/merge.less', '!test/less/javascript.less', '!test/less/urls.less', '!test/less/empty.less'],
+        src: ['test/less/*.less', '!test/less/javascript.less', '!test/less/urls.less', '!test/less/empty.less'],
         options: {
           helpers: 'test/browser/runner-main-options.js',
           specs: 'test/browser/runner-main-spec.js',
diff --git a/test/css/merge.css b/test/css/merge.css
index 0d14aac..fe29dc8 100644
--- a/test/css/merge.css
+++ b/test/css/merge.css
@@ -32,8 +32,3 @@
   transform: t1s, t2 t3s, t4 t5s t6s;
   background: b1 b2s, b3, b4;
 }
- at font-face {
-  font-family: 'MyWebFont';
-  src: url(webfont.eot);
-  src: url('webfont.eot?#iefix') format('embedded-opentype'), url('webfont.woff') format('woff'), format('truetype') url('webfont.ttf'), url('webfont.svg#svgFontName') format('svg');
-}
diff --git a/test/css/urls.css b/test/css/urls.css
index cc7087d..27a7050 100644
--- a/test/css/urls.css
+++ b/test/css/urls.css
@@ -69,3 +69,8 @@
   background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/PjxzdmcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB2ZXJzaW9uPSIxLjEiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPjxsaW5lYXJHcmFkaWVudCBpZD0iZ3JhZGllbnQiIGdyYWRpZW50VW5pdHM9InVzZXJTcGFjZU9uVXNlIiB4MT0iMCUiIHkxPSIwJSIgeDI9IjAlIiB5Mj0iMTAwJSI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzAwMDAwMCIvPjxzdG9wIG9mZnNldD0iMyUiIHN0b3AtY29sb3I9IiNmZmE1MDAiLz48c3RvcCBvZ [...]
   background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/PjxzdmcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB2ZXJzaW9uPSIxLjEiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPjxsaW5lYXJHcmFkaWVudCBpZD0iZ3JhZGllbnQiIGdyYWRpZW50VW5pdHM9InVzZXJTcGFjZU9uVXNlIiB4MT0iMCUiIHkxPSIwJSIgeDI9IjAlIiB5Mj0iMTAwJSI+PHN0b3Agb2Zmc2V0PSIxJSIgc3RvcC1jb2xvcj0iI2M0YzRjNCIvPjxzdG9wIG9mZnNldD0iMyUiIHN0b3AtY29sb3I9IiNmZmE1MDAiLz48c3RvcCBvZ [...]
 }
+ at font-face {
+  font-family: 'MyWebFont';
+  src: url(webfont.eot);
+  src: url('webfont.eot?#iefix') format('embedded-opentype'), url('webfont.woff') format('woff'), format('truetype') url('webfont.ttf'), url('webfont.svg#svgFontName') format('svg');
+}
diff --git a/test/less/merge.less b/test/less/merge.less
index 6fab2fc..5b5def3 100644
--- a/test/less/merge.less
+++ b/test/less/merge.less
@@ -76,14 +76,3 @@
     transform+_:  t6s;
     background+:  b4;
 }
-//it should work also inside @font-face #2035
- at font-face {
-    font-family: 'MyWebFont';
-    src: url(webfont.eot);
-    src+: url('webfont.eot?#iefix');
-    src+_: format('embedded-opentype');
-    src+: url('webfont.woff') format('woff');
-    src+: format('truetype');
-    src+_: url('webfont.ttf');
-    src+: url('webfont.svg#svgFontName') format('svg');
-}
\ No newline at end of file
diff --git a/test/less/urls.less b/test/less/urls.less
index ca1602e..bd7c57a 100644
--- a/test/less/urls.less
+++ b/test/less/urls.less
@@ -70,3 +70,14 @@
   @orange_color: orange;
   background-image: svg-gradient(to bottom, (mix(black, white) + #444) 1%, @orange_color @orange_percentage, ((@green_5)), white 95%);
 }
+//it should work also inside @font-face #2035
+ at font-face {
+  font-family: 'MyWebFont';
+  src: url(webfont.eot);
+  src+: url('webfont.eot?#iefix');
+  src+_: format('embedded-opentype');
+  src+: url('webfont.woff') format('woff');
+  src+: format('truetype');
+  src+_: url('webfont.ttf');
+  src+: url('webfont.svg#svgFontName') format('svg');
+}
\ No newline at end of file

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/less.js.git