Skip to content

Commit

Permalink
Merge pull request #5597 from gitcoinco/hackathon-fixes
Browse files Browse the repository at this point in the history
Hackathon changes
  • Loading branch information
octavioamu authored Dec 11, 2019
2 parents 5654ad6 + a3da05d commit 38f9972
Show file tree
Hide file tree
Showing 16 changed files with 1,362 additions and 187 deletions.
1 change: 1 addition & 0 deletions app/app/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,7 @@
path('hackathon-list/', dashboard.views.get_hackathons, name='get_hackathons'),
path('hackathon-list', dashboard.views.get_hackathons, name='get_hackathons2'),
url(r'^register_hackathon/', dashboard.views.hackathon_registration, name='hackathon_registration'),
path('api/v0.1/hackathon/<str:hackathon>/save/', dashboard.views.save_hackathon, name='save_hackathon'),

# action URLs
url(r'^funder', retail.views.funder_bounties_redirect, name='funder_bounties_redirect'),
Expand Down
2 changes: 1 addition & 1 deletion app/assets/v2/css/gitcoin.css
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ h4,
}

.gc-letter-spacing {
letter-spacing: 0.15em;
letter-spacing: 0.5rem;
}

div.button-pink {
Expand Down
29 changes: 1 addition & 28 deletions app/assets/v2/css/hackathons/explorer.css
Original file line number Diff line number Diff line change
Expand Up @@ -3,32 +3,6 @@
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 .hackathon-logo {
height: 18rem;
}

.banner .hackathon-header {
letter-spacing: 2px;
}

.banner .hackathon-name {
font-size: 2rem;
letter-spacing: 8px;
text-transform: uppercase;
border-bottom: 3px solid white;
}

.banner img:hover {
transform: scale(1.1);
}

.banner .sponsors-gold img {
height: 6rem;
margin: 1em;
Expand All @@ -43,7 +17,6 @@
margin-bottom: 1rem;
}


/* ETH Hack 2019 */
#ethhack_2019 .hackathon-name {
font-size: 3rem;
Expand All @@ -61,4 +34,4 @@

#grow-ethereum-2019 .text-white {
color: black !important; /* TODO: REMOVE */
}
}
Loading

0 comments on commit 38f9972

Please sign in to comment.