Skip to content

Commit cdce13b

Browse files
Erik2609Erik2609
committed
Re-setup for activityfeed on home. Remove activityfeed mobile specific html.
1 parent 4f9f9f9 commit cdce13b

File tree

5 files changed

+33
-122
lines changed

5 files changed

+33
-122
lines changed

‎assets/scss/_common.scss‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -932,9 +932,7 @@ padding: 0 50px 0 0px;
932932
}
933933

934934
.box {
935-
border: 1px solid #ccc;
936935
border-radius: 4px;
937-
cursor: pointer;
938936
margin-top: 10px;
939937
padding-top: 5px;
940938
}

‎assets/scss/_custom.scss‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,12 @@
4141
font-style: normal;
4242
}
4343
.highlight-red-sm {
44+
border: rgba(255, 255, 255, 0) 0.3rem solid;
45+
border-radius: 0.75rem;
46+
padding: 0.25rem 0.5rem !important;
47+
color: #005aa7;
48+
font-style: normal;
49+
4450
background-color: rgba(255, 203, 189, 0.5);
4551
}
4652

‎assets/scss/_landingpage.scss‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -427,6 +427,16 @@
427427
z-index: 20;
428428
position: relative;
429429
}
430+
.landinge-page-activityfeed-activity-image-wrapper {
431+
@media (max-width: 992px) {
432+
height: 200px;
433+
}
434+
}
435+
.landinge-page-activityfeed-activity-image {
436+
margin: auto;
437+
max-height: 100%;
438+
display: block;
439+
}
430440

431441
.landing-page-about {
432442
margin-top: 7rem;

‎layouts/partials/landingpage/activityfeed.html‎

Lines changed: 16 additions & 119 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
<!-- Activity Feed -->
22
{{ with .Params.Activity_Feed}}
33
{{ if .enable }}
4-
<section class="activitifeed-section mt-5" id="activityfeed">
4+
<section class="activitifeed-section mt-5" id="featured">
55
<div class="container" style="background-color:#deecf7;">
6-
<div class="row align-items-center border-gradient2">
6+
<div class="row align-items-center">
77

8-
<!-- desktop version -->
9-
<div class="mx-4 col order-1 desktop">
8+
<div class="mx-4 col order-1">
109

1110
<!-- Featured activities -->
1211
{{ if .featured_activities }}
@@ -21,12 +20,12 @@ <h3 class="section-title" style="color: #005aa7;">{{ i18n "featured" }}</h3>
2120
<div class="row justify-content-between clickable-wrapper p-5" style="background-color: #ffffff;">
2221

2322
<!-- image -->
24-
<div class="col-3 pr-4">
25-
<img class="featured-img" src="{{.image}}" />
23+
<div class="col-lg-3 col-12 pr-4">
24+
<img class="featured-img img-fluid d-block mx-auto mb-5 mb-lg-0" src="{{.image}}" />
2625
</div>
2726
<!-- /image -->
2827

29-
<div class="col-9">
28+
<div class="col-lg-9 col-12">
3029
<div class="row align-items-center">
3130

3231
<!-- title featured article -->
@@ -44,12 +43,12 @@ <h3 class="mb-2" style="color: #005aa7;">{{.title}}</h3>
4443
<!-- metadata -->
4544
<div class="row" style="position:relative;">
4645
{{ if .date }}
47-
<span style="color:#005aa7;" class="mr-1 mb-2 px-1 py-1 mx-0">
46+
<span class="highlight-red">
4847
{{.date }}
4948
</span>
5049
{{ end }}
5150
{{ if .type }}
52-
<span style="background-color: #005aa7; color: #ffffff;" class="mr-1 mb-2 px-2 py-1 mx-2">
51+
<span class="highlight-red">
5352
{{ .type }}
5453
</span>
5554
{{ end }}
@@ -73,138 +72,37 @@ <h3 class="section-title" style="color: #005aa7;">{{ i18n "recent-activity" }}</
7372
{{ range .activities }}
7473
<a href="{{ .link | relURL }}">
7574

76-
<div class="row justify-content-between mb-4">
75+
<div class="row justify-content-between mb-lg-4 my-4 my-lg-0">
7776

7877
<!-- image -->
79-
<div class="col-2 mr-4 box p-0 mt-0" style="background-color: #ffffff;">
80-
<img class="img-fluid about-img p-3" src="{{.image}}" />
78+
<div class="col-12 col-lg-3 pt-5 p-lg-0 bg-white landinge-page-activityfeed-activity-image-wrapper">
79+
<img class="img-fluid landinge-page-activityfeed-activity-image p-lg-5" src="{{.image}}" />
8180
</div>
8281
<!-- /image -->
8382

8483
<!-- title -->
85-
<div class="col" style="background-color: #ffffff;">
86-
<div class="row align-items-center">
84+
<div class="col-12 col-lg-9 py-5 bg-white">
85+
<div class="px-3 row align-items-center">
8786
<h4 class="my-4 ml-3 mr-5" style="color: #005aa7;">
8887
{{.title}}
8988
</h4>
9089
</div>
9190
<!-- /title -->
9291

9392
<!-- metadata -->
94-
<div class="row" style="position: relative; bottom: 0;">
95-
{{ if .date }}
96-
<span style="color:#005aa7;" class="mr-1 mb-2 px-2 py-1 ml-2">
97-
{{.date }}
98-
</span>
99-
{{ end }}
100-
{{ if .type }}
101-
<span style="background-color: #005aa7; color: #ffffff;" class="mb-2 px-2 py-1">
102-
{{ .type }}
103-
</span>
104-
{{ end }}
105-
</div>
106-
<!-- /metadata -->
107-
</div>
108-
</div>
109-
</a>
110-
{{end}}
111-
{{end}}
112-
<!-- /Activities -->
113-
114-
<!-- More -->
115-
<div class="row mt-4 pb-3 justify-content-center d-flex">
116-
<a href="{{.button_link}}"><label class="btn">{{.button_text}}</label></a>
117-
</div>
118-
<!-- /More -->
119-
120-
121-
</div>
122-
<!-- /desktop version -->
123-
124-
<!-- mobile version -->
125-
<div class="mx-4 col order-1 mobile">
126-
127-
<!-- Featured activities -->
128-
{{ if .featured_activities }}
129-
<div class="row mt-5">
130-
<h3 class="section-title" style="color:#005aa7;">{{ i18n "featured" }}</h3>
131-
</div>
132-
{{ range .featured_activities }}
133-
<a class="" href="{{.link | relURL }}">
134-
<div class="row justify-content-between clickable-wrapper row p-5" style="background-color: #ffffff;">
135-
<div class="col-12 pr-4" style="margin-bottom:50px;">
136-
<img class="img-fluid about-img-mobile" src="{{.image}}" />
137-
</div>
138-
<div class="col-12">
139-
<div class="row align-items-center">
140-
141-
<!-- title -->
142-
<h4 class="mb-2" style="color:#005aa7;">{{.title}}</h4>
143-
<!-- /title -->
144-
145-
<!-- intro text -->
146-
<p style="color: #777;">
147-
{{.intro | markdownify}}
148-
<span style="color: #005aa7;">{{ i18n "read_more" }}</span>
149-
</p>
150-
<!-- intro text -->
151-
</div>
152-
153-
<!-- metadata -->
154-
<div class="row" style="position:relative;">
93+
<div class="px-3 row" style="position: relative; bottom: 0;">
15594
{{ if .date }}
156-
<span style="color:#005aa7;" class="mr-1 mt-1 px-0 py-1 mx-0">
95+
<span class="ml-3 highlight-red-sm">
15796
{{.date }}
15897
</span>
15998
{{ end }}
16099
{{ if .type }}
161-
<span class="highlight-blue">
100+
<span class="ml-3 highlight-red-sm">
162101
{{ .type }}
163102
</span>
164103
{{ end }}
165104
</div>
166105
<!-- /metadata -->
167-
168-
</div>
169-
</div>
170-
</a>
171-
{{end}}
172-
{{end}}
173-
<!-- /Featured Activities -->
174-
175-
<!-- Activities -->
176-
{{ if .activities }}
177-
<div class="row mt-5">
178-
179-
<!-- title -->
180-
<h3 class="section-title" style="color: #005aa7;">{{ i18n "recent-activity" }}</h3>
181-
<!-- /title -->
182-
183-
</div>
184-
{{ range .activities }}
185-
<a href="{{ .link | relURL }}">
186-
<div class="row my-4">
187-
<div class="col-12" style="background-color: #ffffff;">
188-
<img class="img-fluid about-img-mobile p-5" src="{{.image}}" />
189-
</div>
190-
<div class="col-12" style="background-color: #ffffff;">
191-
<div class="row align-items-center p-3">
192-
<h4 class="my-4 mx-3" style="color: #005aa7;">
193-
{{.title}}
194-
</h4>
195-
</div>
196-
<div class="row pl-4 mb-3" style="position:relative; bottom:0;">
197-
{{ if .date }}
198-
<span style="color:#005aa7;" class="mr-1 mt-1 px-2 py-1 mx-1">
199-
{{.date }}
200-
</span>
201-
{{ end }}
202-
{{ if .type }}
203-
<span class="highlight-blue">
204-
{{ .type }}
205-
</span>
206-
{{ end }}
207-
</div>
208106
</div>
209107
</div>
210108
</a>
@@ -220,7 +118,6 @@ <h4 class="my-4 mx-3" style="color: #005aa7;">
220118

221119

222120
</div>
223-
<!-- /mobile version -->
224121

225122
</div>
226123
</div>

‎tina/tina-lock.json‎

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

0 commit comments

Comments
 (0)