-
-
Notifications
You must be signed in to change notification settings - Fork 775
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
feat: hackathon explorer background + sponsor is dynamic #4831
Merged
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
f2f6ed8
chore: css fixes on featured bounties
thelostone-mc c0f2b12
feat: hackathon explorer background + sponsor is dynamic
thelostone-mc ed1bb83
refactor: cleanup unused code
thelostone-mc 52c7bad
isort fixes
thelostone-mc e75325e
Merge branch 'master' into hackathon
danlipert File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,117 +1,51 @@ | ||
.banner .img-holder { | ||
|
||
.banner { | ||
background: linear-gradient(161deg, rgba(55,27,181,1) 37%, rgba(255,51,117,1) 100%); | ||
} | ||
|
||
.banner img { | ||
margin: 1em; | ||
align-items: center; | ||
display: flex; | ||
transition: all .2s ease-in-out; | ||
} | ||
|
||
.banner .img-holder--dark { | ||
background-color:#333; | ||
} | ||
|
||
.banner .img-holder--light { | ||
background-color:#eee; | ||
} | ||
|
||
.banner .sponsors-gold .img-holder { | ||
width: 113px; | ||
height: 113px; | ||
padding: 1em; | ||
} | ||
|
||
.banner .sponsors-silver .img-holder { | ||
width: 75px; | ||
height: 75px; | ||
padding: 0.8em; | ||
} | ||
|
||
.banner .img-holder:hover { | ||
transform: scale(1.1); | ||
} | ||
|
||
.ui-tooltip { | ||
padding-top: 6px; | ||
padding-bottom: 6px; | ||
} | ||
|
||
.ui-tooltip-content { | ||
font-size: 0.75rem; | ||
font-weight: 600; | ||
} | ||
|
||
.banner { | ||
background: linear-gradient(161deg, rgba(55,27,181,1) 37%, rgba(255,51,117,1) 100%); | ||
} | ||
|
||
.banner .hackathon-logo { | ||
max-width: 40rem; | ||
} | ||
|
||
.banner .img-holder { | ||
width: 113px; | ||
height: 113px; | ||
padding: 1em; | ||
} | ||
|
||
.banner .hackathon-name { | ||
font-size: 3rem; | ||
font-size: 4rem; | ||
letter-spacing: 12px; | ||
line-height: 72px; | ||
text-transform: uppercase; | ||
} | ||
|
||
/* Beyond Blockchain 2019 */ | ||
#beyondblockchain_2019 { | ||
background: #121315; | ||
} | ||
|
||
#beyondblockchain_2019 .hackathon-name { | ||
font-size: 4rem; | ||
} | ||
|
||
#beyondblockchain_2019 .sponsors-gold img, | ||
#beyondblockchain_2019 .sponsors-silver img { | ||
width: 12rem; | ||
} | ||
|
||
#beyondblockchain_2019 img.Alethio, | ||
#beyondblockchain_2019 img.Arweave { | ||
height: 3.5rem; | ||
width: auto; | ||
.banner img:hover { | ||
transform: scale(1.1); | ||
} | ||
|
||
#beyondblockchain_2019 .img-holder { | ||
width: auto; | ||
height: auto; | ||
padding: 0; | ||
.banner .sponsors-gold img { | ||
width: 11rem; | ||
margin: 1em; | ||
} | ||
|
||
#beyondblockchain_2019 .sponsors-gold img { | ||
max-height: 6rem; | ||
.banner .sponsors-silver img { | ||
width: 7.5rem; | ||
margin: 0.8em; | ||
} | ||
|
||
#beyondblockchain_2019 .sponsors-gold { | ||
.banner .sponsors-gold { | ||
margin-bottom: 1rem; | ||
} | ||
|
||
#beyondblockchain_2019 img.Pegasys { | ||
height: 4rem; | ||
position: relative; | ||
top: 1rem; | ||
} | ||
|
||
#beyondblockchain_2019 img.Portis { | ||
height: 3rem; | ||
position: relative; | ||
top: 1.5rem; | ||
} | ||
|
||
#beyondblockchain_2019 img.Alethio, | ||
#beyondblockchain_2019 img.TheGraph { | ||
height: 4.5rem; | ||
/* ETH Hack 2019 */ | ||
#ethhack_2019 .hackathon-name { | ||
font-size: 3rem; | ||
} | ||
|
||
#beyondblockchain_2019 img.TheGraph { | ||
position: relative; | ||
top: -.4rem; | ||
} | ||
/* Beyond Blockchain 2019 */ | ||
#beyondblockchain_2019 { | ||
background: #121315; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,66 @@ | ||
# Generated by Django 2.1.7 on 2019-07-19 22:16 | ||
|
||
from django.db import migrations, models | ||
import django.db.models.deletion | ||
import economy.models | ||
|
||
|
||
class Migration(migrations.Migration): | ||
|
||
dependencies = [ | ||
('dashboard', '0041_auto_20190718_1222'), | ||
] | ||
|
||
operations = [ | ||
migrations.CreateModel( | ||
name='HackathonSponsor', | ||
fields=[ | ||
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), | ||
('created_on', models.DateTimeField(db_index=True, default=economy.models.get_time)), | ||
('modified_on', models.DateTimeField(default=economy.models.get_time)), | ||
('sponsor_type', models.CharField(choices=[('G', 'Gold'), ('S', 'Silver')], default='G', max_length=1)), | ||
], | ||
options={ | ||
'abstract': False, | ||
}, | ||
), | ||
migrations.CreateModel( | ||
name='Sponsor', | ||
fields=[ | ||
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), | ||
('created_on', models.DateTimeField(db_index=True, default=economy.models.get_time)), | ||
('modified_on', models.DateTimeField(default=economy.models.get_time)), | ||
('name', models.CharField(help_text='sponsor Name', max_length=255)), | ||
('logo', models.ImageField(blank=True, help_text='sponsor logo', upload_to='')), | ||
('logo_svg', models.FileField(blank=True, help_text='sponsor logo svg', upload_to='')), | ||
], | ||
options={ | ||
'abstract': False, | ||
}, | ||
), | ||
migrations.AddField( | ||
model_name='hackathonevent', | ||
name='background_color', | ||
field=models.CharField(blank=True, help_text='hexcode for the banner', max_length=255, null=True), | ||
), | ||
migrations.AlterField( | ||
model_name='hackathonevent', | ||
name='identifier', | ||
field=models.CharField(default='', help_text='used for custom styling for the banner', max_length=255), | ||
), | ||
migrations.AddField( | ||
model_name='hackathonsponsor', | ||
name='hackathon', | ||
field=models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, to='dashboard.HackathonEvent'), | ||
), | ||
migrations.AddField( | ||
model_name='hackathonsponsor', | ||
name='sponsor', | ||
field=models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, to='dashboard.Sponsor'), | ||
), | ||
migrations.AddField( | ||
model_name='hackathonevent', | ||
name='sponsors', | ||
field=models.ManyToManyField(through='dashboard.HackathonSponsor', to='dashboard.Sponsor'), | ||
), | ||
] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
blank=True to make it not required?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
default = '' would never make it blank :P