Skip to content

Commit

Permalink
Merge pull request #5998 from gitcoinco/trib
Browse files Browse the repository at this point in the history
feat: update tribe landing page
  • Loading branch information
thelostone-mc authored Feb 20, 2020
2 parents 187e445 + a0220f0 commit 476adc5
Show file tree
Hide file tree
Showing 35 changed files with 499 additions and 361 deletions.
3 changes: 3 additions & 0 deletions app/app/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,10 @@
re_path(r'^legal/prirp/?', dashboard.views.prirp, name='prirp'),
re_path(r'^legal/apitos/?', dashboard.views.apitos, name='apitos'),
re_path(r'^legal/?', dashboard.views.terms, name='legal'),

# User Directory
re_path(r'^users/?', dashboard.views.users_directory, name='users_directory'),
re_path(r'^tribes/explore', dashboard.views.users_directory, name='tribes_directory'),

# Alpha functionality
re_path(r'^profile/(.*)/(.*)?', dashboard.views.profile, name='profile_by_tab'),
Expand Down
8 changes: 0 additions & 8 deletions app/assets/v2/css/bulk_payout_bounty.css
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,6 @@ tr div {
top: 2px;
}

.gc-green-text {
color: #0FCE7C;
}

.gc-blue-text {
color: #3E00FF;
}

.table-hover tbody tr:hover{
background-color: #FAFAFA;
}
Expand Down
8 changes: 8 additions & 0 deletions app/assets/v2/css/gitcoin.css
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,14 @@ h4,
color: #ffffff;
}

.gc-text-blue {
color: #3E00FF;
}

.gc-text-green {
color: #0FCE7C;
}

.text-black-60 {
color: rgba(0, 0, 0, 0.6)!important;
}
Expand Down
94 changes: 63 additions & 31 deletions app/assets/v2/css/retail/tribes_landing.css
Original file line number Diff line number Diff line change
Expand Up @@ -3,32 +3,15 @@
color: white;
}

.gc-green-text {
color: #0FCE7C;
}

.tribes-landing .title {
border-bottom: 5px solid;
}

.companies img {
height: 3.5rem;
transition: transform .25s;
}

.companies img:last-child {
margin-bottom: 0!important;
}

.companies img:hover {
transform: scale(1.25);
border-bottom: 7px solid;
}

.features {
max-width: 20rem;;
}

img {
.tribes-landing img {
max-width: 100%;
}

Expand All @@ -47,53 +30,102 @@ img {
top: 1px;
}

.plan {
min-height: 3rem;
}

.plan-header img {
height: 120px;
}

.testimonial-section {
background: #000;
.why-section {
background: #170640;
color: #fff;
}

.testimonial-section .square-1 {
top: 2rem;
.why-section .square-1 {
top: -9rem;
right: 0;
opacity: 0.2;
}

.testimonial-section .square-2 {
.why-section .square-2 {
height: 25rem;
top: 25rem;
opacity: 0.3;
}

.why-section .reasons img {
height: 2.2rem;
}

.zoom-on-hover {
transition: all .3s;
}

.testimonial-section .stats {
font-size: 3rem;
.zoom-on-hover:hover {
transform: scale(1.15);
}

.testimonial-section {
background: #F0F2F8;
}

.testimonial-section .testimonial-box {
border: 5px solid #0FCE7C;
border: 3px solid #3E00FF;
border-radius: 5px;
}

.testimonial-section .testimonial-box .img-container {
border: 6px solid #0FCE7C;
height: 4rem;
width: 4rem;
border: 2px solid #3E00FF;
height: 5rem;
width: 5rem;
top: -7px;
position: relative;
background: #fff;
}

.testimonial-section .testimonial-box .img-container.org-container {
left: -1rem;
}

.testimonial-section .testimonial-box .img-container.org-container img {
left: -2px;
top: 6px;
}

.testimonial-section .quote-container {
min-height: 9.8rem;
}

.testimonial-section .quote-text {
font-size: 1.3rem;
font-size: 1.2rem;
}

.testimonial-section img {
max-width: 5rem;
top: -5px;
background: white;
}

.testimonial-section .testimonial-photo-container {
top: -2rem;
left: 0;
right: 0;
}

#pro,
#pro h3,
#pro h2,
#pro .plan-header span {
background-color: #170640;
color: white;
}

.ribbon-green span {
background: #0FCE7C;
}

.tribes-section img {
height: 5rem;
}
4 changes: 4 additions & 0 deletions app/assets/v2/css/users.css
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@
}
}

.users .card-user .dropdown-menu {
min-width: 4rem;
}

.card-user {
font-size: 12px;
}
Expand Down
2 changes: 1 addition & 1 deletion app/assets/v2/images/tribes/how-it-works.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
17 changes: 1 addition & 16 deletions app/assets/v2/images/tribes/landing/abstract-square.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions app/assets/v2/images/tribes/landing/chat.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions app/assets/v2/images/tribes/landing/grow.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions app/assets/v2/images/tribes/landing/hackathon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions app/assets/v2/images/tribes/landing/payout.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 476adc5

Please sign in to comment.