Skip to content

Commit daa0019

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

10 files changed

Lines changed: 511 additions & 72 deletions

File tree

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

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -863,11 +863,16 @@
863863
.truncate-wrapper {
864864
flex: none;
865865
display: block;
866-
max-width: 240px;
867866
width: 100%;
868867

869868
@include breakpoint-medium {
870869
max-width: 310px;
870+
max-height: 405px;
871+
height: 100%;
872+
}
873+
874+
@include breakpoint-large {
875+
max-height: 375px;
871876
}
872877
}
873878

@@ -895,24 +900,32 @@
895900
}
896901
}
897902

903+
.portfolio-title {
904+
@include truncate-lines(4);
905+
}
906+
898907
.type,
899908
.industry {
900909
@include responsive-font(11px, 11px);
901910
@include responsive-line-height(120%, 120%);
902911
color: $gray-300;
903-
margin: 10px 0 40px;
912+
margin: 10px 0 30px;
904913
@include truncate-lines(1);
905914
}
906915

907916
.descriptor {
908917
@include responsive-font(11px, 14px);
909918
@include responsive-line-height(140%, 140%);
910919
margin: 0 0 8px;
911-
@include truncate-lines(4);
920+
@include truncate-lines(7);
912921

913922
@include breakpoint-medium {
914923
margin: 0 0 10px;
915924
}
925+
926+
@include breakpoint-large {
927+
@include truncate-lines(5);
928+
}
916929
}
917930

918931
.links-area {
@@ -959,6 +972,11 @@
959972
text-decoration: underline;
960973
text-transform: lowercase;
961974
color: $gray-500;
975+
margin-bottom: 16px;
976+
977+
@include breakpoint-medium {
978+
margin-bottom: 0;
979+
}
962980
}
963981
}
964982

‎website/modules/asset/ui/src/scss/_leadership-team.scss‎

Lines changed: 50 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,20 @@
1818
// prevent extra top border when leader-card is hovered in second row
1919
& + .leadership-list {
2020
.leader-card {
21-
&:hover {
21+
@include breakpoint-large {
22+
border-top: none;
23+
2224
.leader-header {
23-
.leader-title-block {
24-
@include breakpoint-large {
25-
border-top: 1px solid transparent;
26-
}
25+
margin-bottom: 1px;
26+
}
27+
}
28+
29+
&:hover {
30+
@include breakpoint-large {
31+
border-top: none;
32+
33+
.leader-header {
34+
margin-bottom: 1px;
2735
}
2836
}
2937
}
@@ -40,47 +48,15 @@
4048
height: 100%;
4149
margin-bottom: 24px;
4250
position: relative;
51+
border-top: 1px solid transparent;
52+
border-left: 1px solid $whisper;
53+
border-bottom: 1px solid $whisper;
4354

4455
@include breakpoint-large {
45-
max-height: 383px;
4656
max-width: 400px;
4757
margin-bottom: 0;
4858
}
4959

50-
// avoid double border
51-
&:not(:first-child) {
52-
.leader-header {
53-
.leader-title-block {
54-
@include breakpoint-large {
55-
border-left: none;
56-
}
57-
}
58-
}
59-
60-
.leader-footer {
61-
@include breakpoint-large {
62-
border-left: none;
63-
}
64-
}
65-
}
66-
67-
// avoid double border on hover for leader-card
68-
&:has(+ .leader-card:hover) {
69-
.leader-header {
70-
.leader-title-block {
71-
@include breakpoint-large {
72-
border-right: none;
73-
}
74-
}
75-
}
76-
77-
.leader-footer {
78-
@include breakpoint-large {
79-
border-right: none;
80-
}
81-
}
82-
}
83-
8460
.leader-header {
8561
display: flex;
8662
max-width: calc(100% - 102px);
@@ -91,25 +67,45 @@
9167
}
9268

9369
.leader-title-block {
94-
padding: 29px 24px;
70+
padding: 27px 24px;
9571
width: 100%;
72+
box-sizing: border-box;
9673

9774
@include breakpoint-large {
9875
padding: 40px 40px 0;
99-
border: 1px solid $whisper;
100-
border-bottom: none;
76+
border: none;
77+
border-top: 1px solid $whisper;
10178
width: auto;
10279
}
10380
}
10481
}
10582

10683
.leader-footer {
10784
padding: 24px;
108-
border: 1px solid $whisper;
85+
border-top: 1px solid $whisper;
86+
border-right: 1px solid $whisper;
10987

11088
@include breakpoint-large {
111-
padding: 0 40px 40px;
11289
border-top: none;
90+
border-right: none;
91+
padding: 0 40px 40px;
92+
}
93+
}
94+
95+
&:last-child {
96+
@include breakpoint-large {
97+
.leader-header {
98+
.leader-title-block {
99+
border-right: 1px solid $whisper;
100+
}
101+
}
102+
.leader-footer {
103+
border-right: 1px solid $whisper;
104+
}
105+
106+
&:hover {
107+
border-right: 1px solid $whisper;
108+
}
113109
}
114110
}
115111

@@ -182,6 +178,12 @@
182178
}
183179

184180
&:hover {
181+
border-top: 1px solid transparent;
182+
183+
@include breakpoint-large {
184+
border-top: 1px solid $whisper;
185+
}
186+
185187
.leader-photo {
186188
@include breakpoint-large {
187189
opacity: 0;
@@ -219,14 +221,15 @@
219221
.leader-header {
220222
.leader-title-block {
221223
@include breakpoint-large {
222-
border-left: 1px solid $whisper;
224+
border: none;
225+
margin-bottom: 1px;
223226
}
224227
}
225228
}
226229

227230
.leader-footer {
228231
@include breakpoint-large {
229-
border-left: 1px solid $whisper;
232+
border: none;
230233
}
231234
}
232235
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,9 @@
7070
height: 240px;
7171
}
7272
.sf-person__content {
73+
color: $gray-300;
7374
@include truncate-lines(7);
7475
@include font-settings(14px, 150%, 400);
75-
color: $gray-500;
7676
}
7777
}
7878
}

‎website/modules/leadership-team-widget/views/widget.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ <h3 class="leader-title">{{ leader.title }}</h3>
3232
</div>
3333

3434
<div class="leader-meta">
35-
<span class="leader-experience">{{ leader.experience }} yrs</span>
35+
<span class="leader-experience">joined in {{ leader.experience }}</span>
3636
<a
3737
class="leader-link"
3838
href="{{ leader.linkedin }}"

‎website/modules/team-members/index.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@ module.exports = {
4343
required: true,
4444
},
4545
experience: {
46-
label: 'Experience',
46+
label: 'Joined in',
4747
type: 'integer',
48-
help: 'Experience in years',
48+
help: 'Enter the year',
4949
min: 0,
5050
def: 0,
5151
required: true,

‎website/package-lock.json‎

Lines changed: 9 additions & 18 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎website/package.json‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,11 @@
5050
"jest-environment-jsdom": "^30.0.0-beta.3",
5151
"lodash": "^4.17.21",
5252
"lozad": "^1.16.0",
53+
"mongodb": "^6.17.0",
5354
"normalize.css": "^8.0.1",
5455
"postmark": "^4.0.5",
5556
"swiper": "^11.2.6",
57+
"yargs": "^17.7.2",
5658
"yup": "^1.6.1"
5759
},
5860
"devDependencies": {

0 commit comments

Comments
 (0)