Skip to content

Commit 291f45c

Browse files
authored
Merge pull request #684 from GSTT-CSC/674-merge-articles-and-workshops
674 merge articles and workshops
2 parents c1c1d3a + a94acae commit 291f45c

18 files changed

+25
-70
lines changed

_includes/blog-articles.html

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@
99
<img src="{{post.image}}" alt="card__image" class="card__image" width="350px" height= "300px" style="object-fit: cover" >
1010

1111
</div>
12+
<div class="label">
13+
<h6>{{post.category}}</h6>
14+
</div>
1215
<div class="card__body">
1316
<h4>{{post.title}}</h4>
1417
<p>{{post.tag-line}}</p>

_includes/blog-workshops.html

Lines changed: 0 additions & 32 deletions
This file was deleted.

_includes/subnav-blog.html

Lines changed: 0 additions & 25 deletions
This file was deleted.

_layouts/blog.html

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
layout: default
33
---
44
{% include nav.html %}
5-
{% include subnav-blog.html %}
65

76
{% if page.background == "grey" or page.background == "gray" %}
87
<script>

_layouts/blogpost.html

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
layout: default
33
---
44
{% include nav.html %}
5-
{% include subnav-blog.html %}
65

76
{% if page.background == "grey" or page.background == "gray" %}
87
<script>

_pages/articles.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
layout: blog
3-
title: Articles
3+
title: Articles and Blogs
44
permalink: /articles.html
55
---
66

_pages/workshops.md

Lines changed: 0 additions & 9 deletions
This file was deleted.

_sass/components/_card.scss

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,4 +112,15 @@ background: linear-gradient(to bottom, #ef473a, #cb2d3e);
112112
.user__info > small {
113113
color: #666;
114114
}
115+
116+
.label {
117+
display: flex;
118+
margin-top: 10px;
119+
margin-left: 15px;
120+
padding: .25em 0.75em;
121+
font-size: .75rem;
122+
align-self: flex-start;
123+
border-radius: 5px;
124+
background-color: lightblue;
125+
}
115126
}

blogs/workshops/_posts/2021-03-17-10x-Workshop1.md renamed to blogs/articles/_posts/2021-03-17-10x-Workshop1.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ image: /assets/img/blog/WS-1-bigben.jpg
99
author: Lucy Funnell
1010
author-image: /assets/img/blog/Lucy.jpg
1111
author-role: AI Project Manager
12-
category: Article
12+
category: Workshop
1313
---
1414

1515
## Project Process Mapping

blogs/workshops/_posts/2021-06-02-10x-RacialBias.md renamed to blogs/articles/_posts/2021-06-02-10x-RacialBias.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ image: /assets/img/blog/racial_bias.jpg
88
author: Dika Vilic
99
author-image: /assets/img/team/Dika.jpg
1010
author-role: Clinical Scientist in AI
11+
category: Workshop
1112
---
1213

1314
The CSC team held a workshop on racial bias in AI and strategies to combat it on 2nd June 2021. As part of the

0 commit comments

Comments
 (0)