1 files changed, 42 insertions, 136 deletions

diff --git a/views/default/photos/css.php b/views/default/photos/css.php
index 2290e1f9a..8fd64fd0f 100644
--- a/views/default/photos/css.php
+++ b/views/default/photos/css.php
@@ -18,6 +18,7 @@
 }
 .elgg-module-tidypics-image {
 	margin: 5px auto;
+	height: 80%;
 }
 
 .tidypics-gallery-widget > li {
@@ -42,6 +43,7 @@
 #tidypics-sort li {
 	width:153px;
 	height:153px;
+	cursor: move;
 }
 
 .tidypics-river-list > li {
@@ -71,161 +73,65 @@
 }
 
 /* ***************************************
-	Tagging
+	UPLOADER
 *************************************** */
-.tidypics-tagging-border1 {
-	border: solid 2px white;
-}
-
-.tidypics-tagging-border1, .tidypics-tagging-border2,
-.tidypics-tagging-border3, .tidypics-tagging-border4 {
-    filter: alpha(opacity=50);
-	opacity: 0.5;
-}
 
-.tidypics-tagging-handle {
-    background-color: #fff;
-    border: solid 1px #000;
-    filter: alpha(opacity=50);
-    opacity: 0.5;
-}
-
-.tidypics-tagging-outer {
-    background-color: #000;
-    filter: alpha(opacity=50);
-    opacity: 0.5;
-}
-
-.tidypics-tagging-help {
-	position: absolute;
-	left: 50%;
-	top: -25px;
-	width: 250px;
-	margin-left: -125px;
+.fileinput-container {
 	text-align: center;
 }
-
-.tidypics-tagging-select {
-	position: absolute;
-	max-width: 300px;
+.fileinput-button {
+	cursor: pointer;
 }
-
-.tidypics-tag-wrapper {
-	display: none;
+.fileinput-button input {
 	position: absolute;
-}
-
-.tidypics-tag {
-	border: 2px solid white;
-	clear: both;
-}
-
-.tidypics-tag-label {
-	float: left;
-	margin-top: 5px;
-	color: #666;
-}
-
-/* ***************************************
-	Tagging
-*************************************** */
-#tidypics_uploader {
-	position:relative;
-	width:400px;
-	min-height:20px;
-}
-
-#tidypics_choose_button {
-	position:absolute;
-	top:0;
-	left:0;
-	z-index:0;
-	display:block;
-	float:left;
-}
+	top: 0;
+	right: 0;
+	margin: 0;
+	opacity: 0;
+	filter: alpha(opacity=0);
 
-#tidypics_flash_uploader {
-	position:relative;
-	z-index:100;
 }
-
-/* ***************************************
-	AJAX UPLOADER
-*************************************** */
-#tidypics-uploader-steps {
-	list-style: none;
-}
-
-#tidypics-uploader-steps li a {
-	font-weight:bold;
-}
-
-.tidypics-choose-button-hover {
-	color:#0054a7;
-	text-decoration:underline;
-}
-
-.tidypics-disable {
-	color:#cccccc;
-}
-
-.tidypics-disable:hover {
-color:#cccccc;
-text-decoration:none;
+.files .fade {
+  display: none;
 }
-
-
-.uploadifyQueueItem {
-background-color:#F5F5F5;
-border:2px solid #E5E5E5;
-font-size:11px;
-margin-top:5px;
-padding:10px;
-width:350px;
+/* Fix for IE 6: */
+*html .fileinput-button {
+  margin-right: -2px;
 }
-
-.uploadifyProgress {
-background-color:#FFFFFF;
-border-color:#808080 #C5C5C5 #C5C5C5 #808080;
-border-style:solid;
-border-width:1px;
-margin-top:10px;
-width:100%;
+*html .fileinput-button .elgg-button {
+  line-height: 24px;
 }
-
-.uploadifyProgressBar {
-background-color: #0054a7;
-width: 1px;
-height: 3px;
+*html .fileupload-buttonbar .elgg-button {
+  margin-left: 3px;
 }
 
-#tidypics-uploader {
-	position:relative;
-	width:400px;
-	min-height:20px;
+/* Fix for IE 7: */
+*+html .fileinput-button {
+  margin-right: 1px;
 }
-
-#tidypics-choose-button {
-position:absolute;
-top:0;
-left:0;
-z-index:0;
-display:block;
-float:left;
+*+html .fileinput-button .elgg-button {
+  line-height: 24px;
 }
-
-#tidypics-flash-uploader {
-position:relative;
-z-index:100;
+*+html .fileupload-buttonbar .elgg-button {
+  margin-left: 3px;
 }
 
-.uploadifyQueueItem .cancel {
-	float: right;
+@media (max-width: 480px) {
+  .files .preview * {
+    width: 40px;
+  }
+  .files .name * {
+    width: 80px;
+    display: inline-block;
+    word-wrap: break-word;
+  }
 }
 
-.uploadifyError {
-border: 2px solid #FBCBBC;
-background-color: #FDE5DD;
+/* Fix for Webkit (Safari, Chrome) */
+@media screen and (-webkit-min-device-pixel-ratio:0) {
+  .fileinput-button {
+    margin-top: 2px;
+  }
 }
 
 <?php