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 #6573

Merged
merged 31 commits into from
May 5, 2020
Merged
Show file tree
Hide file tree
Changes from 22 commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
2daff06
move the new vuew response higher up the request to improve performan…
androolloyd May 1, 2020
62b505a
lots of little things, layout changes, and margin/padding adjustments…
androolloyd May 1, 2020
80097da
quick layout fixes and some logo fixes
androolloyd May 1, 2020
fca4ce3
Some style updates to the manage page, wired in the fund and cancel b…
androolloyd May 2, 2020
f93660c
Handler for Window Popstate
androolloyd May 3, 2020
406d181
Add response profile cards to townaquare
zoek1 May 4, 2020
20c2c13
Add responsiv view for people
zoek1 May 4, 2020
93d5893
Revert "Revert "Tribes Townsquare (#6495)""
androolloyd May 4, 2020
2008078
move the new vuew response higher up the request to improve performan…
androolloyd May 1, 2020
b0819a3
lots of little things, layout changes, and margin/padding adjustments…
androolloyd May 1, 2020
d8c4229
quick layout fixes and some logo fixes
androolloyd May 1, 2020
6391d28
Some style updates to the manage page, wired in the fund and cancel b…
androolloyd May 2, 2020
c87d8db
Handler for Window Popstate
androolloyd May 3, 2020
fe5eca2
Add response profile cards to townaquare
zoek1 May 4, 2020
5a3ace2
Merge branch 'feature/tribes-ts-updates' into feature/responsive-tm
androolloyd May 4, 2020
19ff12e
Merge pull request #6562 from zoek1/feature/responsive-tm
androolloyd May 4, 2020
9864aff
re enable some of the tribe header information
androolloyd May 4, 2020
848ea5f
Tribes V1 RC1
androolloyd May 4, 2020
d369376
Fix conflicts with tribes
zoek1 May 4, 2020
fe4b1c5
Fix overlapping footer and cards
zoek1 May 4, 2020
1b6e8f4
Merge pull request #6563 from zoek1/feature/projects-responsive
androolloyd May 4, 2020
4226394
updated filters for mobile, RC2
androolloyd May 4, 2020
4148bc2
fix for the profile details v-if check
androolloyd May 5, 2020
95cbb47
small change for min width of the sidebars
androolloyd May 5, 2020
1ea8278
fix tooltip text
androolloyd May 5, 2020
90f5cde
fix for defects noticed around HackathonProjects vue keys
androolloyd May 5, 2020
7012b65
last minute fixes :(
androolloyd May 5, 2020
522a3b8
revert showing of the invite all button
androolloyd May 5, 2020
83a1e00
Merge branch 'master' into feature/tribes-ts-updates
androolloyd May 5, 2020
48157e4
fixes for keys
androolloyd May 5, 2020
c6e7b75
Merge branch 'feature/tribes-ts-updates' of github.com:gitcoinco/web …
androolloyd May 5, 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;
}
3 changes: 3 additions & 0 deletions app/assets/v2/css/profile.css
Original file line number Diff line number Diff line change
Expand Up @@ -207,10 +207,13 @@
.profile-header__avatar {
float: none;
margin-right: 0!important;
width: 81px;
height: 81px;
}

.profile-header__handle {
display: block;
padding-top: 0;
}

.profile-header__links li {
Expand Down
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