Merge branch 'furzeface-master'

frontendfriends · Oct 26, 2014 · 7a43816 · 7a43816
2 parents afa6781 + 0af17ea
commit 7a43816
Show file tree

Hide file tree

Showing 5 changed files with 108 additions and 88 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -1,6 +1,6 @@
 /*
  * grunt-combine-mq
- * https://github.com/buildingblocks/grunt-combine-mq
+ * https://github.com/frontendfriends/grunt-combine-mq
  *
  * Copyright (c) 2014 Building Blocks
  * Licensed under the MIT license.
@@ -38,12 +38,12 @@ module.exports = function(grunt) {
     combine_mq: {
       default_options: {
         expand: true,
-        cwd: 'test/styles',
+        cwd: 'test/fixtures',
         src: 'test.css',
         dest: 'test/actual/'
       },
       new_filename: {
-        src: 'test/styles/test.css',
+        src: 'test/fixtures/test.css',
         dest: 'test/actual/new_filename.css'
       }
     }

diff --git a/package.json b/package.json
@@ -1,71 +1,71 @@
 {
-  "name": "grunt-combine-mq",
-  "description": "Grunt plugin for node-combine-mq",
-  "version": "0.2.1",
-  "homepage": "https://github.com/frontendfriends/grunt-combine-mq",
-  "author": "Front-end Friends Club <hello@frontendfriends.club>",
-  "maintainers": [
-    {
-      "name": "Paul Welsh",
-      "email": "spacedawwwg@gmail.com",
-      "web": "https://github.com/spacedawwwg"
-    },
-    {
-      "name": "Daniel Furze",
-      "email": "daniel@furzeface.com",
-      "web": "https://github.com/furzeface"
-    }
-  ],
-  "contributors": [
-    {
-      "name": "Paul Welsh",
-      "email": "spacedawwwg@gmail.com"
-    },
-    {
-      "name": "Daniel Furze",
-      "email": "daniel@furzeface.com"
-    },
-    {
-      "name": "John Cashmore"
-    },
-    {
-      "name": "Thomas Dobber",
-      "email": "thomasdobber@gmail.com"
-    }
-  ],
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/frontendfriends/grunt-combine-mq.git"
-  },
-  "bugs": {
-    "url": "https://github.com/frontendfriends/grunt-combine-mq/issues"
-  },
-  "licenses": [
-    {
-      "type": "MIT",
-      "url": "https://github.com/frontendfriends/grunt-combine-mq/blob/master/LICENSE-MIT"
-    }
-  ],
-  "engines": {
-    "node": ">= 0.8.0"
-  },
-  "scripts": {
-    "test": "grunt test"
-  },
-  "devDependencies": {
-    "grunt": "^0.4.5",
-    "grunt-contrib-clean": "^0.5.0",
-    "grunt-contrib-jshint": "^0.9.2",
-    "grunt-contrib-nodeunit": "^0.3.3",
-    "load-grunt-tasks": "^0.6.0"
-  },
-  "peerDependencies": {
-    "grunt": "~0.4.5"
-  },
-  "dependencies": {
-    "combine-mq": "git://github.com/frontendfriends/node-combine-mq"
-  },
-  "keywords": [
-    "gruntplugin"
-  ]
+	"name": "grunt-combine-mq",
+	"description": "Grunt plugin for node-combine-mq",
+	"version": "0.3.0",
+	"homepage": "https://github.com/frontendfriends/grunt-combine-mq",
+	"author": "Front-end Friends Club <hello@frontendfriends.club>",
+	"maintainers": [
+		{
+			"name": "Paul Welsh",
+			"email": "spacedawwwg@gmail.com",
+			"web": "https://github.com/spacedawwwg"
+		},
+		{
+			"name": "Daniel Furze",
+			"email": "daniel@furzeface.com",
+			"web": "https://github.com/furzeface"
+		}
+	],
+	"contributors": [
+		{
+			"name": "Paul Welsh",
+			"email": "spacedawwwg@gmail.com"
+		},
+		{
+			"name": "Daniel Furze",
+			"email": "daniel@furzeface.com"
+		},
+		{
+			"name": "John Cashmore"
+		},
+		{
+			"name": "Thomas Dobber",
+			"email": "thomasdobber@gmail.com"
+		}
+	],
+	"repository": {
+		"type": "git",
+		"url": "https://github.com/frontendfriends/grunt-combine-mq.git"
+	},
+	"bugs": {
+		"url": "https://github.com/frontendfriends/grunt-combine-mq/issues"
+	},
+	"licenses": [
+		{
+			"type": "MIT",
+			"url": "https://github.com/frontendfriends/grunt-combine-mq/blob/master/LICENSE-MIT"
+		}
+	],
+	"engines": {
+		"node": ">= 0.8.0"
+	},
+	"scripts": {
+		"test": "grunt test"
+	},
+	"devDependencies": {
+		"grunt": "^0.4.5",
+		"grunt-contrib-clean": "^0.5.0",
+		"grunt-contrib-jshint": "^0.9.2",
+		"grunt-contrib-nodeunit": "^0.3.3",
+		"load-grunt-tasks": "^0.6.0"
+	},
+	"peerDependencies": {
+		"grunt": "~0.4.5"
+	},
+	"dependencies": {
+		"combine-mq": "latest"
+	},
+	"keywords": [
+		"gruntplugin"
+	]
 }
diff --git a/tasks/combine_mq.js b/tasks/combine_mq.js
@@ -1,6 +1,6 @@
 /*
  * grunt-combine-mq
- * https://github.com/buildingblocks/grunt-combine-mq
+ * https://github.com/frontendfriends/grunt-combine-mq
  *
  * Copyright (c) 2014 Building Blocks
  * Licensed under the MIT license.

diff --git a/test/expected/test.css b/test/expected/test.css
@@ -15,7 +15,7 @@ body {
 body:before,
 body:after {
 	display: table;
-	content: "";
+	content: '';
 }
 
 body:after {
@@ -24,7 +24,7 @@ body:after {
 
 body:before,
 body:after {
-	content: "";
+	content: '';
 	display: table;
 }
 
@@ -103,6 +103,17 @@ img {
 	margin: 0 20px;
 }
 
+@font-face {
+font-family:'frontendfriends';
+src:url(../fonts/frontendfriends/frontendfriends.eot?h3i238);
+src:url(../fonts/frontendfriends/frontendfriends.eot?#iefixh3i238) format("embedded-opentype"),
+	url(../fonts/frontendfriends/frontendfriends.woff?h3i238) format("woff"),
+	url(../fonts/frontendfriends/frontendfriends.ttf?h3i238) format("truetype"),
+	url(../fonts/frontendfriends/frontendfriends.svg?h3i238#frontendfriends) format("svg");
+font-weight:400;
+font-style:normal;
+}
+
 @media only screen {
 
 /*   hihihih */

diff --git a/test/styles/test.css → test/fixtures/test.css b/test/styles/test.css → test/fixtures/test.css
@@ -14,15 +14,15 @@ body {
 
 body:before,body:after {
 	display:table;
-	content:"";
+	content:'';
 }
 
 body:after {
 	clear:both;
 }
 
 body:before,body:after {
-	content:"";
+	content:'';
 	display:table;
 }
 
@@ -147,7 +147,7 @@ img {
 }
 
 @media only screen {
-/*   hihihih */
+	/*   hihihih */
 	html{
 		color:red; /* hsdfjsdjhf */
 		line-height: 200;
@@ -162,21 +162,21 @@ img {
 }
 
 @-webkit-keyframes NAME-YOUR-ANIMATION {
-/*   hahahah */
-  0%   { opacity: 0; /* helphelp */ }
-  100% { opacity: 1; }
+	/*   hahahah */
+0%   { opacity: 0; /* helphelp */ }
+100% { opacity: 1; }
 }
 @-moz-keyframes NAME-YOUR-ANIMATION {
-  0%   { opacity: 0; }
-  100% { opacity: 1; }
+	0%   { opacity: 0; }
+	100% { opacity: 1; }
 }
 @-o-keyframes NAME-YOUR-ANIMATION {
-  0%   { opacity: 0; }
-  100% { opacity: 1; }
+	0%   { opacity: 0; }
+	100% { opacity: 1; }
 }
 @keyframes NAME-YOUR-ANIMATION {
-  0%   { opacity: 0; }
-  100% { opacity: 1; }
+	0%   { opacity: 0; }
+	100% { opacity: 1; }
 }
 
 @-moz-document url-prefix(http://www.example.com) {
@@ -200,4 +200,13 @@ img {
 	}
 }
 
-
+@font-face {
+	font-family:'frontendfriends';
+	src:url(../fonts/frontendfriends/frontendfriends.eot?h3i238);
+	src:url(../fonts/frontendfriends/frontendfriends.eot?#iefixh3i238) format("embedded-opentype"),
+	url(../fonts/frontendfriends/frontendfriends.woff?h3i238) format("woff"),
+	url(../fonts/frontendfriends/frontendfriends.ttf?h3i238) format("truetype"),
+	url(../fonts/frontendfriends/frontendfriends.svg?h3i238#frontendfriends) format("svg");
+	font-weight:400;
+	font-style:normal
+}