Merge pull request #136 from kambayashia/feature/update-css

Feature/update css
joypixels · May 20, 2015 · 17f79be · 17f79be
2 parents 63b8b05 + 8af5583
commit 17f79be
Show file tree

Hide file tree

Showing 8 changed files with 893 additions and 891 deletions.
diff --git a/dist/css/basic/emojify.css b/dist/css/basic/emojify.css
@@ -3,4 +3,5 @@
   height: 1.5em;
   display: inline-block;
   margin-bottom: -0.25em;
-}
+  background-size: contain;
+}
diff --git a/dist/css/basic/emojify.min.css b/dist/css/basic/emojify.min.css
@@ -1 +1 @@
-.emoji{width:1.5em;height:1.5em;display:inline-block;margin-bottom:-.25em}
+.emoji{width:1.5em;height:1.5em;display:inline-block;margin-bottom:-.25em;background-size:contain}
diff --git a/dist/css/data-uri/emojify-emoticons.css b/dist/css/data-uri/emojify-emoticons.css
diff --git a/dist/css/data-uri/emojify-emoticons.min.css b/dist/css/data-uri/emojify-emoticons.min.css
diff --git a/dist/css/data-uri/emojify.css b/dist/css/data-uri/emojify.css
diff --git a/dist/css/data-uri/emojify.min.css b/dist/css/data-uri/emojify.min.css
diff --git a/package.json b/package.json
@@ -31,7 +31,7 @@
     "gulp-uglify": "~1.0.1",
     "gulp-rename": "~1.2.0",
     "gulp-minify-css": "~0.3.11",
-    "gulp-image-data-uri": "~0.1.0",
+    "gulp-image-data-uri": "~1.0.0",
     "gulp-filter": "~1.0.2",
     "gulp-concat": "~2.4.1",
     "jsdom": "^1.1.0",

diff --git a/src/css/basic/emojify.css b/src/css/basic/emojify.css
@@ -3,4 +3,5 @@
   height: 1.5em;
   display: inline-block;
   margin-bottom: -0.25em;
-}
+  background-size: contain;
+}
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		.emoji{width:1.5em;height:1.5em;display:inline-block;margin-bottom:-.25em}
		.emoji{width:1.5em;height:1.5em;display:inline-block;margin-bottom:-.25em;background-size:contain}