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.

Sign up for GitHub

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

#679 - new issue responsive updates #735

Merged
merged 2 commits into from
Apr 2, 2018
Merged

#679 - new issue responsive updates #735

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ab7cfc0
Updating styles for new issue form to make it more responsive.
joshmobley Mar 23, 2018
ae981e4
updating indent from 4 spaces to 2 as requested by mbeacom
joshmobley Mar 26, 2018
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
25 changes: 19 additions & 6 deletions app/assets/v2/css/base.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -488,20 +488,26 @@ input[type=text].loading {
-o-filter: grayscale(100%);
}

#primary_form {
max-width: 500px;
margin: 0 auto;
padding: 0 4em;
}

#primary_form img {
max-width: 100px;
}

.bounty_nav {
border-bottom: 2px solid #212529;
padding-bottom: 4px;
padding: 0;
display: flex;
justify-content: space-around;
}

.bounty_nav li {
display: inline;
margin-left: 30px;
margin-right: 30px;
margin-bottom: 5px;
padding: 5px;
border-top-right-radius: 5px;
border-top-left-radius: 5px;
Expand Down Expand Up @@ -1117,7 +1123,7 @@ input.is-invalid {
}

#gitcoinTestimonials{
height:288px;
height:288px;
width:500px;
}

Expand Down Expand Up @@ -1245,7 +1251,7 @@ input.is-invalid {
}
@media (max-width: 769px) {
#gitcoinTestimonials{
height:202px;
height:202px;
width:350px;
}

Expand Down Expand Up @@ -1366,10 +1372,17 @@ input.is-invalid {
display: none;
}
}

@media (max-width: 540px) {
#primary_form {
max-width: 100%;
}
}

@media (max-width: 481px) {

#gitcoinTestimonials{
height:144px;
height:144px;
width:250px;
}
.tldr_container img {
Expand Down
11 changes: 11 additions & 0 deletions app/assets/v2/css/forms/form.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,3 +36,14 @@
.form__footer--right {
text-align: right;
}

@media (max-width: 540px) {
.form__group {
flex-direction: column;
}

.form__group-item {
margin-bottom: 1em;
width: 100%;
}
}
94 changes: 47 additions & 47 deletions app/dashboard/templates/shared/bounty_nav.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,54 +1,54 @@
{% comment %}
Copyright (C) 2017 Gitcoin Core
Copyright (C) 2017 Gitcoin Core

This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published
by the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published
by the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.

This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Affero General Public License for more details.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Affero General Public License for more details.

You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.

{% endcomment %}

<div class="w-100" style="text-align: center;">
<ol class="bounty_nav">
<li class="{% if active_item == 1 %}active{%endif%} submit" >
1.
{% if past_tense %}
Open
{%else%}
Create Work
{%endif%}
</li>
<li class="{% if active_item == 2 %}active{%endif%} fulfill">
2.
{% if past_tense %}
Work Started
{%else%}
Start Work
{%endif%}
</li>
<li class="{% if active_item == 3 %}active{%endif%} fulfill">
3.
{% if past_tense %}
Work Submitted
{%else%}
Submit Work
{%endif%}
</li>
<li class="{% if active_item == 4 %}active{%endif%} accept">
4.
{% if past_tense %}
Work Done
{%else%}
Accept Work
{%endif%}
</li>
</ol>
</div>
<div class="w-100" style="text-align: center;">
<ol class="bounty_nav">
<li class="{% if active_item == 1 %}active{%endif%} submit" >
1.
{% if past_tense %}
Open
{%else%}
Create Work
{%endif%}
</li>
<li class="{% if active_item == 2 %}active{%endif%} fulfill">
2.
{% if past_tense %}
Work Started
{%else%}
Start Work
{%endif%}
</li>
<li class="{% if active_item == 3 %}active{%endif%} fulfill">
3.
{% if past_tense %}
Work Submitted
{%else%}
Submit Work
{%endif%}
</li>
<li class="{% if active_item == 4 %}active{%endif%} accept">
4.
{% if past_tense %}
Work Done
{%else%}
Accept Work
{%endif%}
</li>
</ol>
</div>
7 changes: 4 additions & 3 deletions app/dashboard/templates/submit_bounty.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,16 @@
<div class="container-fluid header dash">
{% include 'shared/nav.html' %}
</div>

<div class="row no-gutter">
<div class="col-12 body">
<div class="container-fluid no-gutter">
<div class="row font-smaller-2" id="form_container">
{% include 'shared/no_metamask_error.html' %}
{% include 'shared/zero_balance_error.html' %}
{% include 'shared/unlock_metamask.html' %}
<div class="col offset-md-1 col-md-10 d-flex align-items-center justify-content-center" id="primary_form">
<div class="d-flex justify-content-center flex-column mt-5 w-50" id="primary_subform">
<div id="primary_form">
<div class="d-flex justify-content-center flex-column mt-5" id="primary_subform">
<form id="submitBounty">
{% include 'shared/bounty_nav.html' with active_item=1 %}
<div class="w-100" style="text-align: center;">
Expand Down Expand Up @@ -95,7 +96,7 @@ <h3>Fund an Issue</h3>
</select>
</div>
</div>
<div class="w-100 mt-2 d-flex ">
<div class="w-100 mt-2 d-flex">
<div class="w-50 mt-2 mr-3 d-flex flex-column">
<label class="form__label">Issue Details</label>
</div>
Expand Down