Skip to content
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

Tribes Townsquare #6495

Merged
merged 41 commits into from
May 1, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
fd2ed3a
fetch data
octavioamu Jun 20, 2019
0300d02
add data to row
octavioamu Jun 20, 2019
3301672
filter array
octavioamu Jun 24, 2019
bb37378
Merge branch 'master' into refactor-explorer
octavioamu Dec 12, 2019
c501516
fix bootstrap
octavioamu Dec 12, 2019
fb33b45
filters fixes
octavioamu Dec 16, 2019
283f71e
fix logic and styles
octavioamu Jan 4, 2020
0bb5fd8
fix style and condition
octavioamu Jan 7, 2020
4c4551a
wip tribes ts
androolloyd Apr 22, 2020
a7ecaeb
WIP, mvp features almost finished
androolloyd Apr 23, 2020
1d5368a
add suggested bounties, clean up some of the ui for the header details
androolloyd Apr 27, 2020
42c4e07
Add new cards for projects and grants
zoek1 Apr 23, 2020
a430ed2
Add cards fro projects and kudos
zoek1 Apr 23, 2020
0c28a99
WIP, updated for project and user directory tabs to work with tribes,…
androolloyd Apr 27, 2020
b3361bb
Add suggested profiles component
zoek1 Apr 27, 2020
d383087
Tab updates
androolloyd Apr 27, 2020
a19360b
fixed conflicts with settings changes
androolloyd Apr 28, 2020
ce05378
Tribes Launch Prep, header images are updating from the integrated view
androolloyd Apr 29, 2020
53e2414
suggested bounty modal implemented
androolloyd Apr 29, 2020
b5fbfe2
add gate for new tribes page to only gitcoinco
androolloyd Apr 29, 2020
bf6cf5c
removing mentions of chat from tribs js
androolloyd Apr 29, 2020
5f7f7a0
Merge branch 'master' of github.com:gitcoinco/web into HEAD
androolloyd Apr 29, 2020
5deebb3
restore the gate for saving a tribe
androolloyd Apr 29, 2020
aa4d874
fixes for no session requests
androolloyd Apr 29, 2020
a1a8715
invite to bounty is now locked behind org owners, not staff
androolloyd Apr 29, 2020
badcb77
follow tribes buttons are synchronized
androolloyd Apr 29, 2020
6ddc01b
Merge branch 'refactor-explorer' of github.com:gitcoinco/web into fea…
androolloyd Apr 29, 2020
39c6242
Debug statements removed, cleaned up all tabs, RC1
androolloyd Apr 30, 2020
266d541
Merge branch 'master' of github.com:gitcoinco/web into feature/tribes-ts
androolloyd Apr 30, 2020
9649556
restored tribe-edit.js to previous version as its not used by the new…
androolloyd Apr 30, 2020
b127c10
fixed a typo, restored missing variable from user-directory data
androolloyd Apr 30, 2020
588b811
recreated migrations, and cleanup
androolloyd Apr 30, 2020
062c29c
adding missing migration
androolloyd Apr 30, 2020
32e0381
use else if for filter
androolloyd Apr 30, 2020
7e5c8a2
add change to use .exists()
androolloyd Apr 30, 2020
7c20b8e
remove prettier depedency
androolloyd Apr 30, 2020
86a294f
Merge branch 'master' of github.com:gitcoinco/web into feature/tribes-ts
androolloyd Apr 30, 2020
d4853a4
Merge branch 'master' of github.com:gitcoinco/web into feature/tribes-ts
androolloyd Apr 30, 2020
6f714f2
Merge branch 'master' into feature/tribes-ts
androolloyd Apr 30, 2020
45b7dbb
Merge branch 'master' into feature/tribes-ts
androolloyd Apr 30, 2020
54fe055
Merge branch 'master' into feature/tribes-ts
danlipert May 1, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
81 changes: 81 additions & 0 deletions app/assets/v2/css/explorer.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
.bounty_row {
color: #000000;
text-decoration: none;
padding: 10px 1rem;
}

.bounty_row:hover {
color: #000000;
text-decoration: none;
background-color: #F9F9F9;
}

.hiring-alt {
font-size: 11px;
color: #4A90E2;
font-weight: 700;
letter-spacing: 1.7px;
}

.hackathon-alt {
font-size: 11px;
color: #0d0764;
font-weight: 600;
letter-spacing: 1.7px;
}

.hackathon-explorer .hackathon-alt {
display: none;
}

.status-open {
color: #00A652;
}

.status-reserved {
color: #d58512;
}

.status-started {
color: #0D0764;
}

.status-submitted {
color: #008EFF;
}

.status-done {
color: #666666;
}

.status-cancelled,
.status-expired {
color: #C70018;
}

.separator-bull {
margin: 0 0.6em;
}

.separator-bull:after {
content: '\2022'
}

.btn-expand-token {
position: absolute;
line-height: 1.5rem;
border: 0;
background-color: transparent;
font-weight: 400;
color: #007bff;
}

.btn-expand-token:focus {
color: #007bff;
}

.expired-icon {
font-size: 15px;
padding-right: 0.5em;
vertical-align: text-bottom;
}
45 changes: 45 additions & 0 deletions app/assets/v2/css/town_square.css
Original file line number Diff line number Diff line change
Expand Up @@ -1054,3 +1054,48 @@ body.green.offer_view .announce {
.promo .close-promo i {
font-weight: 100;
}

.new_grant {
border-top: 6px solid rgba(13, 7, 100, 0.25);
}

.new_kudos {
border-top: 6px solid rgba(0, 163, 255, 0.25);
}

.new_bounty {
border-top: 6px solid rgba(62, 0, 255, 0.4);
}

.new_hackathon_project {
border-top: 6px solid rgba(15, 206, 124, 0.25);
}

.bg-gc-blue {
background-color: var(--gc-blue);
}

.bg-gc-green {
background-color: var(--gc-green);
}

.bg-light-blue {
background-color: #00A3FF;
}

.bg-gc-dark-blue {
background-color: #0D0764;
}

.card-ribbon {
margin-top: -14px;
right: -10px;
width: 110px;
margin-bottom: 10px;
position: absolute;
}

.logo-metacard {
max-height: 4rem;
max-width: 4rem;
}
1 change: 0 additions & 1 deletion app/assets/v2/css/users.css
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,6 @@
}

.btn-search {
font-size: 1.3em;
background: white;
border-left: 0;
color: #3E00FF;
Expand Down
Loading