Merge branch 'webui-multipaste' into dev

1 files changed, 37 insertions, 0 deletions

diff --git a/public_html/data/css/style.css b/public_html/data/css/style.css
index 57366d3d6..166a00c12 100644
--- a/public_html/data/css/style.css
+++ b/public_html/data/css/style.css
@@ -42,6 +42,42 @@
 	height: 50px;
 }
 
+.multipasteQueue .items>div {
+	height: 190px;
+	display: inline-block;
+	width: 150px;
+	vertical-align: top;
+	margin: 0 1px 20px 1px;
+}
+
+.multipasteQueue .items .item {
+	height: 160px;
+}
+
+.nav li.multipaste_button a {
+	color: #fff;
+}
+
+.ajaxFeedback {
+	display: inline-block;
+}
+
+/* Source: http://stackoverflow.com/a/26283602 */
+.glyphicon.spinning {
+	animation: spin 1s infinite linear;
+	-webkit-animation: spin2 1s infinite linear;
+}
+
+@keyframes spin {
+	from { transform: scale(1) rotate(0deg); }
+	to { transform: scale(1) rotate(360deg); }
+}
+
+@-webkit-keyframes spin2 {
+	from { -webkit-transform: rotate(0deg); }
+	to { -webkit-transform: rotate(360deg); }
+}
+
 @media (max-width: 768px) {
 	.dont-float {
 		float: left;
@@ -324,6 +360,7 @@ body {
 	word-break: break-word;
 	word-wrap: normal;
 	max-width: 400px;
+	min-width: 250px
 }
 
 #upload_history .popover {