fix css conflict

DIYgod · DIYgod · commit 992875020895 · 2016-01-03T12:07:30.000+08:00
diff --git a/dist/APlayer.min.css b/dist/APlayer.min.css
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "aplayer",
-  "version": "1.2.11",
+  "version": "1.2.12",
   "description": "Wow, such a beautiful html5 music player",
   "main": "APlayer.js",
   "scripts": {
diff --git a/src/APlayer.scss b/src/APlayer.scss
@@ -44,6 +44,7 @@ $aplayer-height-lrc: $aplayer-height + $lrc-height;
     border-radius: 2px;
     overflow: hidden;
     user-select: none;
+    line-height: initial;
 
     [class^="aplayer-icon-"]:before, [class*=" aplayer-icon-"]:before {
         font-family: "aplayer-fontello";

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "aplayer",`
`3`		`- "version": "1.2.11",`
	`3`	`+ "version": "1.2.12",`
`4`	`4`	`"description": "Wow, such a beautiful html5 music player",`
`5`	`5`	`"main": "APlayer.js",`
`6`	`6`	`"scripts": {`