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

edly-academy-ui-design-changes #9

Merged
merged 3 commits into from
May 30, 2024
Merged

edly-academy-ui-design-changes #9

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
7b88041
edly-academy-ui-design-changes
MubeenFayyaz-Arbisoft May 27, 2024
e9b90b8
edly academy comments resolved
MubeenFayyaz-Arbisoft May 30, 2024
810af87
edly academy extra file removed
MubeenFayyaz-Arbisoft May 30, 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
43 changes: 24 additions & 19 deletions layout/base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,24 @@
href="https://fonts.googleapis.com/css2?family=Inter:[email protected]&display=swap"
rel="stylesheet"
/>
<style>
regisb marked this conversation as resolved.
Show resolved Hide resolved
.hs-form-iframe-0 .hbspt-form input {
padding: 25px !important;
}
</style>
</head>

<body>
<div class="container">
<div class="navbar">
<a href="#" class="mobile-menu-link">
<img src="{{ URL_ROOT }}/static/images/bars-solid.svg" alt="menu" />
<img src="{{ URL_ROOT }}/static/images/hamburger-icon.svg" alt="menu" />
</a>
<div class="edly-logo-item">
<a class="edly-logo-link" href="{{ URL_ROOT }}">
<img
class="edly-logo"
src="{{ URL_ROOT }}/static/images/edly_logo.png"
src="{{ URL_ROOT }}/static/images/edly_logo.svg"
alt="edly academy"
/>
</a>
Expand All @@ -43,10 +48,10 @@
>
<img
class="github-image"
src="{{ URL_ROOT }}/static/images/github_logo.png"
src="{{ URL_ROOT }}/static/images/github_logo.svg"
alt="github"
/>
<p class="github-text">Edit on GitHub</p>
<span class="github-text">Edit on GitHub</span>
</a>
</div>
<div class="mobile-menu">
Expand All @@ -61,7 +66,7 @@
<a class="mobile-edly-logo-link" href="{{ URL_ROOT }}">
<img
class="mobile-edly-logo"
src="{{ URL_ROOT }}/static/images/edly_logo.png"
src="{{ URL_ROOT }}/static/images/edly_logo.svg"
alt="edly academy"
/>
</a>
Expand All @@ -78,10 +83,10 @@
>
<img
class="mobile-github-image"
src="{{ URL_ROOT }}/static/images/github_logo.png"
src="{{ URL_ROOT }}/static/images/github_logo.svg"
alt="github"
/>
<p class="mobile-github-text">Edit on GitHub</p>
<span class="mobile-github-text">Edit on GitHub</span>
</a>
</div>
</div>
Expand All @@ -91,23 +96,23 @@
<div class="footer">
<div class="footer-content">
<p class="email-label">
Get the latest resources, tips, and best practices directly in your
inbox
Get the latest resources, tips, <br />
and best practices directly in your inbox
</p>

<div class="footer-nav">
<p>Edly 2024 All rights reserved</p>
<p><a href="/privacy-policy/"> Privacy Policy </a></p>
<p><a href="/terms-and-conditions/">Terms & Conditions</a></p>
<div class="footer-bottom">
<ul class="footer-nav">
<li>Edly 2024 All rights reserved</li>
<li><a href="/privacy-policy/"> Privacy Policy </a></li>
<li><a href="/terms-and-conditions/">Terms & Conditions</a></li>
</ul>
<p class="footer-bottom-text">
edX and Open edX are registered trademarks of edX Inc
</p>
</div>
<p class="footer-bottom-text">
edX and Open edX are registered trademarks of edX Inc
</p>
</div>
</div>
</div>
{% block js %}{% endblock%}

<script
charset="utf-8"
type="text/javascript"
Expand Down Expand Up @@ -135,7 +140,7 @@
// email subscription form placement in the footer
const hubspotForm = document.querySelector(".hbspt-form");
const footerContent = document.querySelector(".footer-content");
const footerNav = document.querySelector(".footer-nav");
const footerNav = document.querySelector(".footer-bottom");
footerContent.insertBefore(hubspotForm, footerNav);

//set width of email subscription
Expand Down
16 changes: 9 additions & 7 deletions layout/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,11 @@ <h1 class="resources-heading">All Resources</h1>
<div class="filter">
<div class="filter-left">
<p class="filter-text">Filter by:</p>
<div class="filter-wrapper">
regisb marked this conversation as resolved.
Show resolved Hide resolved
<div class="filter-type">
<div id="resource-type-button" class="resource-type-label">
<p>Resource type</p>
<img class="arrow" src="{{ URL_ROOT }}/static/images/chevron-down-solid.svg" />
<p class="filter-dropdown">Resource type</p>
<img class="arrow" src="{{ URL_ROOT }}/static/images/chevron-down.svg" />
</div>
<ul class="resource-type-filter invisible" id="resource-type-filter">
{% for resource_type in RESOURCE_TYPES %}
Expand All @@ -23,8 +24,8 @@ <h1 class="resources-heading">All Resources</h1>
</div>
<div class="filter-type">
<div id="categories-button" class="categories-label">
<p>Topics</p>
<img class="arrow" src="{{ URL_ROOT }}/static/images/chevron-down-solid.svg" />
<p class="filter-dropdown">Topics</p>
<img class="arrow" src="{{ URL_ROOT }}/static/images/chevron-down.svg" />
</div>
<ul class="categories-filter invisible" id="categories-filter">
{% for category in CATEGORIES %}
Expand All @@ -36,6 +37,7 @@ <h1 class="resources-heading">All Resources</h1>
{% endfor %}
</ul>
</div>
</div>
</div>
</div>
<div id="resources" class="resources">
Expand All @@ -47,11 +49,11 @@ <h1 class="resources-heading">All Resources</h1>
href="{{ URL_ROOT }}/{{ resource.src }}" {% endif %}>
<div class="card-tag {% if resource.type == 'Video' %}orange{% else %}green{% endif %}">
{% if resource.type == "Video" %}
<img class="play" src="{{ URL_ROOT}}/static/images/play-solid.svg" alt="play">
<img class="play" src="{{ URL_ROOT}}/static/images/play-icon.svg" alt="play">
{% else %}
<img class="guide" src="{{ URL_ROOT}}/static/images/file-lines.svg" alt="file">
<img class="guide" src="{{ URL_ROOT}}/static/images/file-icon.svg" alt="file">
{% endif %}
<p class="card-tag-text">{{ resource.type }}</p>
<span class="card-tag-text">{{ resource.type }}</span>
</div>
{% if not resource.src %}
<div class='coming-soon-tag'>
Expand Down
Loading