Merge branch 'no-tagging-photos' of git://github.com/sembrestels/Tidypics

Conflicts:
	languages/de.php
	languages/en.php
	start.php
	views/default/forms/photos/admin/settings/main.php
	views/default/photos/css.php

1 files changed, 0 insertions, 99 deletions

diff --git a/views/default/photos/css.php b/views/default/photos/css.php
index 3f0218fdc..a92c35b3e 100644
--- a/views/default/photos/css.php
+++ b/views/default/photos/css.php
@@ -70,105 +70,6 @@
 	vertical-align: top;
 }
 
-/* ***************************************
-	Tagging
-*************************************** */
-.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;
-	text-align: center;
-}
-
-.tidypics-tagging-select {
-	position: absolute;
-	max-width: 300px;
-}
-
-.tidypics-tag-wrapper {
-	display: none;
-	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;
-}
-
-/* ***************************************
-	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;
-}
-
 <?php
 return true;
 ?>