Merge branch 'jquery-uploader' of git://github.com/sembrestels/Tidypics

Conflicts:
	start.php
	views/default/photos/css.php

1 files changed, 92 insertions, 0 deletions

diff --git a/vendors/jquery-file-upload/css/style.css b/vendors/jquery-file-upload/css/style.css
new file mode 100644
index 000000000..6ed82e679
--- /dev/null
+++ b/vendors/jquery-file-upload/css/style.css
@@ -0,0 +1,92 @@
+@charset 'UTF-8';
+/*
+ * jQuery File Upload Plugin CSS Example 1.1
+ * https://github.com/blueimp/jQuery-File-Upload
+ *
+ * Copyright 2012, Sebastian Tschan
+ * https://blueimp.net
+ *
+ * Licensed under the MIT license:
+ * http://www.opensource.org/licenses/MIT
+ */
+
+body {
+  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-size: 13px;
+  line-height: 18px;
+  width: 960px;
+  margin: 10px auto;
+}
+a {
+  color: #08C;
+  text-decoration: none;
+}
+a:hover,
+.active a {
+  color: #005580;
+  text-decoration: underline;
+}
+td {
+  padding: 5px;
+}
+img {
+  border: 0;
+}
+.nav-collapse,
+ul.nav,
+ul.nav li {
+  display: inline-block;
+  margin-right: 10px;
+}
+.navbar .brand {
+  font-size: 16px;
+}
+.row {
+  zoom: 1;
+}
+.row:before, .row:after {
+  display: table;
+  content: "";
+}
+.row:after {
+  clear: both;
+}
+.span5 {
+  width: 400px;
+  float: left;
+}
+.span7 {
+  width: 560px ;
+  float: left;
+}
+
+/* Fix for IE 6: */
+*html .nav-collapse,
+*html ul.nav,
+*html ul.nav li {
+  display: inline;
+}
+*html .navbar-fixed-top {
+  margin-bottom: 35px;
+}
+
+/* Fix for IE 7: */
+*+html .nav-collapse,
+*+html ul.nav,
+*+html ul.nav li {
+  display: inline;
+}
+*+html .navbar-fixed-top {
+  margin-bottom: 35px;
+}
+
+@media (max-width: 980px) {
+  body {
+    width: auto;
+    padding: 10px;
+  }
+  .span5,
+  .span7 {
+    width: auto;
+  }
+}