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

Commit 2cff102

Browse files
WholloranWholloran
authored
Merge pull request #381 from openforge/fix/keyboad-nav
Fix/keyboad nav
2 parents 2f35e2c + 318c1cb commit 2cff102

File tree

11 files changed

+55
-19
lines changed

11 files changed

+55
-19
lines changed

‎src/components/app-nav-header/app-nav-header.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ export class AppNavHeader {
2828
<nav class="navbar navbar-expand-lg navbar-dark align-items-lg-end fixed-top">
2929
<div class="container">
3030
<div class="navbar-brand">
31-
<stencil-route-link url="/" exact={true} anchorClass="nav-link" activeClass="active">
31+
<stencil-route-link tabindex="0" url="/" exact={true} anchorClass="nav-link" activeClass="active">
3232
<h1>
3333
<app-img class="img-fluid" src="/assets/logo-openforge.png" alt={translate('nav.header.img.alt')} />
3434
</h1>
@@ -58,7 +58,7 @@ export class AppNavHeader {
5858
<stencil-route-link anchorClass="nav-link main" url="/services" role="button" activeClass="active">
5959
Services
6060
</stencil-route-link>
61-
<a class="nav-link dropdown-toggle" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
61+
<a href="" class="nav-link dropdown-toggle" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
6262
<span class="sr-only">Toggle Dropdown</span>
6363
</a>
6464
<div class="dropdown-menu" aria-labelledby="navbarDropdown">
@@ -77,7 +77,7 @@ export class AppNavHeader {
7777
</div>
7878
</li>
7979
<li class="nav-item dropdown" data-target="#navbarSupportedContent">
80-
<a class="nav-link dropdown-toggle" id="navbarDropdown1" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
80+
<a href="" class="nav-link dropdown-toggle" id="navbarDropdown1" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
8181
{translate('nav.links.about')}
8282
</a>
8383
<div class="dropdown-menu" aria-labelledby="navbarDropdown1">

‎src/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@
101101
height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
102102
<!-- End Google Tag Manager (noscript) -->
103103

104-
<app-nav-header />
104+
<app-nav-header></app-nav-header>
105105

106106
<open-forge-app></open-forge-app>
107107

‎src/pages/app-about/app-about.scss‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,24 @@
7979
margin: 0 auto 3rem;
8080
max-width: 768px;
8181
}
82+
83+
.integrity {
84+
background: url('assets/svg/about-graphic-integrity.svg') center center no-repeat;
85+
height: 164px;
86+
width: 220px;
87+
}
88+
89+
.honesty {
90+
background: url('assets/svg/about-graphic-honesty.svg') center center no-repeat;
91+
height: 164px;
92+
width: 220px;
93+
}
94+
95+
.transparency {
96+
background: url('assets/svg/about-graphic-transparency.svg') center center no-repeat;
97+
height: 164px;
98+
width: 220px;
99+
}
82100
}
83101

84102
.value-text {

‎src/pages/app-about/app-about.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -273,15 +273,15 @@ export class AppAbout {
273273
</div>
274274
<div class="row">
275275
<div class="col-md-4 col-sm-12 d-flex flex-column align-items-center">
276-
<object data="assets/svg/about-graphic-integrity.svg" height="164px" width="220px" />
276+
<div class="integrity" />
277277
<app-translate class="value-text" key="about.values.value2" />
278278
</div>
279279
<div class="col-md-4 col-sm-12 d-flex flex-column align-items-center">
280-
<object data="assets/svg/about-graphic-honesty.svg" height="164px" width="220px" />
280+
<div class="honesty" />
281281
<app-translate class="value-text" key="about.values.value1" />
282282
</div>
283283
<div class="col-md-4 col-sm-12 d-flex flex-column align-items-center">
284-
<object data="assets/svg/about-graphic-transparency.svg" height="164px" width="220px" />
284+
<div class="transparency" />
285285
<app-translate class="value-text" key="about.values.value3" />
286286
</div>
287287
</div>

‎src/pages/app-blog/app-blog.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ export class AppBlog {
221221
}
222222
return (
223223
<li class={filterClass}>
224-
<a onClick={() => this.handleFilter(filter.slug)} class={filterLinkClass}>
224+
<a onClick={() => this.handleFilter(filter.slug)} href="#" class={filterLinkClass}>
225225
{filter.name}
226226
</a>
227227
</li>
@@ -277,7 +277,7 @@ export class AppBlog {
277277
const pageLinkClass = currentPage === i + 1 ? 'blog-page-item active' : 'blog-page-item';
278278
return (
279279
<li class={pageItemClass}>
280-
<a id={`nav-to-page-${i + 1}`} onClick={e => this.handlePaging(e)} class={pageLinkClass}>
280+
<a id={`nav-to-page-${i + 1}`} onClick={e => this.handlePaging(e)} href="#" class={pageLinkClass}>
281281
{i + 1}
282282
</a>
283283
</li>

‎src/pages/app-detailed-service/app-detailed-service.scss‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,11 @@
7272
@include media-breakpoint-down(sm) {
7373
text-align: center;
7474
}
75+
76+
.img-services {
77+
width: 250px;
78+
height: 250px;
79+
}
7580
}
7681

7782
.our-work {

‎src/pages/app-detailed-service/app-detailed-service.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ export class AppDetailedService {
180180
</div>
181181
<div class="row text-sm-center text-md-left">
182182
<div class="col-md-4 col-sm-12 d-flex justify-content-center align-items-center">
183-
<object data={this.imgs[this.match.params.service].services.first} height="250" width="250" />
183+
<img class="img-services" src={this.imgs[this.match.params.service].services.first} />
184184
</div>
185185
<div class="col-md-8 col-sm-12 d-flex flex-column align-self-center">
186186
<h3>
@@ -193,7 +193,7 @@ export class AppDetailedService {
193193
</div>
194194
<div class="row text-sm-center text-md-right">
195195
<div class="col-md-4 col-sm-12 d-flex order-md-2 justify-content-center align-items-center">
196-
<object data={this.imgs[this.match.params.service].services.second} height="250" width="250" />
196+
<img class="img-services" src={this.imgs[this.match.params.service].services.second} />
197197
</div>
198198
<div class="col-md-8 col-sm-12 order-md-1 d-flex flex-column align-self-center">
199199
<h3>
@@ -206,7 +206,7 @@ export class AppDetailedService {
206206
</div>
207207
<div class="row text-sm-center text-md-left">
208208
<div class="col-md-4 col-sm-12 d-flex justify-content-center align-items-center">
209-
<object data={this.imgs[this.match.params.service].services.third} height="250" width="250" />
209+
<img class="img-services" src={this.imgs[this.match.params.service].services.third} />
210210
</div>
211211
<div class="col-md-8 col-sm-12 d-flex flex-column align-self-center">
212212
<h3>

‎src/pages/app-home/app-home.scss‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,12 @@
1212
margin-top: 115px;
1313

1414
.svg-header-desktop {
15-
display: initial;
15+
background: url('assets/svg/home-graphic-header.svg') center center no-repeat;
16+
height: 542px;
17+
display: block;
1618

1719
@include media-breakpoint-up(md) {
18-
display: initial;
20+
display: block;
1921
}
2022

2123
@include media-breakpoint-down(sm) {
@@ -24,14 +26,16 @@
2426
}
2527

2628
.svg-header-mobile {
29+
background: url('assets/svg/home-graphic-header-mobile.svg') center center no-repeat;
30+
height: 768px;
2731
display: none;
2832

2933
@include media-breakpoint-up(md) {
3034
display: none;
3135
}
3236

3337
@include media-breakpoint-down(sm) {
34-
display: initial;
38+
display: block;
3539
}
3640
}
3741

‎src/pages/app-home/app-home.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,8 +130,8 @@ export class AppHome {
130130
<h2>
131131
<app-translate key="home.hero.subTitle" />
132132
</h2>
133-
<object data="/assets/svg/home-graphic-header.svg" class="svg-header-desktop" aria-label="header" />
134-
<object data="/assets/svg/home-graphic-header-mobile.svg" class="svg-header-mobile" aria-label="header" />
133+
<div class="svg-header-desktop" aria-label="header" />
134+
<div class="svg-header-mobile" aria-label="header" />
135135
</div>
136136
</div>
137137
</div>

‎src/pages/app-services/app-services.scss‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,19 @@
2929
}
3030

3131
.services-graphic-background {
32+
background: url('assets/svg/services-graphic-background.svg') center top no-repeat;
33+
width: 100%;
3234
position: absolute;
35+
padding-top: 58.35%;
3336
top: 50px;
3437
}
3538

39+
.svg-header-desktop {
40+
background: url('assets/svg/services-graphic-header.svg') center center no-repeat;
41+
width: 100%;
42+
padding-top: 56.22%;
43+
}
44+
3645
h1 {
3746
position: absolute;
3847
width: 100%;

0 commit comments

Comments
 (0)