4 files changed, 72 insertions, 44 deletions

diff --git a/core/css/apps.css b/core/css/apps.css
index 104de91877f..32582a8026a 100644
--- a/core/css/apps.css
+++ b/core/css/apps.css
@@ -57,7 +57,7 @@
 #app-navigation li:hover > a,
 #app-navigation .selected,
 #app-navigation .selected a {
-	background-color: #ccc;
+	background-color: #ddd;
 }
 
 #app-navigation .with-icon a,
@@ -140,7 +140,7 @@
 }
 
 #app-navigation > ul .collapsible.open:hover {
-	box-shadow: inset 0 0 3px #ccc;
+	box-shadow: inset 0 0 3px #ddd;
 }
 
 #app-navigation > ul .collapsible.open ul {
@@ -148,6 +148,41 @@
 }
 
 
+/* Deleted entries with undo button */
+#app-navigation .app-navigation-entry-deleted {
+	display: inline-block;
+	height: 44px;
+	width: 100%;
+}
+
+	#app-navigation .app-navigation-entry-deleted-description {
+		padding-left: 12px;
+		position: relative;
+		white-space: nowrap;
+		text-overflow: ellipsis;
+		overflow: hidden;
+		display: inline-block;
+		width: 201px; /* fallback for IE8 */
+		width: calc(100% - 49px);
+		line-height: 44px;
+		float: left;
+	}
+
+	#app-navigation .app-navigation-entry-deleted-button {
+		margin: 0;
+		height: 44px;
+		width: 44px;
+		line-height: 44px;
+		border: 0;
+		display: inline-block;
+		background-color: transparent;
+		opacity: .5;
+	}
+
+	#app-navigation .app-navigation-entry-deleted-button:hover {
+		opacity: 1;
+	}
+
 /* counter and actions, legacy code */
 #app-navigation .utils {
 	position: absolute;
@@ -189,7 +224,6 @@
 	position: absolute;
 	top: 0;
 	right: 0;
-	bottom: 0;
 	z-index: 105;
 }
 
@@ -335,7 +369,8 @@
 	#app-navigation .app-navigation-entry-edit input {
 		border-bottom-right-radius: 0;
 		border-top-right-radius: 0;
-		width: 204px;
+		width: 204px; /* fallback for IE8 */
+		width: calc(100% - 36px);
 		padding: 5px;
 		margin-right: 0;
 		height: 38px;
@@ -371,7 +406,6 @@
 #app-content-wrapper {
 	min-width: 100%;
 	min-height: 100%;
-	overflow-y: auto;
 }
 
 
@@ -429,27 +463,6 @@
 	background-color: transparent;
 }
 
-/* icons */
-.folder-icon, .delete-icon, .edit-icon, .progress-icon {
-	background-repeat: no-repeat;
-	background-position: center;
-}
-.folder-icon { background-image: url('../img/places/folder.svg'); }
-.delete-icon { background-image: url('../img/actions/delete.svg'); }
-.delete-icon:hover, .delete-icon:focus {
-	background-image: url('../img/actions/delete-hover.svg');
-}
-.edit-icon { background-image: url('../img/actions/rename.svg'); }
-.progress-icon {
-	background-image: url('../img/loading.gif');
-	background-size: 16px;
-	/* force show the loading icon, not only on hover */
-	-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)";
-	filter:alpha(opacity=100);
-	opacity: 1 !important;
-	display: inline !important;
-}
-
 /* buttons */
 button.loading {
 	background-image: url('../img/loading.gif');
diff --git a/core/css/fixes.css b/core/css/fixes.css
index 12daf251579..5aba741b64b 100644
--- a/core/css/fixes.css
+++ b/core/css/fixes.css
@@ -105,3 +105,7 @@ select {
 	overflow-y: auto;
 }
 
+.ie8 #app-navigation .app-navigation-entry-edit input {
+	line-height: 38px;
+}
+
diff --git a/core/css/header.css b/core/css/header.css
index 36fe57bdc85..f83ef451ce6 100644
--- a/core/css/header.css
+++ b/core/css/header.css
@@ -18,7 +18,7 @@
 	top: 0;
 	left: 0;
 	right: 0;
-	z-index: 100;
+	z-index: 2000;
 	height: 45px;
 	line-height: 2.5em;
 	background-color: #1d2d44;
@@ -135,7 +135,7 @@
 	display: none;
 	overflow-y: auto;
 	overflow-x: hidden;
-	z-index: 5000;
+	z-index: 2000;
 }
 #navigation, #navigation * {
 	-moz-box-sizing:border-box;
@@ -265,7 +265,7 @@
 	position: absolute;
 	right: 0;
 	top: 45px;
-	z-index: 150;
+	z-index: 2000;
 	display: none;
 	background-color: #383c43;
 	border-bottom-left-radius:7px; border-bottom:1px #333 solid; border-left:1px #333 solid;
diff --git a/core/css/styles.css b/core/css/styles.css
index 8fc3973d42e..e8c58cff249 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -39,31 +39,32 @@ body {
 
 
 #nojavascript {
-	position: absolute;
+	position: fixed;
 	top: 0;
 	bottom: 0;
-	z-index: 999;
+	height: 100%;
 	width: 100%;
+	z-index: 9000;
 	text-align: center;
-	background-color: rgba(50,0,0,0.5);
-	color: white;
-	text-shadow: 0px 0px 5px black;
+	background-color: rgba(0,0,0,0.5);
+	color: #fff;
 	line-height: 125%;
-	font-size: x-large;
+	font-size: 24px;
 }
 #nojavascript div {
+	display: block;
+	position: relative;
 	width: 50%;
-	top: 40%;
-	position: absolute;
-	left: 50%;
-	margin-left: -25%;
+	top: 35%;
+	margin: 0px auto;
 }
 #nojavascript a {
-	color: #ccc;
-	text-decoration: underline;
+	color: #fff;
+	border-bottom: 2px dotted #fff;
 }
-#nojavascript a:hover {
-	color: #aaa;
+#nojavascript a:hover,
+#nojavascript a:focus {
+	color: #ddd;
 }
 
 
@@ -702,7 +703,7 @@ label.infield {
 #notification, #update-notification {
 	margin: 0 auto;
 	max-width: 60%;
-	z-index: 101;
+	z-index: 8000;
 	background-color: #fc4;
 	border: 0;
 	padding: 1px 8px;
@@ -812,6 +813,16 @@ span.ui-icon {float: left; margin: 3px 7px 30px 0;}
 	height: 16px;
 }
 
+/* ---- TOOLTIPS ---- */
+.extra-data {
+	padding-right: 5px !important;
+}
+.tipsy-inner {
+	max-width: 400px !important;
+	overflow: hidden;
+	text-overflow: ellipsis;
+}
+
 /* ---- TAGS ---- */
 #tagsdialog .content {
 	width: 100%; height: 280px;