Skip to content

design updates and content-submit updates #101

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
MartinSchott merged 9 commits into from
Mar 3, 2022
Merged

design updates and content-submit updates #101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
434c17a
tile background
MartinSchott Feb 10, 2022
a3df70a
shadow for grid elements
MartinSchott Feb 10, 2022
117c23f
timeline lines
MartinSchott Feb 10, 2022
7828c1d
updated shadow
MartinSchott Feb 22, 2022
130ad3b
updated background tile
MartinSchott Feb 24, 2022
f941827
latest design ideas
MartinSchott Mar 3, 2022
d198a1e
Merge pull request #100 from ASKnetCommunity/dev-design-ideas
MartinSchott Mar 3, 2022
23016f9
design fix (white border for "add **" pics)
MartinSchott Mar 3, 2022
8378efd
updated content-submit overlays
MartinSchott Mar 3, 2022
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
15 changes: 6 additions & 9 deletions _data/sitetext.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ en: &DEFAULT_EN
<div class="col-md-2 col-7 text-left text-nowrap">using the <b>available resources.</b> </div>
</div>
'
submit: https://github.com/ASKnetCommunity/ASKnet.Community/issues/30
section: about
list:
- title: "Community"
Expand Down Expand Up @@ -89,18 +88,16 @@ en: &DEFAULT_EN
github: https://github.com/ASKtraining/Training
submit: https://github.com/ASKnetCommunity/ASKnet.Community/issues/33

tools:
title: "#ASKtools"
text: "---here is the asktools text---"
section: asktools
submit: https://github.com/ASKnetCommunity/ASKnet.Community/issues/55

resources:
title: "Resources"
text: "open educational training resources"
text: "While providing Access to Skills and Knowledge, our network shares all creations and open educational training resources."
section: resources
submit: https://github.com/ASKnetCommunity/ASKnet.Community/issues/56

tools:
title: "#ASKtools"
text: ""
section: asktools


lead:
title: "LEAD<br />Local Experts Action Directory"
Expand Down
26 changes: 15 additions & 11 deletions _includes/hubs_grid.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,33 +17,37 @@ <h2>We need content here!</h2>
<div class="row">
{% for project in site.hubs %}
<div class="col-md-4 col-sm-6 hubs-item">
<a class="hubs-link" data-toggle="modal" href="#p{{ forloop.index }}">
<div class="hubs-hover">
<div class="hubs-hover-content">
<i class="{{ site.data.style.hubs-icon | default: "fas fa-plus fa-3x" }}"></i>
<div class="shadow-box">
<a class="hubs-link" data-toggle="modal" href="#p{{ forloop.index }}">
<div class="hubs-hover">
<div class="hubs-hover-content">
<i class="{{ site.data.style.hubs-icon | default: " fas fa-plus fa-3x" }}"></i>
</div>
</div>
<img class="img-fluid hubs-img" src="{{ project.caption.thumbnail }}" alt="">
</a>
<div class="hubs-caption">
<h4>{{ project.caption.title }}</h4>
<p class="text-muted">{{ project.caption.subtitle }}</p>
</div>
<img class="img-fluid" src="{{ project.caption.thumbnail }}" alt="">
</a>
<div class="hubs-caption">
<h4>{{ project.caption.title }}</h4>
<p class="text-muted">{{ project.caption.subtitle }}</p>
</div>
</div>
{% endfor %}
<div class="col-md-4 col-sm-6 hubs-item">
<a class="hubs-link" target="_blank" href="https://github.com/ASKnetCommunity/ASKnet.Community/issues/new?assignees=&labels=content-submit%2Cnew-hub&template=new-hub.yml&title=Add+Hub%3A+">
<div class="shadow-box">
<a class="hubs-link" target="_blank" href="https://github.com/ASKnetCommunity/ASKnet.Community/issues/new?assignees=&labels=content-submit%2Cnew-hub&template=new-hub.yml&title=Add+Hub%3A+">
<div class="hubs-hover">
<div class="hubs-hover-content">
<i class="{{ site.data.style.hubs-icon | default: "fas fa-plus fa-3x" }}"></i>
</div>
</div>
<img class="img-fluid" src="assets/img/hubs/00-new-hub.jpg" alt="">
<img class="img-fluid border border-light hubs-img" src="assets/img/hubs/00-new-hub.jpg" alt="">
</a>
<div class="hubs-caption">
<h4>Add new Hub</h4>
<p class="text-muted">you can register your hub here</p>
</div>
</div>
</div>
</div>
</div>
Expand Down
24 changes: 14 additions & 10 deletions _includes/resources_grid.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,22 +17,25 @@ <h2>We need content here!</h2>
<div class="row">
{% for project in site.resources %}
<div class="col-md-4 col-sm-6 hubs-item">
<a class="hubs-link" href="{{ project.link }}" target="_blank">
<div class="hubs-hover">
<div class="hubs-hover-content">
<i class="fas fa-external-link-alt"></i>
<div class="shadow-box">
<a class="hubs-link" href="{{ project.link }}" target="_blank">
<div class="hubs-hover">
<div class="hubs-hover-content">
<i class="fas fa-external-link-alt"></i>
</div>
</div>
<img class="img-fluid tools-img" src="{{ project.thumbnail }}" alt="">
</a>
<div class="hubs-caption">
<h4>{{ project.title }}</h4>
<p class="text-muted">{{ project.subtitle }}</p>
</div>
<img class="img-fluid tools-img" src="{{ project.thumbnail }}" alt="">
</a>
<div class="hubs-caption">
<h4>{{ project.title }}</h4>
<p class="text-muted">{{ project.subtitle }}</p>
</div>
</div>
{% endfor %}
<div class="col-md-4 col-sm-6 hubs-item">
<a class="hubs-link" target="_blank" href="https://github.com/ASKnetCommunity/ASKnet.Community/issues/new?assignees=&labels=content-submit%2Cnew-resource&template=add-resource.yml&title=Add+Resource%3A+">
<div class="shadow-box">
<a class="hubs-link" target="_blank" href="https://github.com/ASKnetCommunity/ASKnet.Community/issues/new?assignees=&labels=content-submit%2Cnew-resource&template=add-resource.yml&title=Add+Resource%3A+">
<div class="hubs-hover">
<div class="hubs-hover-content">
<i class="{{ site.data.style.hubs-icon | default: "fas fa-plus fa-3x" }}"></i>
Expand All @@ -44,6 +47,7 @@ <h4>{{ project.title }}</h4>
<h4>Add new resource</h4>
<p class="text-muted">you can propose a resource here</p>
</div>
</div>
</div>
</div>
</div>
Expand Down
28 changes: 16 additions & 12 deletions _includes/tools_grid.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<div class="row">
<div class="col-lg-12 text-center{% if site.data.sitetext[site.locale].tools.submit %} sc{% endif %}">
<h2 class="section-heading text-uppercase">{{ site.data.sitetext[site.locale].tools.title | markdownify | default: "Tools" }}</h2>
<h3 class="section-subheading text-muted">{{ site.data.sitetext[site.locale].tools.text | markdownify }}</h3>
<h3 class="section-subheading">{{ site.data.sitetext[site.locale].tools.text | markdownify }}</h3>
{% if site.data.sitetext[site.locale].tools.submit %}
<div class="sc-overlay">
<h2>We need content here!</h2>
Expand All @@ -17,33 +17,37 @@ <h2>We need content here!</h2>
<div class="row">
{% for tool in site.tools %}
<div class="col-md-4 col-sm-6 hubs-item">
<a class="hubs-link" href="{{ tool.link }}" target="_blank">
<div class="hubs-hover">
<div class="hubs-hover-content">
<i class="fas fa-external-link-alt"></i>
<div class="shadow-box">
<a class="hubs-link" href="{{ tool.link }}" target="_blank">
<div class="hubs-hover">
<div class="hubs-hover-content">
<i class="fas fa-external-link-alt"></i>
</div>
</div>
<img class="img-fluid tools-img" src="{{ tool.thumbnail }}" alt="">
</a>
<div class="hubs-caption">
<h4>{{ tool.title }}</h4>
<p class="text-muted">{{ tool.subtitle }}</p>
</div>
<img class="img-fluid tools-img" src="{{ tool.thumbnail }}" alt="">
</a>
<div class="hubs-caption">
<h4>{{ tool.title }}</h4>
<p class="text-muted">{{ tool.subtitle }}</p>
</div>
</div>
{% endfor %}
<div class="col-md-4 col-sm-6 hubs-item">
<a class="hubs-link" target="_blank" href="https://github.com/ASKnetCommunity/ASKnet.Community/issues/new?assignees=&labels=content-submit%2Cnew-asktool&template=add-tool.yml&title=Add+%23ASKtool%3A+">
<div class="shadow-box">
<a class="hubs-link" target="_blank" href="https://github.com/ASKnetCommunity/ASKnet.Community/issues/new?assignees=&labels=content-submit%2Cnew-asktool&template=add-tool.yml&title=Add+%23ASKtool%3A+">
<div class="hubs-hover">
<div class="hubs-hover-content">
<i class="{{ site.data.style.hubs-icon | default: "fas fa-plus fa-3x" }}"></i>
</div>
</div>
<img class="img-fluid tools-img" src="assets/img/hubs/00-new-hub.jpg" alt="">
<img class="img-fluid border border-light tools-img" src="assets/img/hubs/00-new-hub.jpg" alt="">
</a>
<div class="hubs-caption">
<h4>Add new tool</h4>
<p class="text-muted">you can propose a tool here</p>
</div>
</div>
</div>
</div>
</div>
Expand Down
12 changes: 12 additions & 0 deletions _sass/base/_page.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,18 @@ a {
}
.bg-primary {
background-color: $primary !important;
background: url(../../assets/img/tile-orange.jpg);
// background-attachment: fixed;
}

.bg-light {
background: url(../../assets/img/tile-light.jpg);
}

.bg-dark {
// background-color: $primary !important;
background: url(../../assets/img/tile-dark.jpg);
// background-attachment: fixed;
}

h1,
Expand Down
10 changes: 9 additions & 1 deletion _sass/layout/_hubs.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,10 @@
#hubs, #asktools, #resources {
.hubs-item {
right: 0;
margin: 0 0 15px;
margin: 0 0 30px;
.shadow-box {
box-shadow: 5px 5px 0px 0px rgba(0, 0, 0, 0.1);
}
.hubs-link {
position: relative;
display: block;
Expand All @@ -14,6 +17,11 @@
width: 100%;
object-fit: cover;
}
.hubs-img{
height: 245px;
width: 100%;
object-fit: cover;
}
.hubs-hover {
position: absolute;
width: 100%;
Expand Down
16 changes: 12 additions & 4 deletions _sass/layout/_timeline.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
top: 0;
bottom: 0;
left: 40px;
width: 2px;
margin-left: -1.5px;
width: 7px;
margin-left: -3.5px;
content: "";
background-color: $gray-200;
background-color: white;
}
> li {
position: relative;
Expand Down Expand Up @@ -53,7 +53,7 @@
margin-left: 0;
text-align: center;
color: $white;
border: 7px solid $gray-200;
border: 7px solid white;
border-radius: 100%;
background-color: $primary;
h4 {
Expand Down Expand Up @@ -89,6 +89,14 @@
color: inherit;
&.subheading {
text-transform: none;
&:before {
position: absolute;
top: 0;
left: 440px;
height: 7px;
content: "";
background-color: white;
}
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion assets/css/client-scroll.css.map
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion assets/css/client-scroll.min.css.map
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added assets/img/tile-dark.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/img/tile-light.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/img/tile-orange.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.