Skip to content

Commit c8b0162

Browse files
committed
Preliminary layout
Still need the banner image and buttons
1 parent c1811a5 commit c8b0162

File tree

9 files changed

+137
-160
lines changed

9 files changed

+137
-160
lines changed

src/app/pages/partners/active-filters/active-filters.scss

-4
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,6 @@
55

66
padding: 0;
77

8-
@include wider-than($phone-max) {
9-
margin-top: 4rem;
10-
}
11-
128
> div {
139
display: flex;
1410
flex-direction: row;

src/app/pages/partners/controls/controls.js

-2
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,6 @@ export default function Controls({advancedFilterOptions, typeOptions}) {
118118
<OptionsList items={typeOptions} selected={types} />
119119
</BaseButton>
120120
<BaseButton label="Advanced Filters" {...commonButtonProps} size={advanced.size} />
121-
</div>
122-
<div className="other-controls">
123121
<BaseButton label="Sort" {...commonButtonProps}>
124122
<OptionsList items={sortOptions} selected={sort} />
125123
</BaseButton>

src/app/pages/partners/controls/controls.scss

+7-18
Original file line numberDiff line numberDiff line change
@@ -52,34 +52,27 @@ $breakpt-med: 93em * $scale-factor;
5252
}
5353

5454
.partners .desktop.controls {
55-
background-color: ui-color(white);
56-
border-bottom: thin solid ui-color(form-border);
57-
border-radius: 0.4rem;
58-
display: grid;
59-
grid-gap: 3rem;
60-
margin-top: 3rem;
61-
padding: 3rem;
55+
background-color: transparent;
56+
display: flex;
57+
gap: 3rem;
58+
justify-content: center;
6259
position: relative;
60+
margin: 3rem auto;
6361
max-width: 120rem;
6462
width: 100%;
6563

6664
@include width-up-to($phone-max) {
6765
display: none;
6866
}
6967

70-
@include wider-than($breakpt-med) {
71-
grid-auto-flow: column;
72-
}
73-
7468
.filter-button,
7569
.button-with-dropdown {
7670
@include title-font(1.8rem);
7771

7872
color: text-color(normal);
7973
}
8074

81-
.button-row,
82-
.other-controls {
75+
.button-row {
8376
display: grid;
8477
grid-row-gap: 1rem;
8578
justify-content: left;
@@ -95,11 +88,6 @@ $breakpt-med: 93em * $scale-factor;
9588
justify-content: right;
9689
}
9790

98-
.button-with-popover .popover {
99-
border-top-left-radius: 0.3rem;
100-
border-top-right-radius: 0;
101-
right: 0;
102-
}
10391
}
10492

10593
// Breaking encapsulation slightly
@@ -143,6 +131,7 @@ $breakpt-med: 93em * $scale-factor;
143131
}
144132

145133
.popover-container {
134+
max-width: $text-content-max;
146135
position: absolute;
147136
top: 100%;
148137
width: 100%;

src/app/pages/partners/mobile-controls/mobile-controls.scss

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,11 @@
44
align-items: center;
55
display: grid;
66
grid-column-gap: 1rem;
7-
padding: $normal-margin;
87
width: 100%;
98

109
@include width-up-to($phone-max) {
11-
background-color: ui-color(page-bg);
1210
grid-template-columns: 1fr auto auto;
11+
padding: $normal-margin;
1312
position: sticky;
1413
top: 5rem;
1514
z-index: 2;
@@ -41,6 +40,7 @@
4140
}
4241

4342
.result-count {
43+
@include set-font(body-large);
4444
margin-top: 0;
4545
}
4646

src/app/pages/partners/partners.js

+15-6
Original file line numberDiff line numberDiff line change
@@ -110,15 +110,24 @@ function Partners({data}) {
110110
{confirmation && <Confirmation />}
111111
<section className="banner hero">
112112
<div className="boxed">
113-
<h1>{headline}</h1>
114-
<RawHTML html={description} />
113+
<div className="text-block">
114+
<h1>{headline}</h1>
115+
<RawHTML html={description} />
116+
</div>
117+
</div>
118+
<div
119+
className="right-bg clipped-image"
120+
/>
121+
</section>
122+
<section>
123+
<div className="text-content">
124+
<h2>
125+
Search our technology partners to find the best option for your course
126+
</h2>
115127
<Controls {...{advancedFilterOptions, typeOptions}} />
116128
</div>
117-
<img
118-
className="strips" src="/dist/images/components/strips.svg"
119-
height="10" alt="" role="presentation" />
129+
<MobileControlRow {...{advancedFilterOptions, typeOptions}} />
120130
</section>
121-
<MobileControlRow {...{advancedFilterOptions, typeOptions}} />
122131
<div
123132
className="padding"
124133
data-analytics-content-list={headline}

src/app/pages/partners/partners.scss

+23-13
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
@import 'mixins/placeholder-selectors';
33

44
.partners.page {
5+
background-color: ui-color(white);
56

67
.above-the-banner {
78
background-color: #d9edf7;
@@ -39,13 +40,7 @@
3940
}
4041

4142
.banner {
42-
@extend %light-on-dark;
43-
44-
background-color: os-color(deep-green);
45-
background-image: url('/dist/images/partners/partner-heading-bg.webp');
46-
background-position: left top;
47-
background-size: cover;
48-
color: text-color(white);
43+
border-bottom: thin solid os-color(green);
4944
padding-bottom: 8rem;
5045
position: relative;
5146

@@ -57,19 +52,34 @@
5752
}
5853
}
5954

60-
h1 {
61-
margin-bottom: 3rem;
55+
.boxed {
56+
display: block;
6257

63-
@include width-up-to($phone-max) {
64-
@include set-font(h1);
58+
.text-block {
59+
text-align: left;
60+
61+
@include wider-than($phone-max) {
62+
max-width: 57rem;
63+
width: 50%;
64+
}
6565
}
6666
}
6767

68-
.strips {
69-
bottom: 0;
68+
h1 {
69+
@include set-font(h1);
70+
margin-bottom: 3rem;
7071
}
7172
}
7273

74+
> section {
75+
padding-left: $normal-margin;
76+
padding-right: $normal-margin;
77+
}
78+
79+
h2 {
80+
text-align: center;
81+
}
82+
7383
@include width-up-to($phone-max) {
7484
.desktop {
7585
display: none;

src/app/pages/partners/results/results.scss

+54-30
Original file line numberDiff line numberDiff line change
@@ -3,32 +3,72 @@
33

44
.partners .results {
55
padding: 2rem 0 20rem;
6+
width: 100%;
7+
max-width: $content-max;
8+
margin: 0 auto;
69

710
@include width-up-to($phone-max) {
11+
grid-template-columns: 100%;
812
padding: 0 $normal-margin 6rem;
913
}
1014

1115
@include wider-than($phone-max) {
1216
min-height: 60rem;
1317
}
1418

15-
>:first-child {
16-
@include width-up-to($phone-max) {
17-
margin-bottom: $normal-margin;
19+
.result-columns {
20+
align-items: start;
21+
display: grid;
22+
gap: 4rem;
23+
grid-template-columns: calc(100% - 38rem) 34rem;
24+
max-width: 100%;
25+
26+
@include width-up-to($tablet-max) {
27+
grid-template-columns: 100%;
28+
gap: 5rem;
1829
}
1930

20-
@include wider-than($phone-max) {
21-
margin-bottom: 3rem;
31+
.result-column {
32+
display: flex;
33+
flex-direction: column;
34+
justify-content: center;
35+
gap: 5rem;
36+
}
37+
}
38+
39+
.heading-and-result-grid {
40+
border: thin solid os-color(light-blue);
41+
border-top-width: 1.1rem;
42+
margin: 0 auto;
43+
max-width: 100%;
44+
padding: 4rem;
45+
46+
&.results-10 {
47+
border-color: os-color(gold);
48+
}
49+
50+
&.results-7 {
51+
border-color: os-color(deep-green);
52+
}
53+
54+
&.results-4 {
55+
border-color: os-color(orange);
56+
}
57+
58+
&.results-1 {
59+
border-color: os-color(yellow);
60+
}
61+
62+
&.results-new {
63+
border-color: os-color(blue);
2264
}
2365
}
2466

25-
h2 {
26-
margin: 0;
67+
h3 {
68+
@include title-font(2.6rem);
69+
margin-bottom: 2rem;
2770
width: 100%;
2871
text-align: center;
29-
background-color: ui-color(form-border);
30-
padding: $normal-margin 0;
31-
border: thin solid ui-color(black);
3272
}
3373

3474
/*
@@ -49,30 +89,16 @@
4989

5090
@mixin partner-grid {
5191
display: grid;
52-
grid-auto-rows: minmax(min-content, 100%);
53-
padding: 0;
54-
55-
@include width-between($phone-max, $first-break) {
56-
grid-template-columns: repeat(2, 1fr);
57-
}
58-
@include width-between($first-break, $second-break) {
59-
grid-template-columns: repeat(3, 1fr);
60-
}
61-
@include width-between($second-break, $third-break) {
62-
grid-template-columns: repeat(4, 1fr);
63-
}
64-
@include wider-than($third-break) {
65-
grid-template-columns: repeat(5, 1fr);
66-
}
92+
grid-template-columns: repeat(auto-fill, 21rem);
93+
justify-content: center;
6794

6895
@include width-up-to($phone-max) {
6996
grid-gap: 1.5rem;
70-
justify-content: center;
97+
grid-template-columns: auto;
7198
}
7299

73100
@include wider-than($phone-max) {
74101
grid-gap: 3rem;
75-
justify-content: left;
76102
}
77103

78104
.partner-card {
@@ -82,8 +108,7 @@
82108

83109
@mixin partner-card {
84110
background-color: ui-color(white);
85-
border-radius: 0.3rem;
86-
box-shadow: $card-shadow;
111+
border: thin solid os-color(light-gray);
87112
color: inherit;
88113
display: grid;
89114
grid-row-gap: 1rem;
@@ -156,7 +181,6 @@
156181

157182
.boxed {
158183
gap: 3rem;
159-
padding: 0;
160184

161185
@include width-up-to($phone-max) {
162186
gap: $normal-margin;

0 commit comments

Comments
 (0)