Merge pull request #92 from electerious/2.1

v2.1

.gitignore

@@ -6,7 +6,9 @@ data/config.php
 uploads/import/*
 uploads/big/*
 uploads/thumb/*
+plugins/*
 
 !uploads/import/index.html
 !uploads/big/index.html
-!uploads/thumb/index.html
+!uploads/thumb/index.html
+!plugins/check.php

assets/css/modules/content.css → assets/css/content.css

@@ -4,6 +4,7 @@
  * @copyright   2014 by Tobias Reich
  */
 
+/* Gradient ------------------------------------------------*/
 #content::before {
 	content: "";
 	position: absolute;
@@ -26,6 +27,7 @@
 	position: absolute;
 	padding: 50px 0px 33px 0px;
 	width: 100%;
+	min-height: calc(100% - 90px);
 	-webkit-overflow-scrolling: touch;
 }
 
@@ -114,8 +116,11 @@
 		background: -ms-linear-gradient(top, rgba(0,0,0,0) 0%,rgba(0,0,0,0) 20%,rgba(0,0,0,0.9) 100%); /* IE10+ */
 		background: linear-gradient(top, rgba(0,0,0,0) 0%,rgba(0,0,0,0) 20%,rgba(0,0,0,0.9) 100%); /* W3C */
 	}
-	.photo .overlay {
-		background: rgba(0, 0, 0, .6);
+	.photo .overlay {		
+		background: -moz-linear-gradient(top, rgba(0,0,0,0) 0%, rgba(0,0,0,0) 60%, rgba(0,0,0,0.5) 80%, rgba(0,0,0,0.9) 100%); /* FF3.6+ */
+		background: -webkit-linear-gradient(top, rgba(0,0,0,0) 0%, rgba(0,0,0,0) 60%, rgba(0,0,0,0.5) 80%, rgba(0,0,0,0.9) 100%); /* Chrome10+,Safari5.1+ */
+		background: -ms-linear-gradient(top, rgba(0,0,0,0) 0%, rgba(0,0,0,0) 60%, rgba(0,0,0,0.5) 80%, rgba(0,0,0,0.9) 100%); /* IE10+ */
+		background: linear-gradient(top, rgba(0,0,0,0) 0%, rgba(0,0,0,0) 60%, rgba(0,0,0,0.5) 80%, rgba(0,0,0,0.9) 100%); /* W3C */
 		opacity: 0;
 	}
 	.photo:hover .overlay,

assets/css/modules/font.css → assets/css/font.css

@@ -23,8 +23,8 @@
     */
 @font-face {
   font-family: 'FontAwesome';
-  src: url('../../font/fontawesome-webfont.eot');
-  src: url('../../font/fontawesome-webfont.eot?#iefix') format('eot'), url('../../font/fontawesome-webfont.woff') format('woff'), url('../../font/fontawesome-webfont.ttf') format('truetype'), url('../../font/fontawesome-webfont.svg#FontAwesome') format('svg');
+  src: url('../font/fontawesome-webfont.eot');
+  src: url('../font/fontawesome-webfont.eot?#iefix') format('eot'), url('../font/fontawesome-webfont.woff') format('woff'), url('../font/fontawesome-webfont.ttf') format('truetype'), url('../font/fontawesome-webfont.svg#FontAwesome') format('svg');
   font-weight: normal;
   font-style: normal;
 }

assets/css/modules/infobox.css → assets/css/infobox.css

@@ -27,10 +27,6 @@
 	-moz-transform: translateX(320px);
 	transform: translateX(320px);
 
-	-webkit-user-select: text;
-	-moz-user-select: text;
-	user-select: text;
-
 	-webkit-transition: -webkit-transform .5s cubic-bezier(.225,.5,.165,1);
 	-moz-transition: -moz-transform .5s cubic-bezier(.225,.5,.165,1);
 	transition: transform .5s cubic-bezier(.225,.5,.165,1);
@@ -121,6 +117,10 @@
 		color: #fff;
 		font-size: 14px;
 		line-height: 19px;
+
+		-webkit-user-select: text;
+		-moz-user-select: text;
+		user-select: text;
 	}
 	#infobox table tr td:first-child {
 		width: 110px;
@@ -131,10 +131,24 @@
 
 	/* Tags ------------------------------------------------*/
 	#infobox #tags {
-		margin: 20px 20px 15px 20px;
+		width: calc(100% - 40px);
+		margin: 16px 20px 12px 20px;
 		color: #fff;
 		display: inline-block;
 	}
+	#infobox #tags .empty {
+		font-size: 14px;
+		margin-bottom: 8px;
+	}
+
+		#infobox #tags .edit {
+			display: inline-block;
+		}
+
+		#infobox #tags .empty .edit {
+			display: inline;
+		}
+
 	#infobox .tag {
 		float: left;
 		padding: 4px 7px;
@@ -156,7 +170,7 @@
 		padding: 0px;
 		margin: 0px 0px -2px 0px;
 		color: red;
-		font-size: 12px;
+		font-size: 11px;
 		cursor: pointer;
 		overflow: hidden;
 		-webkit-transform: scale(0);

assets/css/modules/misc.css → assets/css/misc.css

@@ -7,9 +7,6 @@
 html,
 body {
 	min-height: 100%;
-	-webkit-user-select: none;
-	-moz-user-select: none;
-	user-select: none;
 }
 body {
 	background-color: #222;
@@ -29,7 +26,15 @@ body.view {
 	top:50%;
 }
 * {
+	-webkit-user-select: none;
+	-moz-user-select: none;
+	user-select: none;
 	-webkit-transition: color .3s, opacity .3s ease-out, -webkit-transform .3s ease-out, box-shadow .3s;
 	-moz-transition: opacity .3s ease-out, -moz-transform .3s ease-out, box-shadow .3s;
 	transition: color .3s, opacity .3s ease-out, transform .3s ease-out, box-shadow .3s;
+}
+input {
+	-webkit-user-select: text !important;
+	-moz-user-select: text !important;
+	user-select: text !important;
 }

assets/css/multiselect.css

@@ -0,0 +1,13 @@
+/**
+ * @name        multiselect.css
+ * @author      Tobias Reich
+ * @copyright   2014 by Tobias Reich
+ */
+
+#multiselect {
+	position: absolute;
+	background-color: rgba(0, 94, 204, .3);
+	border: 1px solid rgba(0, 94, 204, 1);
+	border-radius: 3px;
+	z-index: 3;
+}