Merge branch 'master' into og-reset-cookie

2013-09-20 21:04:56 +01:00
parent 905a192426 ce604ca20b
commit 49399301b9
23 changed files with 271 additions and 72 deletions
--- a/Netdisco/share/public/css/netdisco.css
+++ b/Netdisco/share/public/css/netdisco.css
@@ -200,6 +200,15 @@ td > form.nd_inline-form {
  color: #6D5720;
 }

+/* reset to normal weight for the download as CSV icon */
+#nd_csv-download {
+  font-weight: normal;
+}
+
+#nd_csv-download:hover {
+  text-decoration: none;
+}
+
 /* for the job control admin page play/pause links */
 #nd_countdown-refresh:hover, #nd_countdown-control:hover {
  text-decoration: none;