Delete icons missing for category and profiles

couchpotato/core/plugins/category/static/category.js

@@ -185,7 +185,7 @@ var Category = new Class({
 		var data = self.data;
 
 		self.el = new Element('div.category').adopt(
-			self.delete_button = new Element('span.delete.icon2', {
+			self.delete_button = new Element('span.delete.icon-delete', {
 				'events': {
 					'click': self.del.bind(self)
 				}

couchpotato/core/plugins/category/static/category.scss

@@ -10,66 +10,68 @@
 .category {
 	margin-bottom: 20px;
 	position: relative;
-}
 
-	.category > .delete {
+	> .delete {
 		position: absolute;
-		padding: 16px;
+		padding: $padding/3 $padding;
 		right: 0;
 		cursor: pointer;
 		opacity: 0.6;
 		color: #fd5353;
-	}
-		.category > .delete:hover {
+		font-size: 1.5em;
+		z-index: 2;
+
+		&:hover {
 			opacity: 1;
 		}
+	}
 
-	.category .ctrlHolder:hover {
+	.ctrlHolder:hover {
 		background: none;
 	}
 
-	.category .formHint {
+	.formHint {
 		opacity: 0.1;
 	}
-	.category:hover .formHint {
+
+	&:hover .formHint {
 		opacity: 1;
 	}
+}
 
 #category_ordering {
 
-}
-
-	#category_ordering ul {
+	ul {
 		float: left;
 		margin: 0;
 		width: 275px;
 		padding: 0;
 	}
 
-		#category_ordering li {
-			cursor: grab;
-			border-bottom: 1px solid $theme_off;
-			padding: 5px;
-			list-style: none;
-		}
-		#category_ordering li:last-child { border: 0; }
+	li {
+		cursor: grab;
+		border-bottom: 1px solid $theme_off;
+		padding: 5px;
+		list-style: none;
 
-			#category_ordering li .check {
-				margin: 2px 10px 0 0;
-				vertical-align: top;
-			}
+		&:last-child { border: 0; }
 
-			#category_ordering li > span {
-				display: inline-block;
-				height: 20px;
-				vertical-align: top;
-				line-height: 20px;
-			}
+		.check {
+			margin: 2px 10px 0 0;
+			vertical-align: top;
+		}
 
-			#category_ordering li .handle {
-				width: 20px;
-				float: right;
-			}
+		> span {
+			display: inline-block;
+			height: 20px;
+			vertical-align: top;
+			line-height: 20px;
+		}
 
-	#category_ordering .formHint {
+		.handle {
+			width: 20px;
+			float: right;
+		}
 	}
+
+}

couchpotato/core/plugins/profile/static/profile.js

@@ -24,7 +24,7 @@ var Profile = new Class({
 		var data = self.data;
 
 		self.el = new Element('div.profile').adopt(
-			self.delete_button = new Element('span.delete.icon2', {
+			self.delete_button = new Element('span.delete.icon-delete', {
 				'events': {
 					'click': self.del.bind(self)
 				}

couchpotato/core/plugins/profile/static/profile.scss

@@ -15,6 +15,21 @@
 		font-weight: bold;
 	}
 
+	> .delete {
+		position: absolute;
+		padding: $padding/3 $padding;
+		right: 0;
+		cursor: pointer;
+		opacity: 0.6;
+		color: #fd5353;
+		font-size: 1.5em;
+		z-index: 2;
+
+		&:hover {
+			opacity: 1;
+		}
+	}
+
 	.ctrlHolder {
 
 		.types {

couchpotato/static/scripts/combined.plugins.min.js

@@ -2818,7 +2818,7 @@ var Category = new Class({
     create: function() {
         var self = this;
         var data = self.data;
-        self.el = new Element("div.category").adopt(self.delete_button = new Element("span.delete.icon2", {
+        self.el = new Element("div.category").adopt(self.delete_button = new Element("span.delete.icon-delete", {
             events: {
                 click: self.del.bind(self)
             }
@@ -3163,7 +3163,7 @@ var Profile = new Class({
     create: function() {
         var self = this;
         var data = self.data;
-        self.el = new Element("div.profile").adopt(self.delete_button = new Element("span.delete.icon2", {
+        self.el = new Element("div.profile").adopt(self.delete_button = new Element("span.delete.icon-delete", {
             events: {
                 click: self.del.bind(self)
             }

couchpotato/static/style/combined.min.css

@@ -429,7 +429,7 @@
 }
 .add_new_category{padding:20px;display:block;text-align:center;font-size:20px}
 .category{margin-bottom:20px;position:relative}
-.category>.delete{position:absolute;padding:16px;right:0;cursor:pointer;opacity:.6;color:#fd5353}
+.category>.delete{position:absolute;padding:6.67px 20px;right:0;cursor:pointer;opacity:.6;color:#fd5353;font-size:1.5em;z-index:2}
 .category>.delete:hover{opacity:1}
 .category .ctrlHolder:hover{background:0 0}
 .page.log .nav li.active,.page.log .nav li:hover:not(.active):not(.filter){background:rgba(255,255,255,.1)}
@@ -469,6 +469,8 @@
 .add_new_profile{padding:20px;display:block;text-align:center;font-size:20px;border-bottom:1px solid #eaeaea}
 .profile{margin-bottom:20px}
 .profile .quality_label input{font-weight:700}
+.profile>.delete{position:absolute;padding:6.67px 20px;right:0;cursor:pointer;opacity:.6;color:#fd5353;font-size:1.5em;z-index:2}
+.profile>.delete:hover{opacity:1}
 .profile .ctrlHolder .types{-webkit-flex:1 1 auto;-ms-flex:1 1 auto;flex:1 1 auto;min-width:360px}
 .profile .ctrlHolder .types .type{display:-webkit-flex;display:-ms-flexbox;display:flex;flex-row:row nowrap;-webkit-align-items:center;-ms-flex-align:center;align-items:center;padding:2px 0}
 .profile .ctrlHolder .types .type label{min-width:0;margin-left:10px}