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

Jump to bottom

7703- Fixed spacing issues on product pages #7840

Merged
merged 3 commits into from
Nov 15, 2021
Merged

7703- Fixed spacing issues on product pages #7840

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1b4e578
7703- Fixed spacing issues on product pages
fessehaye Nov 12, 2021
d2dca20
fixes
fessehaye Nov 15, 2021
7c4e017
Merge branch 'main' into 7703-spacing
fessehaye Nov 15, 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
10 changes: 5 additions & 5 deletions network-api/networkapi/wagtailpages/templates/buyersguide/product_page.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
</div>
{% endif %}

<div class="bg-white py-3 tw-px-6">
<div class="bg-white tw-pb-4 tw-pt-5 tw-px-6">
<div class="row intro mb-4">
<div class="tw-flex tw-space-x-2 tw-flex-wrap tw-px-4 tw-mb-4">
{% for cat in product.product_categories.all %}
Expand Down Expand Up @@ -149,12 +149,12 @@ <h3 class="tw-mb-4 tw-font-zilla tw-text-2xl tw-leading-7 tw-flex tw-items-cente
<img src="{% static "_images/buyers-guide/icon-info-circle.svg" %}" alt="{% trans "information" context "icon description for screen readers" %}" class="tw-h-4 tw-w-4 tw-ml-2 tw-mb-1">
</a>
</h3>
<div class="row">
<div class="row tw-space-y-4 medium:tw-space-y-0">
{% trans "Camera" as camera %}
{% trans "Microphone" as microphone %}
{% trans "Tracks location" as tracks_location %}

<div class="col-12 col-md-4">
<div class="col-12 col-md-4 ">
{% include "fragments/it_uses.html" with title=camera device=product.camera_device app=product.camera_app %}
</div>
<div class="col-12 col-md-4">
Expand All @@ -170,7 +170,7 @@ <h3 class="tw-mb-4 tw-font-zilla tw-text-2xl tw-leading-7 tw-flex tw-items-cente
<section class="criterion">
<h3 class="tw-mb-4 tw-font-zilla tw-text-2xl tw-leading-7">{% trans "What can be used to sign up?" %}</h3>

<div class="row">
<div class="row tw-space-y-4 medium:tw-space-y-0">
{% trans "Email" as email %}
{% trans "Phone" as phone %}
{% trans "Third-party account" as third_party_account %}
Expand All @@ -194,7 +194,7 @@ <h3 class="tw-mb-4 tw-font-zilla tw-text-2xl tw-leading-7">{% trans "What can be
<section class="criterion">
<h3 class="tw-mb-4 tw-font-zilla tw-text-2xl tw-leading-7">{% trans "What data does the company collect?" %}</h3>

<div class="row">
<div class="row tw-space-y-4 medium:tw-space-y-0">
{% trans "Personal" as personal_data_collected %}
{% trans "Body related" as biometric_data_collected %}
{% trans "Social" as social_data_collected %}
Expand Down
3 changes: 2 additions & 1 deletion source/sass/buyers-guide/views/product.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
content: "";
position: absolute;
top: 24px;
right: 24px;
right: 32px;
background: url(../_images/buyers-guide/icon-privacy-ding.svg) center /
contain no-repeat;
width: 47px;
Expand All @@ -39,6 +39,7 @@
top: 40px;
width: 63px;
height: 80px;
right: 30px;
}

@at-root html[lang="de"] & {
Expand Down