Merge branch 'master' into attachment-handling

# Conflicts: # js/privatebin.js # tpl/bootstrap.php # tpl/page.php
2017-04-02 13:30:52 +02:00
parent b9737d368d f25ea35666
commit 096f07f86e
60 changed files with 4651 additions and 2100 deletions
--- a/css/bootstrap/privatebin.css
+++ b/css/bootstrap/privatebin.css
@@ -17,6 +17,10 @@ body.navbar-spacing {
 	padding-top: 70px;
 }

+body.loading {
+	cursor: wait;
+}
+
 .buttondisabled {
 	opacity: 0.3;
 }
@@ -115,6 +119,12 @@ body.navbar-spacing {
 	border-left: 1px solid #ccc;
 	padding: 5px 0 5px 10px;
 	white-space: pre-wrap;
+	transition: background-color 0.75s ease-out;
+}
+
+.comment.highlight {
+	background-color: #ffdd86;
+	transition: background-color 0.2s ease-in;
 }

 footer h4 {