Merge branch 'master' into uploader

Conflicts:
	assets/min/main.css
This commit is contained in:
Tobias Reich 2014-07-26 15:59:19 +02:00
commit 7299637397
2 changed files with 2 additions and 1 deletions

View File

@ -24,6 +24,7 @@
z-index: 2;
}
#loading.error {
background-color: #2f0d0e;
background-image: linear-gradient(to right, #451317 0%, #451317 47%, #AA3039 53%, #AA3039 100%);
z-index: 1;
}

File diff suppressed because one or more lines are too long