resolve conflicts

digitaledgeit · Mar 18, 2015 · 0bdedbd · 0bdedbd
2 parents 0f7374f + f2e21db
commit 0bdedbd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/component.json b/component.json
@@ -2,6 +2,6 @@
 	"name": "lists",
 	"description": "Generic structural list styles",
 	"main": "index.css",
-	"scripts": ["index.css"],
+	"styles": ["index.css"],
 	"license": "MIT"
-}
+}
diff --git a/index.css b/index.css
@@ -11,9 +11,10 @@
 	font-size: 0;
 }
 
-.list--horizontal .list__item {
+.list--horizontal > .list__item {
 	display: inline-block;
 	font-size: 1rem;
+	vertical-align: top;
 }
 
 /** justified list **/