From 5dbb59ef805b9311a78a517b1d42c670e0942871 Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Wed, 13 May 2015 13:53:53 +0200
Subject: [PATCH] skill-row now scss

---
 rpg-docs/client/views/GeneralCSS/main.scss    |  3 +-
 .../character/stats/skillRow/skillRow.css     | 40 -------------------
 .../character/stats/skillRow/skillRow.html    | 32 +++++++++------
 .../character/stats/skillRow/skillRow.scss    | 24 +++++++++++
 .../client/views/character/stats/stats.js     |  2 +-
 5 files changed, 47 insertions(+), 54 deletions(-)
 delete mode 100644 rpg-docs/client/views/character/stats/skillRow/skillRow.css
 create mode 100644 rpg-docs/client/views/character/stats/skillRow/skillRow.scss

diff --git a/rpg-docs/client/views/GeneralCSS/main.scss b/rpg-docs/client/views/GeneralCSS/main.scss
index b819103c..c7532e0d 100644
--- a/rpg-docs/client/views/GeneralCSS/main.scss
+++ b/rpg-docs/client/views/GeneralCSS/main.scss
@@ -72,8 +72,9 @@ List items
 }
 
 .item {
+	background: white;
 	height: 40px;
-	margin: 1px;
+	margin: 1px 0 1px 0;
 	&.small {
 		height: 32px;
 	}
diff --git a/rpg-docs/client/views/character/stats/skillRow/skillRow.css b/rpg-docs/client/views/character/stats/skillRow/skillRow.css
deleted file mode 100644
index c2dfa258..00000000
--- a/rpg-docs/client/views/character/stats/skillRow/skillRow.css
+++ /dev/null
@@ -1,40 +0,0 @@
-.skillRow {
-	height: 32px;
-	margin: 0 -16px 0 -16px;
-	background: white;
-}
-
-.skillRow core-icon {
-	color: rgba(0,0,0,0.54);
-}
-
-.skillMod {
-	width: 42px;
-	text-align: center;
-}
-
-.skillName, .skillMod{
-	
-}
-
-.fail.skillMod {
-	color: #D50000;
-}
-
-.advantage{
-	background-image: url(/png/advantage/greenUp.png);
-	background-size: contain;
-	background-repeat: no-repeat;
-	background-position: center;
-}
-
-.disadvantage{
-	background-image: url(/png/advantage/redDown.png);
-	background-size: contain;
-	background-repeat: no-repeat;
-	background-position: center;
-}
-
-.hasConditionals::after{
-	content: "*";
-}
diff --git a/rpg-docs/client/views/character/stats/skillRow/skillRow.html b/rpg-docs/client/views/character/stats/skillRow/skillRow.html
index 58fdac4a..65cc3814 100644
--- a/rpg-docs/client/views/character/stats/skillRow/skillRow.html
+++ b/rpg-docs/client/views/character/stats/skillRow/skillRow.html
@@ -1,16 +1,24 @@
 <template name="skillRow">
-	<paper-item class="skillRow" layout horizontal hero-id="main" {{detailHero skill ../_id}}>
-		<core-icon icon="{{profIcon}}"></core-icon>
-		{{#if failSkill}}
-		<div class="fail skillMod">fail</div>
-		{{else}}
-		<div class="{{advantage}} skillMod">{{../skillMod skill}}</div>
-		{{/if}}
-		<div class="{{#if conditionalCount}}hasConditionals{{/if}} skillName">
-			{{name}}
-			{{#if showPassive}}
-				({{../passiveSkill skill}})
+	<div class="item-slot">
+		<div class="skill-row item small" 
+			 hero-id="main" 
+			 {{detailHero skill ../_id}} 
+			 layout horizontal center>
+			<core-icon icon="{{profIcon}}"></core-icon>
+			{{#if failSkill}}
+				<div class="fail skill-mod">fail</div>
+			{{else}}
+				<div class="{{advantage}} skill-mod">{{../skillMod skill}}</div>
 			{{/if}}
+			<div flex>
+				{{name}}
+				{{#if conditionalCount}}
+					*
+				{{/if}}
+				{{#if showPassive}}
+					({{../passiveSkill skill}})
+				{{/if}}
+			</div>
 		</div>
-	</paper-item>
+	</div>
 </template>
\ No newline at end of file
diff --git a/rpg-docs/client/views/character/stats/skillRow/skillRow.scss b/rpg-docs/client/views/character/stats/skillRow/skillRow.scss
new file mode 100644
index 00000000..c443113f
--- /dev/null
+++ b/rpg-docs/client/views/character/stats/skillRow/skillRow.scss
@@ -0,0 +1,24 @@
+.skill-row {
+	core-icon {
+		color: rgba(0,0,0,0.54);
+	}
+	.skill-mod{
+		width: 45px;
+		text-align: center;
+		&.fail {
+			color: #D50000;
+		}
+		&.advantage{
+			background-image: url(/png/advantage/greenUp.png);
+			background-size: contain;
+			background-repeat: no-repeat;
+			background-position: center;
+		}
+		&.disadvantage{
+			background-image: url(/png/advantage/redDown.png);
+			background-size: contain;
+			background-repeat: no-repeat;
+			background-position: center;
+		}
+	}
+}
\ No newline at end of file
diff --git a/rpg-docs/client/views/character/stats/stats.js b/rpg-docs/client/views/character/stats/stats.js
index 356a8c16..0f43e235 100644
--- a/rpg-docs/client/views/character/stats/stats.js
+++ b/rpg-docs/client/views/character/stats/stats.js
@@ -23,7 +23,7 @@ Template.stats.events({
 			heroId:   charId + this.ability,
 		});
 	},
-	"tap .skillRow": function(event, instance){
+	"tap .skill-row": function(event, instance){
 		var skill = this.skill;
 		var charId = instance.data._id;
 		GlobalUI.setDetail({