Skip to content

Service section design changes #474

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

Merged
nijel merged 21 commits into from
Mar 1, 2021
Merged

Service section design changes #474

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
cde96d7
About page - added team section
muzammalrahim Jan 20, 2021
8586925
About page - added team section
muzammalrahim Jan 21, 2021
eb3085f
About page - added team section
muzammalrahim Jan 22, 2021
680b874
User page - service section design changes
muzammalrahim Feb 1, 2021
62bf774
Merge remote-tracking branch 'upstream/master' into service_section_d…
muzammalrahim Feb 1, 2021
a93891b
User page - service section design changes-update
muzammalrahim Feb 2, 2021
94d3e12
User page - service section design changes-update
muzammalrahim Feb 3, 2021
558b0f5
User page - service section design changes-update
muzammalrahim Feb 3, 2021
9b0b8be
User page - service section design changes-update-final fixes
muzammalrahim Feb 5, 2021
4d8f211
Models.py localization and formatting
muzammalrahim Feb 9, 2021
707b5b3
fix indentation issue in models file
AyazYousafxai Feb 23, 2021
84fd340
Merge remote-tracking branch 'upstream/master' into service_section_d…
AyazYousafxai Feb 24, 2021
8aa34cd
merge with upstream, fix indentation
AyazYousafxai Feb 24, 2021
eae119e
merge with upstream, fix indentation and css class name change
AyazYousafxai Feb 25, 2021
5fe7e4e
merge with upstream, fix indentation and css class name change
AyazYousafxai Feb 25, 2021
9f5d0ad
extra lines remove
AyazYousafxai Feb 26, 2021
10b48e9
eslint failed
AyazYousafxai Feb 26, 2021
e6fbb44
end-of-file-fixer
AyazYousafxai Feb 26, 2021
5102608
end-of-file-fixer
AyazYousafxai Mar 1, 2021
909abd5
end-of-file-fixer
AyazYousafxai Mar 1, 2021
c362388
end-of-file-fixer
AyazYousafxai Mar 1, 2021
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
6 changes: 6 additions & 0 deletions weblate_web/static/style-rtl.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4525,3 +4525,9 @@ input.fullwidth {
.style7 {
height: 86px;
}

/* User.html CSS(Payments section updated) */

.payment-updated {
display: flow-root;
}
21 changes: 16 additions & 5 deletions weblate_web/static/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3076,7 +3076,6 @@ input.button.make-payment {
.form-line:last-child {
border-bottom: none;
border-top: 1px solid #e9eaec;

}

.form-line > div {
Expand Down Expand Up @@ -4459,7 +4458,7 @@ input.fullwidth {
width: auto;
}

.inner-content-child2 img{
.inner-content-child2 img {
max-height: 267px;
max-width: 192px;
float: right;
Expand Down Expand Up @@ -4503,7 +4502,7 @@ input.fullwidth {
color: #2c3548 !important;
}

.style7 t{
.style7 t {
font-size: 18px;
line-height: 30px;
padding-left: 0px !important;
Expand All @@ -4512,6 +4511,18 @@ input.fullwidth {
letter-spacing: 0;
}

.style7{
.style7 {
height: 86px;
}
}

/* User.html CSS(Payments section updated) */

.payment-updated {
display: flow-root;
}

/* bottom.html CSS(Donation Box Adjustment) */

.donation-box-updated {
display: flex;
}

@nijel nijel Feb 5, 2021

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Can you please just change the existing CSS instead of introducing yet another one? We want the styles to be maintainable in the long term and this is not a way to do that...

2 changes: 1 addition & 1 deletion weblate_web/templates/snippets/bottom.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{% load i18n %}
<section class="bottom {{ extra_css }}">
<div class="row">
<div class="row donation-box-updated">

@nijel nijel Feb 9, 2021

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Please revert this change and do it in a separate PR.

@muzammalrahim muzammalrahim Feb 10, 2021

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

I have already changed that Michal, i haven't created separate PR yet. I am trying to fix the support boxes using flex and once i am done, i will create a separate PR for that.

{% include "snippets/box-join.html" %}
{% include "snippets/box-donate.html" %}
</div>
Expand Down
2 changes: 2 additions & 0 deletions weblate_web/templates/user.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ <h1>{% trans "My donations" %}</h1>
<img src="{% static "img/donations-picture.png" %}" alt="Puppy">
</div>
</div>
<div class="payment-updated">
<div class="form-line style2 style7">
<div class="line-left">{% trans "Payments" %}</div>
<div class="line-right ">
Expand All @@ -101,6 +102,7 @@ <h1>{% trans "My donations" %}</h1>
</div>
</div>
</div>
</div>
{% empty %}

<div class="payment-form-donationbox">
Expand Down