Skip to content
This repository was archived by the owner on Feb 5, 2022. It is now read-only.

Commit b9cd381

Browse files
authored
Merge branch 'develop' into fix/perf-payload
2 parents ee70dcd + 5c1a81a commit b9cd381

File tree

22 files changed

+496
-413
lines changed

22 files changed

+496
-413
lines changed

CHANGELOG.md

Lines changed: 203 additions & 143 deletions
Large diffs are not rendered by default.

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ If you are a community member who would like to take part of our paid (yes, we s
2626

2727
# Website Development
2828

29-
The OpenForge.io website is built using a combination of [Stencil.js](https://stenciljs.com/) by our friends at [Ionic Framework](https://ionicframework.com/) anbd Bootstrap for styling.
29+
The OpenForge.io website is built using a combination of [Stencil.js](https://stenciljs.com/) by our friends at [Ionic Framework](https://ionicframework.com/) and Bootstrap for styling.
3030

3131
### Setup
3232
```

src/components/app-blog-card/app-blog-card.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
flex-direction: row;
4242
align-items: center;
4343

44-
.profile-image {
44+
.profile-image img {
4545
height: 40px;
4646
width: 40px;
4747
object-fit: cover;

src/components/app-blog-card/app-blog-card.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ export class AppBlogCard {
2222
<div class="col-md-12">
2323
<div class="blog-card-image">
2424
<stencil-route-link url={`/blog/${this.blogPost.slug}`}>
25-
<img src={this.blogPost.featured_image} alt={this.blogPost.title} />
25+
<app-img src={this.blogPost.featured_image} alt={this.blogPost.title} />
2626
</stencil-route-link>
2727
</div>
2828
<div class="blog-title">
@@ -31,7 +31,7 @@ export class AppBlogCard {
3131
</stencil-route-link>
3232
</div>
3333
<div class="author">
34-
<img class="profile-image d-none d-md-block" src={this.blogPost.author.profile_image} alt={`${this.blogPost.author.first_name} ${this.blogPost.author.last_name}`} />
34+
<app-img class="profile-image d-none d-md-block" src={this.blogPost.author.profile_image} alt={`${this.blogPost.author.first_name} ${this.blogPost.author.last_name}`} />
3535
<div>
3636
By &nbsp;
3737
<stencil-route-link url={`/about/${this.blogPost.author.slug}`}>{`${this.blogPost.author.first_name} ${this.blogPost.author.last_name}`}</stencil-route-link>

src/components/app-blog-content/app-blog-content.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
}
3838
}
3939

40-
&--main-image {
40+
&--main-image img {
4141
border-radius: 35px;
4242
padding: 2%;
4343
width: 100%;

src/components/app-blog-content/app-blog-content.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ export class AppBlogContent {
8181
<div>
8282
<div class="header--author">
8383
<div class="author-img-container">
84-
<img class="d-none d-md-block" src={this.blogPost.author.profile_image} alt={`${this.blogPost.author.first_name} ${this.blogPost.author.last_name}`} />
84+
<app-img class="d-none d-md-block" src={this.blogPost.author.profile_image} alt={`${this.blogPost.author.first_name} ${this.blogPost.author.last_name}`} />
8585
<div>
8686
By &nbsp;
8787
<stencil-route-link url={`/about/${this.blogPost.author.slug}`}>{`${this.blogPost.author.first_name} ${this.blogPost.author.last_name}`}</stencil-route-link>
@@ -93,7 +93,7 @@ export class AppBlogContent {
9393
</div>
9494
</div>
9595
</div>
96-
<img class="header--main-image" src={this.blogPost.featured_image} alt={this.blogPost.title} />
96+
<app-img class="header--main-image" src={this.blogPost.featured_image} alt={this.blogPost.title} />
9797
</div>
9898
<div class="col-md-1 col-lg-2" />
9999
</div>
@@ -121,7 +121,7 @@ export class AppBlogContent {
121121
<div class="row">
122122
<div class="col-md-3 col-lg-2 offset-md-1 offset-lg-2 blog-content-author-image">
123123
<h5>About the Author</h5>
124-
<img src={this.blogPost.author.profile_image} alt={`${this.blogPost.author.first_name} ${this.blogPost.author.last_name}`} />
124+
<app-img src={this.blogPost.author.profile_image} alt={`${this.blogPost.author.first_name} ${this.blogPost.author.last_name}`} />
125125
</div>
126126
<div class="col-md-7 col-lg-6 blog-content-author-text">
127127
<h5>About the Author</h5>

src/components/app-blog-featured-home/app-blog-featured-home.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
letter-spacing: 1px;
7575
line-height: 19px;
7676

77-
.profile-image {
77+
.profile-image img {
7878
height: 54px;
7979
width: 54px;
8080
object-fit: cover;

src/components/app-blog-featured-home/app-blog-featured-home.tsx

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@ export class AppBlogFeaturedHome {
3333
<div class="col-lg-6 col-md-8 col-title">
3434
<div class="featured-post-title">
3535
<stencil-route-link url={`/blog/${this.blogPost.slug}`}>
36-
<h2 id="featured-blog-title">{this.blogPost.title}</h2>
36+
<h2 id="featured-blog-title-first">{this.blogPost.title}</h2>
3737
</stencil-route-link>
3838
</div>
3939
<div class="author d-none d-md-flex">
40-
<img class="profile-image d-none d-md-block" src={this.blogPost.author.profile_image} />
40+
<app-img class="profile-image d-none d-md-block" src={this.blogPost.author.profile_image} />
4141
<div>
4242
By &nbsp;
4343
<stencil-route-link url={`/about/${this.blogPost.author.slug}`}>{`${this.blogPost.author.first_name} ${this.blogPost.author.last_name}`}</stencil-route-link>
@@ -48,7 +48,7 @@ export class AppBlogFeaturedHome {
4848
<div class="col-lg-6 col-md-4">
4949
<div class="featured-image">
5050
<stencil-route-link url={`/blog/${this.blogPost.slug}`}>
51-
<img src={this.blogPost.featured_image} alt={this.blogPost.title} />
51+
<app-img src={this.blogPost.featured_image} alt={this.blogPost.title} />
5252
</stencil-route-link>
5353
</div>
5454
<div class="author d-block d-sm-block d-md-none">
@@ -67,11 +67,11 @@ export class AppBlogFeaturedHome {
6767
<div class="col-lg-6 col-md-8 col-title">
6868
<div class="featured-post-title">
6969
<stencil-route-link url={`/blog/${this.blogPost1.slug}`}>
70-
<h2 id="featured-blog-title">{this.blogPost1.title}</h2>
70+
<h2 id="featured-blog-title-second">{this.blogPost1.title}</h2>
7171
</stencil-route-link>
7272
</div>
7373
<div class="author d-none d-md-flex">
74-
<img class="profile-image d-none d-md-block" src={this.blogPost1.author.profile_image} />
74+
<app-img class="profile-image d-none d-md-block" src={this.blogPost1.author.profile_image} />
7575
<div>
7676
By &nbsp;
7777
<stencil-route-link url={`/about/${this.blogPost.author.slug}`}>{`${this.blogPost.author.first_name} ${this.blogPost.author.last_name}`}</stencil-route-link>
@@ -82,11 +82,11 @@ export class AppBlogFeaturedHome {
8282
<div class="col-lg-6 col-md-4">
8383
<div class="featured-image">
8484
<stencil-route-link url={`/blog/${this.blogPost1.slug}`}>
85-
<img src={this.blogPost1.featured_image} alt={this.blogPost1.title} />
85+
<app-img src={this.blogPost1.featured_image} alt={this.blogPost1.title} />
8686
</stencil-route-link>
8787
</div>
8888
<div class="author d-block d-sm-block d-md-none">
89-
<img class="profile-image d-none d-md-block" src={this.blogPost1.author.profile_image} />
89+
<app-img class="profile-image d-none d-md-block" src={this.blogPost1.author.profile_image} />
9090
<div>
9191
By &nbsp;
9292
<stencil-route-link url={`/about/${this.blogPost.author.slug}`}>{`${this.blogPost.author.first_name} ${this.blogPost.author.last_name}`}</stencil-route-link>

src/components/app-blog-featured/app-blog-featured.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
text-decoration: underline;
7373
}
7474

75-
.profile-image {
75+
.profile-image img {
7676
height: 40px;
7777
width: 40px;
7878
object-fit: cover;

src/components/app-blog-featured/app-blog-featured.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ export class AppBlogFeatured {
2525
</div>
2626
<div class="featured-image">
2727
<stencil-route-link url={`/blog/${this.blogPost.slug}`}>
28-
<img src={this.blogPost.featured_image} alt={this.blogPost.title} />
28+
<app-img src={this.blogPost.featured_image} alt={this.blogPost.title} />
2929
</stencil-route-link>
3030
</div>
3131
<div class="featured-post-title">
@@ -34,7 +34,7 @@ export class AppBlogFeatured {
3434
</stencil-route-link>
3535
</div>
3636
<div class="author">
37-
<img class="profile-image d-none d-md-block" src={this.blogPost.author.profile_image} alt={`${this.blogPost.author.first_name} ${this.blogPost.author.last_name}`} />
37+
<app-img class="profile-image d-none d-md-block" src={this.blogPost.author.profile_image} alt={`${this.blogPost.author.first_name} ${this.blogPost.author.last_name}`} />
3838
<div>
3939
By &nbsp;
4040
<stencil-route-link url={`/about/${this.blogPost.author.slug}`}>{`${this.blogPost.author.first_name} ${this.blogPost.author.last_name}`}</stencil-route-link>

0 commit comments

Comments
 (0)