Merge pull request #53 from IcyNet/bugfixes

Bugfixes
This commit is contained in:
Evert Prants 2017-12-11 09:25:08 +02:00 committed by GitHub
commit 5809838f35
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 1 deletions

View File

@ -66,7 +66,7 @@ class Show(TimestampedModel):
storage=show_static_storage, storage=show_static_storage,
upload_to = name_banner, upload_to = name_banner,
help_text="A banner used for the show's page.", help_text="A banner used for the show's page.",
verbose_name="Artwork" verbose_name="Banner"
) )
def __str__(self): def __str__(self):
return '%s [%s]'%(self.name,self.abbr) return '%s [%s]'%(self.name,self.abbr)
@ -132,6 +132,7 @@ class Ban(TimestampedModel):
) )
scope = models.ManyToManyField( scope = models.ManyToManyField(
Show, Show,
blank=True,
help_text='The shows this user is banned from interacting with', help_text='The shows this user is banned from interacting with',
verbose_name='Banned From', verbose_name='Banned From',
related_name='bans' related_name='bans'

View File

@ -63,6 +63,9 @@ input[type=text], input:not([type=submit]) {
max-width: 180px; max-width: 180px;
max-height: 260px; max-height: 260px;
} }
.show-promo span {
display: block;
}
.blocklayout .block { .blocklayout .block {
margin: 15px; margin: 15px;
box-shadow: 2px 2px 5px #9c9c9c; box-shadow: 2px 2px 5px #9c9c9c;

View File

@ -1,3 +1,4 @@
Django==1.11.4 Django==1.11.4
Pillow==4.2.1 Pillow==4.2.1
dj-database-url==0.4.2 dj-database-url==0.4.2
requests==2.18.4