From 6449f66f390c63b5a653c7ea39d0ade5e81d3fc2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Raimund=20Schl=C3=BC=C3=9Fler?=
 <raimund.schluessler@mailbox.org>
Date: Sun, 1 Oct 2017 18:12:04 +0200
Subject: [PATCH] Cleanup navigation-utils css

---
 css/src/02navigation-utils.scss |  76 +++++++---------------
 css/src/10sortorder.scss        |  36 ++++++++++
 css/style.scss                  | 112 +++++++++++++++++---------------
 3 files changed, 116 insertions(+), 108 deletions(-)

diff --git a/css/src/02navigation-utils.scss b/css/src/02navigation-utils.scss
index 9648d734..0b3b933a 100644
--- a/css/src/02navigation-utils.scss
+++ b/css/src/02navigation-utils.scss
@@ -1,60 +1,7 @@
 /**
-	* rules for app-navigation-entry-menu
+	* rules for colorpicker
 	*/
 
-.app-navigation-entry-menu {
-	&.sortorder-dropdown li > a span {
-		opacity: 1 !important;
-
-		&[class*=" icon-"] {
-			padding: 0;
-
-			&.icon-menu {
-				@extend .icon-menu;
-			}
-
-			&.icon-calendar {
-				@extend .icon-calendar;
-			}
-
-			&.icon-task-star {
-				@extend .icon-task-star;
-			}
-
-			&.icon-alphabetically {
-				@extend .icon-alphabetically;
-			}
-
-			&.icon-manual {
-				@extend .icon-manual;
-			}
-
-			&.icon-sort-up {
-				@extend .icon-sort-up;
-			}
-
-			&.icon-sort-down {
-				@extend .icon-sort-down;
-			}
-		}
-	}
-
-	li > a {
-		&:not(:empty).confirmation-confirm {
-			padding-right: 0 !important;
-		}
-
-		span.countdown {
-			background-color: inherit;
-			color: $white;
-			display: block;
-			text-align: center;
-			filter: alpha(opacity=100) !important;
-			opacity: 1 !important;
-		}
-	}
-}
-
 .colorpicker {
 	display: block;
 	height: 30px;
@@ -91,6 +38,27 @@
 	}
 }
 
+/**
+	* rules for confirmation directive
+	*/
+
+.app-navigation-entry-menu {
+	li > a {
+		&:not(:empty).confirmation-confirm {
+			padding-right: 0 !important;
+		}
+
+		span.countdown {
+			background-color: inherit;
+			color: $white;
+			display: block;
+			text-align: center;
+			filter: alpha(opacity=100) !important;
+			opacity: 1 !important;
+		}
+	}
+}
+
 .confirmation-default {
 	overflow: hidden;
 }
diff --git a/css/src/10sortorder.scss b/css/src/10sortorder.scss
index 25b7f09a..a2c44f82 100644
--- a/css/src/10sortorder.scss
+++ b/css/src/10sortorder.scss
@@ -52,6 +52,42 @@
 		cursor: pointer;
 		opacity: .57;
 
+		& > a span {
+			opacity: 1 !important;
+
+			&[class*=" icon-"] {
+				padding: 0;
+
+				&.icon-menu {
+					@extend .icon-menu;
+				}
+
+				&.icon-calendar {
+					@extend .icon-calendar;
+				}
+
+				&.icon-task-star {
+					@extend .icon-task-star;
+				}
+
+				&.icon-alphabetically {
+					@extend .icon-alphabetically;
+				}
+
+				&.icon-manual {
+					@extend .icon-manual;
+				}
+
+				&.icon-sort-up {
+					@extend .icon-sort-up;
+				}
+
+				&.icon-sort-down {
+					@extend .icon-sort-down;
+				}
+			}
+		}
+
 		a {
 			width: 100% !important;
 		}
diff --git a/css/style.scss b/css/style.scss
index 364afb6c..64f30608 100644
--- a/css/style.scss
+++ b/css/style.scss
@@ -191,62 +191,9 @@ $white: #fff;
 }
 
 /**
-	* rules for app-navigation-entry-menu
+	* rules for colorpicker
 	*/
 
-.app-navigation-entry-menu {
-	&.sortorder-dropdown li > a span {
-		opacity: 1 !important;
-
-		&[class*=" icon-"] {
-			padding: 0;
-
-			&.icon-menu {
-				@extend .icon-menu;
-			}
-
-			&.icon-calendar {
-				@extend .icon-calendar;
-			}
-
-			&.icon-task-star {
-				@extend .icon-task-star;
-			}
-
-			&.icon-alphabetically {
-				@extend .icon-alphabetically;
-			}
-
-			&.icon-manual {
-				@extend .icon-manual;
-			}
-
-			&.icon-sort-up {
-				@extend .icon-sort-up;
-			}
-
-			&.icon-sort-down {
-				@extend .icon-sort-down;
-			}
-		}
-	}
-
-	li > a {
-		&:not(:empty).confirmation-confirm {
-			padding-right: 0 !important;
-		}
-
-		span.countdown {
-			background-color: inherit;
-			color: $white;
-			display: block;
-			text-align: center;
-			filter: alpha(opacity=100) !important;
-			opacity: 1 !important;
-		}
-	}
-}
-
 .colorpicker {
 	display: block;
 	height: 30px;
@@ -283,6 +230,27 @@ $white: #fff;
 	}
 }
 
+/**
+	* rules for confirmation directive
+	*/
+
+.app-navigation-entry-menu {
+	li > a {
+		&:not(:empty).confirmation-confirm {
+			padding-right: 0 !important;
+		}
+
+		span.countdown {
+			background-color: inherit;
+			color: $white;
+			display: block;
+			text-align: center;
+			filter: alpha(opacity=100) !important;
+			opacity: 1 !important;
+		}
+	}
+}
+
 .confirmation-default {
 	overflow: hidden;
 }
@@ -1535,6 +1503,42 @@ td.ui-timepicker-hours table {
 		cursor: pointer;
 		opacity: .57;
 
+		& > a span {
+			opacity: 1 !important;
+
+			&[class*=" icon-"] {
+				padding: 0;
+
+				&.icon-menu {
+					@extend .icon-menu;
+				}
+
+				&.icon-calendar {
+					@extend .icon-calendar;
+				}
+
+				&.icon-task-star {
+					@extend .icon-task-star;
+				}
+
+				&.icon-alphabetically {
+					@extend .icon-alphabetically;
+				}
+
+				&.icon-manual {
+					@extend .icon-manual;
+				}
+
+				&.icon-sort-up {
+					@extend .icon-sort-up;
+				}
+
+				&.icon-sort-down {
+					@extend .icon-sort-down;
+				}
+			}
+		}
+
 		a {
 			width: 100% !important;
 		}