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

Update top banners in different bounty flow pages #1365

Merged
merged 9 commits into from
Jun 7, 2018

Conversation

SaptakS
Copy link
Contributor

@SaptakS SaptakS commented Jun 4, 2018

Description
  • Fix banner text alignments and fix max-width for the banner image
  • Add upper left current ballance label
  • Remove bounty navigation from accept bounty and submit work pages.
Checklist
  • linter status: 100% pass
  • changes don't break existing behavior
  • commit message follows commit guidelines
Affected core subsystem(s)
Testing
Refers/Fixes

@ghost ghost assigned SaptakS Jun 4, 2018
@ghost ghost added the in progress label Jun 4, 2018
@codecov
Copy link

codecov bot commented Jun 4, 2018

Codecov Report

Merging #1365 into master will decrease coverage by 0.35%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #1365      +/-   ##
==========================================
- Coverage   30.64%   30.29%   -0.36%     
==========================================
  Files         124      125       +1     
  Lines        8790     9025     +235     
  Branches     1141     1158      +17     
==========================================
+ Hits         2694     2734      +40     
- Misses       5988     6182     +194     
- Partials      108      109       +1
Impacted Files Coverage Δ
app/dashboard/signals.py 54.54% <0%> (-3.79%) ⬇️
app/retail/emails.py 21.23% <0%> (-1.68%) ⬇️
app/dashboard/router.py 33.67% <0%> (-1.07%) ⬇️
app/dashboard/views.py 15.69% <0%> (-1.04%) ⬇️
app/dashboard/notifications.py 16.52% <0%> (-0.52%) ⬇️
app/marketing/mails.py 12.08% <0%> (-0.31%) ⬇️
...pp/economy/management/commands/refresh_bounties.py 0% <0%> (ø) ⬆️
app/marketing/management/commands/pull_stats.py 0% <0%> (ø) ⬆️
app/app/urls.py 94.28% <0%> (ø) ⬆️
.../management/commands/pending_start_work_actions.py 0% <0%> (ø)
... and 4 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 3febe8d...958a7c6. Read the comment docs.

@SaptakS SaptakS changed the title Update top banners in different bounty flow pages WIP: Update top banners in different bounty flow pages Jun 4, 2018
@SaptakS SaptakS added the wip label Jun 4, 2018
@SaptakS SaptakS removed the wip label Jun 4, 2018
- {% trans "or" %} -
<br>
<a class="button button--primary mt-3 pulseClick" role="button" id="submit" href="{% url 'faucet' %}" target="_blank" rel="noopener noreferrer">{% trans "View Faucet" %}</a>
<br><br>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

wanna swap this out by padding mb-2 to <a> ?

<div class="row no-gutters">
<div class="col-sm-12 col-lg-3">
<div class="row no-gutters metamask-banner">
<div class="col-sm-12 col-lg-2">
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

❤️

</p>
</div>
<div class="col-lg-2 col-sm-12">
<img src="{% static "v2/images/Box.svg" %}">
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

rename to box.svg cause I guess that's what we've been doing soo far in this repo

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well, there are mixed namings, so I didn't refactor. If you want, I will.

<?xml version="1.0" encoding="UTF-8"?>
<svg width="97px" height="92px" viewBox="0 0 97 92" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 49 (51002) - http://www.bohemiancoding.com/sketch -->
<title>Metamask Copy 3</title>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We'll want to squash this with svgo.

<?xml version="1.0" encoding="UTF-8"?>
<svg width="97px" height="92px" viewBox="0 0 97 92" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 49 (51002) - http://www.bohemiancoding.com/sketch -->
<title>Metamask Copy 4</title>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And this one - 💃

@SaptakS SaptakS changed the title WIP: Update top banners in different bounty flow pages Update top banners in different bounty flow pages Jun 4, 2018
@ghost ghost assigned thelostone-mc Jun 4, 2018
@thelostone-mc
Copy link
Member

@mbeacom renamed files and compressed them

mbeacom
mbeacom previously approved these changes Jun 5, 2018
@mbeacom mbeacom added mergeable frontend This needs frontend expertise. and removed in review labels Jun 5, 2018
@mbeacom mbeacom removed the mergeable label Jun 5, 2018
@owocki
Copy link
Contributor

owocki commented Jun 5, 2018

didnt test but LGTM .

Copy link
Member

@thelostone-mc thelostone-mc left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM :D

@thelostone-mc thelostone-mc merged commit c217aa0 into gitcoinco:master Jun 7, 2018
@ghost ghost removed the in progress label Jun 7, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
frontend This needs frontend expertise.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants