Cleanup icons scss file

6 files changed, 60 insertions, 200 deletions

diff --git a/css/src/06sidebar.scss b/css/src/06sidebar.scss
index 4f5af534..7d112707 100644
--- a/css/src/06sidebar.scss
+++ b/css/src/06sidebar.scss
@@ -318,7 +318,7 @@
 							display: inline-block;
 						}
 
-						&.detail-delete,
+						&.icon-trash,
 						&.detail-remindertype {
 							display: block;
 						}
@@ -348,7 +348,7 @@
 						opacity: 1;
 					}
 
-					&:hover .icon.detail-delete {
+					&:hover .icon.icon-trash {
 						display: block;
 					}
 				}
@@ -408,7 +408,7 @@
 				display: block !important;
 			}
 
-			&.date:hover .icon.detail-delete {
+			&.date:hover .icon.icon-trash {
 				display: none;
 			}
 		}
diff --git a/css/src/07icons.scss b/css/src/07icons.scss
index 8847271f..79150ef0 100644
--- a/css/src/07icons.scss
+++ b/css/src/07icons.scss
@@ -15,23 +15,12 @@
 	display: inline-block;
 	vertical-align: middle;
 	opacity: .5;
+	transition: opacity 100ms ease 0s;
 
-	&.input-date {
-		display: none;
-		opacity: .4;
-		transition: opacity 100ms ease 0s;
-		right: 35px;
-		top: 7px;
-	}
-
-	&.input-star {
-		display: none;
-		opacity: .5;
-		right: 9px;
-
-		&.starred {
-			opacity: 1;
-		}
+	&.icon-checkmark,
+	&.icon-tag-active,
+	&[class*=" icon-task-star-"] {
+		opacity: 1 !important;
 	}
 
 	&.task-checkbox,
@@ -62,70 +51,30 @@
 		float: right;
 	}
 
-	&.detail-settings {
-		transition: opacity 100ms ease 0s;
-		opacity: .6;
-	}
-
-	&.detail-reminder {
-		height: 20px;
-		width: 20px;
-	}
-
-	&.icon-checkmark {
-		opacity: 1;
-	}
-
-	&.note-fullscreen {
-		opacity: .6;
-
-		&:hover {
-			opacity: 1;
-		}
-	}
-
 	&.toggle-completed-subtasks {
 		float: right;
 		opacity: 1;
 
-		&.hidden {
-			opacity: .5;
-		}
-
 		&:hover {
 			opacity: 1;
 		}
 	}
+}
 
-	&.detail-delete {
-		display: none;
-		margin-left: auto;
-		right: 22px;
-
-		&:hover {
-			opacity: .8;
+.section {
+	.icon {
+		&.icon-trash {
+			display: none;
+			margin-left: auto;
+			right: 22px;
 		}
-	}
 
-	&.detail-save {
-		display: none;
-		margin-left: auto;
-		right: 44px;
-
-		&:hover {
-			opacity: .8;
+		&.detail-save {
+			display: none;
+			margin-left: auto;
+			right: 44px;
 		}
 	}
-
-	&.icon-tag-active {
-		opacity: 1;
-	}
-}
-
-.icon-task-star-low,
-.icon-task-star-medium,
-.icon-task-star-high {
-	opacity: 1 !important;
 }
 
 a {
@@ -138,33 +87,17 @@ a {
 			height: 24px;
 			width: 24px;
 			background-size: 144px 144px;
-			opacity: .3;
 
 			&:hover {
-				opacity: .5;
+				opacity: 1;
 			}
 		}
 	}
 
 	&:hover .icon {
-		&.detail-trash,
-		&.detail-settings,
-		&.detail-close,
-		&.input-star {
+		&.icon-trash,
+		&.icon-hide {
 			opacity: 1;
 		}
-
-		&.detail-delete,
-		&.input-date {
-			opacity: .8;
-		}
-	}
-}
-
-.high,
-.medium,
-.low {
-	.icon.detail-priority {
-		opacity: 1;
 	}
 }
diff --git a/css/style.scss b/css/style.scss
index fa52b23a..a11419f3 100644
--- a/css/style.scss
+++ b/css/style.scss
@@ -1064,7 +1064,7 @@ tr:last-child .task-item {
 							display: inline-block;
 						}
 
-						&.detail-delete,
+						&.icon-trash,
 						&.detail-remindertype {
 							display: block;
 						}
@@ -1094,7 +1094,7 @@ tr:last-child .task-item {
 						opacity: 1;
 					}
 
-					&:hover .icon.detail-delete {
+					&:hover .icon.icon-trash {
 						display: block;
 					}
 				}
@@ -1154,7 +1154,7 @@ tr:last-child .task-item {
 				display: block !important;
 			}
 
-			&.date:hover .icon.detail-delete {
+			&.date:hover .icon.icon-trash {
 				display: none;
 			}
 		}
@@ -1261,23 +1261,12 @@ input {
 	display: inline-block;
 	vertical-align: middle;
 	opacity: .5;
+	transition: opacity 100ms ease 0s;
 
-	&.input-date {
-		display: none;
-		opacity: .4;
-		transition: opacity 100ms ease 0s;
-		right: 35px;
-		top: 7px;
-	}
-
-	&.input-star {
-		display: none;
-		opacity: .5;
-		right: 9px;
-
-		&.starred {
-			opacity: 1;
-		}
+	&.icon-checkmark,
+	&.icon-tag-active,
+	&[class*=" icon-task-star-"] {
+		opacity: 1 !important;
 	}
 
 	&.task-checkbox,
@@ -1308,70 +1297,30 @@ input {
 		float: right;
 	}
 
-	&.detail-settings {
-		transition: opacity 100ms ease 0s;
-		opacity: .6;
-	}
-
-	&.detail-reminder {
-		height: 20px;
-		width: 20px;
-	}
-
-	&.icon-checkmark {
-		opacity: 1;
-	}
-
-	&.note-fullscreen {
-		opacity: .6;
-
-		&:hover {
-			opacity: 1;
-		}
-	}
-
 	&.toggle-completed-subtasks {
 		float: right;
 		opacity: 1;
 
-		&.hidden {
-			opacity: .5;
-		}
-
 		&:hover {
 			opacity: 1;
 		}
 	}
+}
 
-	&.detail-delete {
-		display: none;
-		margin-left: auto;
-		right: 22px;
-
-		&:hover {
-			opacity: .8;
+.section {
+	.icon {
+		&.icon-trash {
+			display: none;
+			margin-left: auto;
+			right: 22px;
 		}
-	}
-
-	&.detail-save {
-		display: none;
-		margin-left: auto;
-		right: 44px;
 
-		&:hover {
-			opacity: .8;
+		&.detail-save {
+			display: none;
+			margin-left: auto;
+			right: 44px;
 		}
 	}
-
-	&.icon-tag-active {
-		opacity: 1;
-	}
-}
-
-.icon-task-star-low,
-.icon-task-star-medium,
-.icon-task-star-high {
-	opacity: 1 !important;
 }
 
 a {
@@ -1384,34 +1333,18 @@ a {
 			height: 24px;
 			width: 24px;
 			background-size: 144px 144px;
-			opacity: .3;
 
 			&:hover {
-				opacity: .5;
+				opacity: 1;
 			}
 		}
 	}
 
 	&:hover .icon {
-		&.detail-trash,
-		&.detail-settings,
-		&.detail-close,
-		&.input-star {
+		&.icon-trash,
+		&.icon-hide {
 			opacity: 1;
 		}
-
-		&.detail-delete,
-		&.input-date {
-			opacity: .8;
-		}
-	}
-}
-
-.high,
-.medium,
-.low {
-	.icon.detail-priority {
-		opacity: 1;
 	}
 }
 
diff --git a/templates/main.php b/templates/main.php
index b16fa356..4e351e9d 100644
--- a/templates/main.php
+++ b/templates/main.php
@@ -144,12 +144,6 @@
     <div id="app-content" ng-controller="TasksController" ng-class="{'with-app-sidebar':route.taskID}">
         <div class="content-wrapper">
             <div id="add-task" class="add-task handler" ng-show="showInput()" ng-class="{'focus':status.focusTaskInput}">
-                <a class="input-star">
-                    <span class="icon input-star"></span>
-                </a>
-                <a class="input-date">
-                    <span class="icon input-date"></span>
-                </a>
                 <form ng-submit="addTask(status.taskName)" name="addTaskForm">
                     <input id="target" ng-disabled="isAddingTask" ng-click="focusTaskInput()" class="transparent" placeholder="{{ getAddString() }}" ng-model="status.taskName"
                         ng-keydown="checkTaskInput($event)"/>
diff --git a/templates/part.details.php b/templates/part.details.php
index 493695e4..7bbab19f 100644
--- a/templates/part.details.php
+++ b/templates/part.details.php
@@ -23,8 +23,8 @@
                 <div class="section-title" ng-class="{'overdue':isOverDue(task.start)}">
                     <text>{{ task.start | startDetails }}</text>
                 </div>
-                <a class="detail-delete handler end-edit" ng-click="deleteStartDate(task)">
-                    <span class="icon detail-delete icon-trash"></span>
+                <a class="handler end-edit" ng-click="deleteStartDate(task)">
+                    <span class="icon icon-trash"></span>
                 </a>
                 <span class="icon detail-save icon-checkmark-color handler end-edit"></span>
                 <div class="section-edit">
@@ -38,8 +38,8 @@
                 <div class="section-title" ng-class="{'overdue':isOverDue(task.due)}">
                     <text>{{ task.due | dateDetails }}</text>
                 </div>
-                <a class="detail-delete handler end-edit" ng-click="deleteDueDate(task)">
-                	<span class="icon detail-delete icon-trash"></span>
+                <a class="handler end-edit" ng-click="deleteDueDate(task)">
+                	<span class="icon icon-trash"></span>
                 </a>
                 <span class="icon detail-save icon-checkmark-color handler end-edit"></span>
                 <div class="section-edit">
@@ -60,8 +60,8 @@
                 <div class="section-title" ng-class="{'overdue':isOverDue(task.reminder.date)}">
     				<text rel="">{{ task.reminder | reminderDetails:this }}</text>
     			</div>
-                <a class="detail-delete handler end-edit" ng-click="deleteReminder()">
-    				<span class="icon detail-delete icon-trash"></span>
+                <a class="handler end-edit" ng-click="deleteReminder()">
+    				<span class="icon icon-trash"></span>
     			</a>
                 <span class="icon detail-save icon-checkmark-color handler end-edit"></span>
                 <div class="section-edit" ng-switch='reminderType(task)'>
@@ -81,8 +81,8 @@
                 <div class="section-title">
                     <text>{{ task.priority | priorityDetails}}</text>
                 </div>
-                <a class="detail-delete handler end-edit" ng-click="deletePriority(task)">
-                    <span class="icon detail-delete icon-trash"></span>
+                <a class="handler end-edit" ng-click="deletePriority(task)">
+                    <span class="icon icon-trash"></span>
                 </a>
                 <span class="icon detail-save icon-checkmark-color handler end-edit"></span>
                 <div class="section-edit">
@@ -95,8 +95,8 @@
                 <div class="section-title">
                     <text>{{ task.complete | percentDetails}}</text>
                 </div>
-                <a class="detail-delete handler end-edit" ng-click="deletePercent(task)">
-                    <span class="icon detail-delete icon-trash"></span>
+                <a class="handler end-edit" ng-click="deletePercent(task)">
+                    <span class="icon icon-trash"></span>
                 </a>
                 <span class="icon detail-save icon-checkmark-color handler end-edit"></span>
                 <div class="section-edit">
@@ -140,8 +140,8 @@
                 <ul>
                     <li ng-repeat="comment in task.comments" class="comment-item" rel=" {{ comment.id }} ">
                         <div class="avatar" avatar userID="{{ comment.userID }}" size="32"></div>
-                        <a class="detail-delete end-edit" ng-click="deleteComment(comment.id)" ng-show="settingsmodel.getById('various').userID == comment.userID">
-                            <span class="icon detail-delete icon-trash"></span>
+                        <a class="end-edit" ng-click="deleteComment(comment.id)" ng-show="settingsmodel.getById('various').userID == comment.userID">
+                            <span class="icon icon-trash"></span>
                         </a>
                         <span class="username">{{ comment.name }}</span>
                         <div class="comment" ng-bind-html="comment.comment | linky:'_blank':{rel: 'nofollow'}"></div>
@@ -155,11 +155,11 @@
                 <input type="text" placeholder="{{ commentStrings().input }}" ng-model="CommentContent" ng-keydown="sendComment($event)">
                 <input type="button" ng-click="addComment()" name="addComment" value="{{ commentStrings().button }}" ng-class="{'active':CommentContent}">
             </div> -->
-        	<a class="detail-trash handler close-all" ng-click="deleteTask(task)" ng-show="task.calendar.writable">
-            	<span class="icon detail-trash icon-trash"></span>
+        	<a class="handler close-all" ng-click="deleteTask(task)" ng-show="task.calendar.writable">
+            	<span class="icon icon-trash"></span>
             </a>
             <a class="detail-close handler close-all">
-            	<span class="icon detail-close icon-hide"></span>
+            	<span class="icon icon-hide"></span>
             </a>
         </div>
     </div>
diff --git a/templates/part.taskbody.php b/templates/part.taskbody.php
index 01105c06..8ba8c1b1 100644
--- a/templates/part.taskbody.php
+++ b/templates/part.taskbody.php
@@ -12,7 +12,7 @@
     </a>
     <a class="icon task-separator"></a>
     <a class="task-star handler" ng-click="toggleStarred(task)">
-        <span class="icon icon-task-star right large faded" ng-class="{'icon-task-star-high':task.priority > 5, 'icon-task-star-medium':task.priority == 5, 'icon-task-star-low':task.priority > 0 && task.priority < 5}">
+        <span class="icon icon-task-star right large" ng-class="{'icon-task-star-high':task.priority > 5, 'icon-task-star-medium':task.priority == 5, 'icon-task-star-low':task.priority > 0 && task.priority < 5}">
         </span>
     </a>
     <a class="task-addsubtask handler add-subtask" ng-show="task.calendar.writable" ng-click="showSubtaskInput(task.uid)" oc-click-focus="{selector: '.add-subtask input', timeout: 0}">