Skip to content

Commit

Permalink
stable -> master (#6647)
Browse files Browse the repository at this point in the history
* automates the pulling of codefund numbers for /results page, and update export script for electric capital

* gas upper limit increase

* css fixes

* css: update button style

* css: manage tab fixes for tribes

* css: fix manage section

* bug: tribe follow button

* bug: fix weird css button

* change bg to white

* replace logos (#6614)

* master -> stable (#6619)

* Implement new landing design (#6460)

* Implement new landing design

* swap tribe and index pages

* fix style lint

* Implement requested changes on home tribe

* Update views.py

* Change tribes name

* Fix route name

* Update home.css

* Update home.css

* Update how it works and sales CTA

* Update tribes page

* Remove pin sections

* Add url for contact page

* Replace images

Co-authored-by: Aditya Anand M C <[email protected]>
Co-authored-by: Octavio Amuchástegui <[email protected]>

* tribe landing fixes

* fix link

Co-authored-by: Octavio Amuchástegui <[email protected]>
Co-authored-by: Miguel Angel Gordián <[email protected]>

* meh shit work

* fix placeholder

* small layout fix

* fix strech logo and visuals

* adds fb pixel to bounty details page + tracks a start work action

* css fixes

* adds hours worked to bounties GMV

* fixes leaderboard legend, so that it maximizes information available"

* import fix

* remove nav from quests

* remove include fbpixer as is injected via gtm

* fix users cards stay open

* moves results page update to top, more maximum credibiliyt

* copy update

* Revert "remove include fbpixer as is injected via gtm"

This reverts commit 11b660d.

* fix for tip post save

* fix for MultipleObjectsReturned: get() returned more than one TribeMember -- it returned 2
gs
gp

* tips prefill with ETH as suggested token

* typo

* raw data = blank field

* fix kudos missing data FE side

* admin fix

* adds index to searchresutls/earnings field so saves arent super slow anymore

* patches around the url getter perf issues

* bounty update, dont tell github immediately do it in a task

* prevent blocking people start working if they use track blockers

* automigrate deadbeat quests

* bumps up num start works

* small footer tweaks

* change hackathon sidebar and post links to go TS

* add missing migration

* fix bug preventing login into admin with superuser

Co-authored-by: owocki <[email protected]>
Co-authored-by: Octavio Amuchástegui <[email protected]>
Co-authored-by: Miguel Angel Gordián <[email protected]>
Co-authored-by: Dan Lipert <[email protected]>
  • Loading branch information
5 people authored May 13, 2020
1 parent e01e800 commit 3ed5a35
Show file tree
Hide file tree
Showing 79 changed files with 808 additions and 5,877 deletions.
2 changes: 1 addition & 1 deletion app/app/context.py
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ def preprocess(request):

# town square wall post max length
max_length_offset = abs(
((request.user.profile.created_on if request.user.is_authenticated else timezone.now()) - timezone.now()).days
((request.user.profile.created_on if hasattr(request.user, 'profile') and request.user.is_authenticated else timezone.now()) - timezone.now()).days
)
max_length = 600 + max_length_offset

Expand Down
1 change: 1 addition & 0 deletions app/assets/onepager/js/send.js
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,7 @@ $(document).ready(function() {
$('#token').append(html);
}
});
$('#token').val('0x0000000000000000000000000000000000000000').select2();
jQuery('#token').select2();
});

Expand Down
4 changes: 0 additions & 4 deletions app/assets/v2/css/base.css
Original file line number Diff line number Diff line change
Expand Up @@ -194,10 +194,6 @@ a {
overflow-x: hidden;
}

.interior #logo {
margin-top: -5px;
}

.interior .header {
background-size: cover;
}
Expand Down
4 changes: 4 additions & 0 deletions app/assets/v2/css/colors.css
Original file line number Diff line number Diff line change
Expand Up @@ -125,3 +125,7 @@ html.dark-mode {
.text-medium-dark-grey {
color: var(--gc-medium-dark-gray);
}

.text-black {
color: #000;
}
7 changes: 0 additions & 7 deletions app/assets/v2/css/quests.css
Original file line number Diff line number Diff line change
Expand Up @@ -438,13 +438,6 @@ body.quest_battle p {
border: none !important;
}

#explore_quests img {
max-width: 30px;
max-height: 30px;
margin-top: -10px;
margin-left: -10px;
}

#enemy.character img {
width: 250px;
height: 250px;
Expand Down
4 changes: 4 additions & 0 deletions app/assets/v2/css/retail/tribes_landing.css
Original file line number Diff line number Diff line change
Expand Up @@ -139,3 +139,7 @@
height: auto !important;
}
}

.newsletter {
border-top: none !important;
}
20 changes: 10 additions & 10 deletions app/assets/v2/css/top-nav.css
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,14 @@


.top-nav a {
padding: 0.3rem 0.62rem;
filter: grayscale(1);
opacity: 0.6;
transition: all 0.2s linear;
}

.top-nav a.selected {
filter: grayscale(0);
opacity: 0.8;
}

.top-nav .link {
Expand All @@ -23,10 +30,7 @@


.top-nav a img {
filter: grayscale(1);
opacity: 0.6;
transition: all 0.2s linear;
height: 40px;
height: 30px;
}

@media (min-width: 768px) {
Expand All @@ -39,17 +43,13 @@
border: none;
padding: 0;
}

.top-nav a img {
height: auto;
}
}
.top-nav a:hover img,
.top-nav a.selected img {
/* opacity: 1; */
}

.top-nav a:hover img {
.top-nav a:hover {
filter: grayscale(0);
opacity: 1;
}
Expand Down
5 changes: 2 additions & 3 deletions app/assets/v2/css/town_square.css
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@ body {

.offer_container, .promo {
background: var(--gc-dark-violet);
padding: 1em;
padding: 1em 1.5em;
color: white;
display: flex;
border-radius: 3px;
Expand Down Expand Up @@ -1009,9 +1009,7 @@ body.green.offer_view .announce {
}
}


.promo .logo {
height: 55px;
width: 65px;
display: flex;
align-items: center;
Expand Down Expand Up @@ -1048,6 +1046,7 @@ body.green.offer_view .announce {
right: 29px;
font-size: 16px;
color: white;
cursor: pointer;
opacity: 1;
}

Expand Down
5,587 changes: 64 additions & 5,523 deletions app/assets/v2/images/results/length.svg
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
13 changes: 13 additions & 0 deletions app/assets/v2/images/top-bar/bounties-neg.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
13 changes: 13 additions & 0 deletions app/assets/v2/images/top-bar/bounties-pos.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 11 additions & 0 deletions app/assets/v2/images/top-bar/bounties-symbol-neg.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 11 additions & 0 deletions app/assets/v2/images/top-bar/bounties-symbol-pos.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 3ed5a35

Please sign in to comment.