Skip to content

Commit 6eee591

Browse files
yuramaxyuramax
committed
Merge branch 'main' into 753-fix/testimonials-missing-truncate
2 parents a0b59e7 + 9583e2f commit 6eee591

12 files changed

Lines changed: 136 additions & 114 deletions

File tree

‎website/app.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ function createAposConfig() {
5555
'@apostrophecms/image-widget': {
5656
options: {
5757
className: 'bp-image-widget',
58+
placeholderImage: false,
5859
},
5960
},
6061
'@apostrophecms/video-widget': {

‎website/modules/@apostrophecms/image-widget/views/widget.html‎

Lines changed: 22 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,25 @@
1-
{% if data.widget.aposPlaceholder and data.manager.options.placeholderUrl %}
2-
<img
3-
src="{{ data.manager.options.placeholderUrl }}"
4-
alt="{{ __t('apostrophe:imagePlaceholder') }}"
5-
class="image-widget-placeholder"
6-
/>
7-
{% else %}
8-
{% set className = data.options.className or data.manager.options.className %}
9-
{% set dimensionAttrs = data.options.dimensionAttrs or data.manager.options.dimensionAttrs %}
10-
{% set loadingType = data.options.loadingType or data.manager.options.loadingType %}
11-
{% set size = data.options.size or data.manager.options.size or 'full' %}
1+
{% set className = data.options.className or data.manager.options.className %}
2+
{% set dimensionAttrs = data.options.dimensionAttrs or data.manager.options.dimensionAttrs %}
3+
{% set loadingType = data.options.loadingType or data.manager.options.loadingType %}
4+
{% set size = data.options.size or data.manager.options.size or 'full' %}
125

13-
{% set attachment = apos.image.first(data.widget._image) %}
6+
{% set attachment = apos.image.first(data.widget._image) %}
147

15-
{% if attachment %}
16-
<img class="{% if className %}{{ className }} {% endif %}{% if not data.user %}lozad{% endif %}"
17-
{% if loadingType %} loading="{{ loadingType }}"{% endif %}
18-
srcset="{{ apos.image.srcset(attachment) }}"
19-
src="{{ apos.attachment.url(attachment, { size: size }) }}"
20-
alt="{{ attachment._alt or '' }}"
21-
{% if dimensionAttrs %}
22-
{% if attachment.width %} width="{{ apos.attachment.getWidth(attachment) }}" {% endif %}
23-
{% if attachment.height %} height="{{ apos.attachment.getHeight(attachment) }}" {% endif %}
24-
{% endif %}
25-
{% if data.contextOptions and data.contextOptions.sizes %}
26-
sizes="{{ data.contextOptions.sizes }}"
27-
{% endif %}
28-
{% if apos.attachment.hasFocalPoint(attachment) %}
29-
style="object-position: {{ apos.attachment.focalPointToObjectPosition(attachment) }}"
30-
{%- endif -%}
31-
/>
32-
{% endif %}
8+
{% if attachment %}
9+
<img class="{% if className %}{{ className }} {% endif %}{% if not data.user %}lozad{% endif %}"
10+
{% if loadingType %} loading="{{ loadingType }}"{% endif %}
11+
srcset="{{ apos.image.srcset(attachment) }}"
12+
src="{{ apos.attachment.url(attachment, { size: size }) }}"
13+
alt="{{ attachment._alt or '' }}"
14+
{% if dimensionAttrs %}
15+
{% if attachment.width %} width="{{ apos.attachment.getWidth(attachment) }}" {% endif %}
16+
{% if attachment.height %} height="{{ apos.attachment.getHeight(attachment) }}" {% endif %}
17+
{% endif %}
18+
{% if data.contextOptions and data.contextOptions.sizes %}
19+
sizes="{{ data.contextOptions.sizes }}"
20+
{% endif %}
21+
{% if apos.attachment.hasFocalPoint(attachment) %}
22+
style="object-position: {{ apos.attachment.focalPointToObjectPosition(attachment) }}"
23+
{%- endif -%}
24+
/>
3325
{% endif %}

‎website/modules/asset/public/favicon/favicon.ico‎

33.7 KB
Binary file not shown.

‎website/modules/asset/ui/src/index.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ function initFilterModal() {
249249
window.caseStudiesFilterModal = new FilterModal({
250250
modalSelector: '#filter-modal',
251251
openBtnSelector: '.filters-cta',
252-
closeBtnSelector: '.filter-modal__close',
252+
closeBtnSelector: '.filter-modal__button',
253253
backdropSelector: '.filter-modal__backdrop',
254254
clearAllSelector: '.clear-all',
255255
selectedTagsSelector: '.selected-tags',

‎website/modules/asset/ui/src/scss/_cases.scss‎

Lines changed: 22 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -293,20 +293,20 @@
293293
background-color 0.3s cubic-bezier(0.4, 0, 0.2, 1),
294294
color 0.3s cubic-bezier(0.4, 0, 0.2, 1),
295295
transform 0.3s cubic-bezier(0.4, 0, 0.2, 1);
296-
296+
297297
&:hover,
298298
&:focus-visible {
299299
background-color: rgba($gray-100, 0.6);
300300
color: $gray-500;
301301
transform: translateX(4px);
302-
302+
303303
&::before {
304304
background-color: rgba($gray-200, 0.8);
305305
transform: scale(1.1);
306306
box-shadow: 0 2px 4px rgba($gray-300, 0.2);
307307
}
308308
}
309-
309+
310310
&::before {
311311
content: '';
312312
display: inline-block;
@@ -323,18 +323,18 @@
323323
border-radius: 2px;
324324
flex-shrink: 0;
325325
}
326-
326+
327327
.tag-label {
328328
@include truncate-lines(2);
329329
}
330-
330+
331331
.tag-count {
332332
flex-shrink: 0;
333333
white-space: nowrap;
334334
margin-left: 4px;
335335
color: $gray-300;
336336
}
337-
}
337+
}
338338
}
339339

340340
.no-tags-message {
@@ -1278,15 +1278,27 @@
12781278
background: #fff;
12791279
transform: translate(-50%, -50%);
12801280
z-index: 2;
1281-
padding: 24px 16px;
1281+
padding: 0 16px 24px;
12821282
max-height: 90vh;
12831283
overflow-y: auto;
12841284
box-shadow: 0 8px 32px rgba($black, 0.18);
12851285
}
12861286

1287-
&__close {
1288-
background-color: transparent;
1287+
&__button-wrapper {
1288+
z-index: 3;
1289+
position: sticky;
1290+
background: white;
1291+
top: 0;
1292+
display: flex;
1293+
align-items: center;
1294+
width: 100%;
1295+
padding: 24px 0 14px;
1296+
}
1297+
1298+
&__button {
1299+
background: transparent;
12891300
border: 0;
1301+
padding: 4px 6px;
12901302
cursor: pointer;
12911303
font-style: $font-style-normal;
12921304
text-transform: lowercase;
@@ -1295,7 +1307,7 @@
12951307
}
12961308

12971309
&__body {
1298-
margin-top: 43px;
1310+
margin-top: 26px;
12991311
}
13001312

13011313
.filter-header {

‎website/modules/asset/ui/src/scss/_header.scss‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
}
1111

1212
&__content {
13+
position: relative;
1314
width: min(1280px, 100%);
1415
margin: 0 auto;
1516
padding: 0 40px;
@@ -101,6 +102,8 @@
101102
overflow: hidden;
102103
overflow-y: auto;
103104
width: 100%;
105+
top: $mobile-header-height;
106+
right: 0;
104107

105108
@include breakpoint-medium {
106109
top: 40px;
@@ -109,10 +112,6 @@
109112
padding-right: 10px;
110113
}
111114

112-
@include breakpoint-extra-extra-large {
113-
right: 120px;
114-
}
115-
116115
&.open {
117116
transform: translateY(0);
118117
@include breakpoint-medium {

‎website/modules/asset/ui/src/scss/_services.scss‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -94,10 +94,6 @@
9494
.sf-simple-cards__card-wrap {
9595
padding: 40px;
9696

97-
&:hover {
98-
padding-left: 50px;
99-
padding-right: 50px;
100-
}
10197
}
10298
}
10399
}
@@ -220,10 +216,8 @@
220216

221217
.sf-simple-cards--no-expandable & {
222218
@include transition(all, 0.5s);
223-
transform: scale3d(1, 1, 1);
224219

225220
&:hover {
226-
transform: scale3d(1.03, 1.03, 1);
227221
z-index: 10;
228222

229223
.sf-simple-cards__card-title {
@@ -250,10 +244,8 @@
250244
@include breakpoint-medium {
251245
padding: 40px;
252246
@include transition(all, 0.5s);
253-
transform: scale3d(1, 1, 1);
254247

255248
&:hover {
256-
transform: scale3d(1.02, 1.02, 1);
257249
z-index: 10;
258250

259251
.sf-simple-cards__card-title {

‎website/modules/asset/ui/src/scss/_table-widget.scss‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,7 @@
3838
position: relative;
3939
overflow: hidden;
4040
background-color: $white;
41-
@include transition(all, 0.5s);
42-
transform: scale3d(1, 1, 1);
41+
@include transition(border-color, 0.3s);
4342

4443
&:not(:last-child) {
4544
border-bottom: none;
@@ -59,7 +58,6 @@
5958

6059
&:hover,
6160
&:focus-visible {
62-
transform: scale3d(1.03, 1.03, 1);
6361
z-index: 10;
6462
border-color: black;
6563

@@ -103,7 +101,6 @@
103101

104102
&:hover,
105103
&:focus-visible {
106-
transform: scale3d(1.03, 1.03, 1);
107104
z-index: 10;
108105
border-color: black;
109106

@@ -125,8 +122,6 @@
125122
}
126123

127124
&:focus-visible {
128-
transform: scale3d(1.02, 1.02, 1);
129-
130125
.background-circle {
131126
display: block;
132127
}

‎website/modules/case-studies-page/views/index.html‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -273,14 +273,16 @@ <h4 class="portfolio-title">{{ article.portfolioTitle }}</h4>
273273
<div id="filter-modal" class="filter-modal">
274274
<div class="filter-modal__backdrop"></div>
275275
<div class="filter-modal__content">
276-
<button
277-
type="button"
278-
class="filter-modal__close"
279-
aria-label="Close filter modal"
280-
>
281-
<i class="back-icon"></i>
282-
back to all projects
283-
</button>
276+
<div class="filter-modal__button-wrapper">
277+
<button
278+
type="button"
279+
class="filter-modal__button"
280+
aria-label="Close filter modal"
281+
>
282+
<i class="back-icon"></i>
283+
back to all projects
284+
</button>
285+
</div>
284286
<div class="filter-modal__body"></div>
285287
</div>
286288
</div>

‎website/modules/testimonials-carousel-widget/views/widget.html‎

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,22 @@ <h5 class="sf-person__position sf-person__organization">
4242
{{ card.organization }}
4343
</h5>
4444
</div>
45-
{% endif %} {% if card.url %}
46-
<a href="{{ card.url }}" target="_blank" class="sf-person__url"
47-
>{{ card.url }}</a
45+
{% endif %} {% if card.url %} {# Remove protocol #} {% set
46+
urlWithoutProtocol = card.url %} {% if card.url.split('://') |
47+
length > 1 %} {% set urlWithoutProtocol =
48+
card.url.split('://')[1] %} {% endif %} {# Remove
49+
path/query/fragment #} {% set domainWithOrWithoutWww =
50+
urlWithoutProtocol.split('/')[0] %} {# Remove www. if present #}
51+
{% set cleanDomain = domainWithOrWithoutWww | trim |
52+
replace('www.', '') %}
53+
<a
54+
href="{{ card.url }}"
55+
target="_blank"
56+
class="sf-person__url"
57+
rel="noopener noreferrer"
4858
>
59+
{{ cleanDomain }}
60+
</a>
4961
{% endif %}
5062
</div>
5163
</div>

0 commit comments

Comments
 (0)