Skip to content

Commit 3d13c95

Browse files
jfpariejfparie
committed
fixed a href click issue with clickable wrapper
1 parent f0cc908 commit 3d13c95

File tree

6 files changed

+59
-40
lines changed

6 files changed

+59
-40
lines changed

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Install npm packages
66
`npm install`
77

88
Initialise TinaCMS
9-
'npx @tinacms/cli init'
9+
`npx @tinacms/cli init`
1010
Enter any client id and token
1111
We recommend using NPM for the package manager
1212
Use typescript

‎assets/scss/_common.scss‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -684,6 +684,10 @@ h4, .h4 {
684684
bottom: 0;
685685
}
686686

687+
.featured-img{
688+
width: 165px;
689+
}
690+
687691
.about-img-mobile{
688692
height: 200px;
689693
margin: auto;

‎assets/scss/_custom.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
.highlight-blue {
1919
background-color:#005aa7;
2020
color:#fff;
21-
margin: .25rem 0.25rem 0.5rem 0.25rem !important;
21+
margin: 0.25rem 0.25rem 0.5rem 0.25rem !important;
2222
padding: 0.25rem 0.5rem !important;
2323
}
2424

‎layouts/algoprudence/repository.html‎

Lines changed: 26 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -51,36 +51,38 @@ <h3>{{.Params.title_content | markdownify}}</h3>
5151
{{ $facets_for_data_attribute = printf "%s" $facets_for_data_attribute | printf "%s%s"
5252
$facet.value | printf "%s" }}
5353
{{ end }}
54-
<div class="clickable-wrapper my-5" data-href="{{$algoprudence.link | relURL}}">
55-
<div class="grid shadow mobile-desktop-container-layout rounded-lg facet-item" data-facets="{{$facets_for_data_attribute}}">
56-
<div class="row">
57-
<div class="col-md-3 col-sm-12 pr-4">
58-
<div class="row justify-content-center">
59-
<div class="col-8 col-md-12 mb-5">
60-
<img class="img-fluid" src="{{$algoprudence.image}}" />
54+
<a class="" href="{{$algoprudence.link | relURL}}">
55+
<div class="clickable-wrapper my-5">
56+
<div class="grid shadow mobile-desktop-container-layout rounded-lg facet-item" data-facets="{{$facets_for_data_attribute}}">
57+
<div class="row">
58+
<div class="col-md-3 col-sm-12 pr-4">
59+
<div class="row justify-content-center">
60+
<div class="col-8 col-md-12 mb-5">
61+
<img class="img-fluid" src="{{$algoprudence.image}}" />
62+
</div>
6163
</div>
6264
</div>
63-
</div>
64-
<div class="col-md-9 col-sm-12">
65-
<div class="row align-items-center">
66-
<h4 class="mb-4" style="color: #005aa7;">
67-
{{$algoprudence.title}}
68-
</h4>
69-
<p>{{$algoprudence.intro | markdownify}} <a
70-
href="{{$algoprudence.link | relURL}}">{{ i18n "read_more" }}</a> </p>
71-
</div>
72-
<div class="row">
73-
{{ range $facet := $algoprudence.facets }}
74-
{{ if $facet.hide }}
75-
{{ else }}
76-
<span style="background-color: #005aa7; color: #ffffff;" class="mr-1 mb-2 px-2 py-1 mx-1">{{$facet.label}}</span>
77-
{{ end }}
78-
{{end}}
65+
<div class="col-md-9 col-sm-12">
66+
<div class="row align-items-center">
67+
<h4 class="mb-4" style="color: #005aa7;">
68+
{{$algoprudence.title}}
69+
</h4>
70+
<p>{{$algoprudence.intro | markdownify}}
71+
<span style="color: #005aa7;">{{ i18n "read_more" }}</span>
72+
</div>
73+
<div class="row">
74+
{{ range $facet := $algoprudence.facets }}
75+
{{ if $facet.hide }}
76+
{{ else }}
77+
<span style="background-color: #005aa7; color: #ffffff;" class="mr-1 mb-2 px-2 py-1 mx-1">{{$facet.label}}</span>
78+
{{ end }}
79+
{{end}}
80+
</div>
7981
</div>
8082
</div>
8183
</div>
8284
</div>
83-
</div>
85+
</a>
8486
{{end}}
8587
</div>
8688
{{end}}

‎layouts/index.html‎

Lines changed: 26 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -185,11 +185,15 @@ <h3 class="section-title" style="color: #005aa7;">{{ i18n "featured" }}</h3>
185185
</div>
186186

187187
{{ range .featured_activities }}
188-
<div class="clickable-wrapper" data-href="{{.link | relURL }}">
189-
<div class="row p-5" style="background-color: #ffffff;">
188+
<a class="" href="{{.link | relURL }}">
189+
<div class="row justify-content-between clickable-wrapper p-5" style="background-color: #ffffff;">
190+
191+
<!-- image -->
190192
<div class="col-3 pr-4">
191-
<img class="img-fluid" style="height:200px; position:absolute;" src="{{.image}}" />
193+
<img class="featured-img" src="{{.image}}" />
192194
</div>
195+
<!-- /image -->
196+
193197
<div class="col-9">
194198
<div class="row align-items-center">
195199

@@ -198,9 +202,9 @@ <h3 class="mb-2" style="color: #005aa7;">{{.title}}</h3>
198202
<!-- /title featured article -->
199203

200204
<!-- intro text -->
201-
<p style="color: #777">
205+
<p style="color: #777;">
202206
{{.intro | markdownify}}
203-
<a href="{{.link | relURL}}">{{ i18n "read_more" }}</a>
207+
<span style="color: #005aa7;">{{ i18n "read_more" }}</span>
204208
</p>
205209
<!-- intro text -->
206210
</div>
@@ -222,7 +226,7 @@ <h3 class="mb-2" style="color: #005aa7;">{{.title}}</h3>
222226

223227
</div>
224228
</div>
225-
</div>
229+
</a>
226230
{{end}}
227231
{{end}}
228232
<!-- /Featured Activities -->
@@ -254,6 +258,7 @@ <h4 class="my-4 ml-3 mr-5" style="color: #005aa7;">
254258
</div>
255259
<!-- /title -->
256260

261+
<!-- metadata -->
257262
<div class="row" style="position: relative; bottom: 0;">
258263
{{ if .date }}
259264
<span style="color:#005aa7;" class="mr-1 mb-2 px-2 py-1 ml-2">
@@ -266,6 +271,7 @@ <h4 class="my-4 ml-3 mr-5" style="color: #005aa7;">
266271
</span>
267272
{{ end }}
268273
</div>
274+
<!-- /metadata -->
269275
</div>
270276
</div>
271277
</a>
@@ -292,8 +298,8 @@ <h4 class="my-4 ml-3 mr-5" style="color: #005aa7;">
292298
<h3 class="section-title" style="color:#005aa7;">{{ i18n "featured" }}</h3>
293299
</div>
294300
{{ range .featured_activities }}
295-
<div class="clickable-wrapper" data-href="{{.link | relURL }}">
296-
<div class="row p-5" style="background-color: #ffffff;">
301+
<a class="" href="{{.link | relURL }}">
302+
<div class="row justify-content-between clickable-wrapper row p-5" style="background-color: #ffffff;">
297303
<div class="col-12 pr-4" style="margin-bottom:50px;">
298304
<img class="img-fluid about-img-mobile" src="{{.image}}" />
299305
</div>
@@ -304,13 +310,18 @@ <h3 class="section-title" style="color:#005aa7;">{{ i18n "featured" }}</h3>
304310
<h4 class="mb-2" style="color:#005aa7;">{{.title}}</h4>
305311
<!-- /title -->
306312

307-
<p style="color: #777">{{.intro | markdownify}}
308-
<a href="{{.link | relURL}}">{{ i18n "read_more" }}</a>
313+
<!-- intro text -->
314+
<p style="color: #777;">
315+
{{.intro | markdownify}}
316+
<span style="color: #005aa7;">{{ i18n "read_more" }}</span>
309317
</p>
318+
<!-- intro text -->
310319
</div>
320+
321+
<!-- metadata -->
311322
<div class="row" style="position:relative;">
312323
{{ if .date }}
313-
<span style="color:#005aa7;" class="mr-1 mb-2 px-0 py-1 mx-0">
324+
<span style="color:#005aa7;" class="mr-1 mt-1 px-0 py-1 mx-0">
314325
{{.date }}
315326
</span>
316327
{{ end }}
@@ -320,9 +331,11 @@ <h4 class="mb-2" style="color:#005aa7;">{{.title}}</h4>
320331
</span>
321332
{{ end }}
322333
</div>
334+
<!-- /metadata -->
335+
323336
</div>
324337
</div>
325-
</div>
338+
</a>
326339
{{end}}
327340
{{end}}
328341
<!-- /Featured Activities -->
@@ -350,7 +363,7 @@ <h4 class="my-4 mx-3" style="color: #005aa7;">
350363
</div>
351364
<div class="row pl-4 mb-3" style="position:relative; bottom:0;">
352365
{{ if .date }}
353-
<span style="color:#005aa7;" class="mr-1 mb-2 px-2 py-1 mx-1">
366+
<span style="color:#005aa7;" class="mr-1 mt-1 px-2 py-1 mx-1">
354367
{{.date }}
355368
</span>
356369
{{ end }}

‎tina/tina-lock.json‎

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)