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

CONCD-650 spacing issues #2289

Merged
merged 5 commits into from
Feb 22, 2024
+7 −5
Merged

CONCD-650 spacing issues #2289

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1cedb6a
Menu icon and X should be aligned with How to Guide header
rasarkar Feb 21, 2024
6a3cdfa
Navigation arrows <> should be aligned w/guide section title
rasarkar Feb 21, 2024
45be085
Reduce padding above Helpful links in About this Campaign guide section
rasarkar Feb 21, 2024
514d5fa
CONCD-651 ran pipenv update
rasarkar Feb 21, 2024
2959f8f
Merge branch 'main' into CONCD-650-rsar-spacing-issues
rasarkar Feb 22, 2024
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
2 changes: 2 additions & 0 deletions concordia/static/scss/base.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1091,6 +1091,7 @@ $card-progress-height: 12px;
#close-guide {
height: 30.5px;
margin: 0 1rem -1rem auto;
padding-top: 0.5rem;
}

.sidebar {
Expand Down Expand Up @@ -1133,6 +1134,7 @@ $card-progress-height: 12px;

#guide-bars {
color: #fff;
padding-top: 0.25rem;
}

.sidebar .close {
Expand Down
10 changes: 5 additions & 5 deletions concordia/templates/fragments/_how-to-guide.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<a id="guide-bars" data-target="#guide-carousel" data-slide-to="0" class="d-none" href="">
<i class="fas fa-solid fa-bars pl-3 py-2"></i>
</a>
<h3 class="px-2 my-1">How-To Guide</h3>
<h3 class="px-2 my-1 py-1">How-To Guide</h3>
<button id="close-guide" type="button" class="close text-white" onclick="closeOffcanvas()">
<span class="fas fa-times"></span>
</button>
Expand All @@ -27,7 +27,7 @@ <h3 class="px-2 my-1">How-To Guide</h3>
<div class="carousel-item container">
<div class="border-bottom justify-content-center mb-3 py-1 row">
<h3>About this Campaign</h3>
<a class="font-weight-bold ml-3" id="next-guide" href="#guide-carousel" data-slide="next">></a>
<a class="font-weight-bold ml-3 pt-2" id="next-guide" href="#guide-carousel" data-slide="next">></a>
</div>
{% if campaign.description %}
<h4>About this campaign</h4>
Expand All @@ -38,7 +38,7 @@ <h4>About this project</h4>
<p>{{ asset.item.project.description|safe }}</p>
{% endif %}
{% if campaign.resource_set.related_links %}
<h5 class="pt-4">Helpful Links</h5>
<h5 class="pt-3">Helpful Links</h5>
<p>
<ul>
{% for resource in campaign.resource_set.related_links %}
Expand All @@ -54,10 +54,10 @@ <h5 class="pt-4">Helpful Links</h5>
{% for guide in guides %}
<div class="carousel-item container" id="pane-{{ forloop.counter }}">
<div class="border-bottom justify-content-center mb-3 py-1 row">
<a class="font-weight-bold mr-3" id="previous-guide" href="#guide-carousel" data-slide="prev"><</a>
<a class="font-weight-bold mr-3 pt-2" id="previous-guide" href="#guide-carousel" data-slide="prev"><</a>
<h3>{{ guide.title }}</h3>
{% if not forloop.last %}
<a class="font-weight-bold ml-3" id="next-guide" href="#guide-carousel" data-slide="next">></a>
<a class="font-weight-bold ml-3 pt-2" id="next-guide" href="#guide-carousel" data-slide="next">></a>
{% endif %}
</div>
<div class="guide-body">
Expand Down