Skip to content

Commit 00c9617

Browse files
committed
added es-media element, TODOs and some grid css
1 parent a6f6e68 commit 00c9617

File tree

6 files changed

+59
-7
lines changed

6 files changed

+59
-7
lines changed

addon/styles/addon.css

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
@import "components/es-footer.css";
1212
@import "components/es-header.css";
1313
@import "components/es-list.css";
14+
@import "components/es-media.css";
1415
@import "components/es-navbar.css";
1516
@import "components/es-page-header.css";
1617
@import "components/es-tabs.css";

addon/styles/components/es-button.css

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.es-button {
1+
.es-button { /* TODO we should have es-button-primary */
22
background-color: var(--color-ember-orange);
33
border-radius: 4px;
44
color: var(--color-light);
@@ -44,4 +44,7 @@
4444
margin-left: 20px;
4545
}
4646

47-
}
47+
}
48+
49+
/* TODO add hover state */
50+
/* TODO add focus state */

addon/styles/components/es-list.css

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,23 @@
1515
height: auto;
1616
}
1717
}
18-
} */
18+
} */
19+
20+
21+
22+
.es-list-hero-images {
23+
/* don't show it on mobile- it's not necessary for the site and it's not kind to the users' bandwidth */
24+
display: none;
25+
26+
@media screen and (min-width: 992px) {
27+
list-style: none;
28+
margin: 0;
29+
padding: 0;
30+
display: grid;
31+
grid-template-columns: 1fr 1fr 1fr;
32+
grid-template-rows: 1fr 1fr;
33+
grid-column-gap: 50px;
34+
grid-row-gap: 0px;
35+
max-height: 400px; /* whatever the max height of the images are */
36+
}
37+
}

addon/styles/components/es-media.css

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
/* this component has a paragraph of text on one side, and and image on the other, and alternates depending on position. */
2+
.es-media {
3+
/* TODO think about smaller viewports and put them here */
4+
@media screen and (min-width: 992px) {
5+
display: flex;
6+
flex-flow: row wrap;
7+
}
8+
}

addon/styles/global.css

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ body, html {
3636
}
3737

3838
p {
39-
font-size: 1em;
40-
font-weight: normal;
39+
font-size: 1.2rem;
40+
font-weight: 300;
4141
margin: 0.25em 0.5em;
4242
}
4343

@@ -115,4 +115,6 @@ h1, h2 {
115115
transform: skewY(-15deg);
116116
width: 30%;
117117
z-index:-1;
118-
}
118+
}
119+
120+
/* TODO this grid generator tool is really useful: https://cssgrid-generator.netlify.com/ */

addon/styles/helpers.css

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,22 @@
77
}
88

99
.margin-bottom-wide {
10-
margin-bottom: 5vh;
10+
@media screen and (min-width:992px) {
11+
margin-bottom: 5vh;
12+
}
1113
}
14+
.margin-top-wide {
15+
@media screen and (min-width:992px) {
16+
margin-top: 5vh;
17+
}
18+
}
19+
.margin-top-bottom-wide {
20+
@media screen and (min-width:992px) {
21+
margin-top: 5vh;
22+
margin-bottom: 5vh;
23+
}
24+
}
25+
1226

1327
.margin-left-small, .margin-left-narrow {
1428
margin-left: 2rem;
@@ -31,3 +45,8 @@
3145
padding-right: 15%;
3246
}
3347

48+
.padding-right-half {
49+
@media screen and (min-width: 992px) {
50+
padding-right: 50%;
51+
}
52+
}

0 commit comments

Comments
 (0)