Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
scratch-www
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
xpstem
scratch-www
Commits
6624dfcf
Commit
6624dfcf
authored
Sep 29, 2020
by
seotts
Committed by
Karishma Chadha
Oct 22, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
finalize leadership section
parent
d53a8f71
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
52 additions
and
24 deletions
+52
-24
src/views/annual-report/annual-report.jsx
src/views/annual-report/annual-report.jsx
+22
-20
src/views/annual-report/annual-report.scss
src/views/annual-report/annual-report.scss
+24
-3
src/views/annual-report/l10n.json
src/views/annual-report/l10n.json
+1
-1
src/views/annual-report/people.json
src/views/annual-report/people.json
+5
-0
No files found.
src/views/annual-report/annual-report.jsx
View file @
6624dfcf
...
...
@@ -1117,7 +1117,7 @@ class AnnualReport extends React.Component {
</
h3
>
<
FlexRow
className=
"leadership-board"
>
<
div
className=
"board-member"
>
<
b
>
<
b
className=
"board-title"
>
<
FormattedMessage
id=
"annualReport.leadershipChair"
/>
</
b
>
<
h4
>
Mitch Resnick
</
h4
>
...
...
@@ -1125,7 +1125,7 @@ class AnnualReport extends React.Component {
<
br
/>
MIT Media Lab
</
div
>
<
div
className=
"board-member"
>
<
b
>
<
b
className=
"board-title"
>
<
FormattedMessage
id=
"annualReport.leadershipViceChair"
/>
</
b
>
<
h4
>
David Siegel
</
h4
>
...
...
@@ -1133,7 +1133,7 @@ class AnnualReport extends React.Component {
<
br
/>
Two Sigma
</
div
>
<
div
className=
"board-member"
>
<
b
>
<
b
className=
"board-title"
>
<
FormattedMessage
id=
"annualReport.leadershipBoardMember"
/>
</
b
>
<
h4
>
Margaret Honey
</
h4
>
...
...
@@ -1141,7 +1141,7 @@ class AnnualReport extends React.Component {
<
br
/>
Two Sigma
</
div
>
<
div
className=
"board-member"
>
<
b
>
<
b
className=
"board-title"
>
<
FormattedMessage
id=
"annualReport.leadershipBoardMember"
/>
</
b
>
<
h4
>
Christina Miller
</
h4
>
...
...
@@ -1149,7 +1149,7 @@ class AnnualReport extends React.Component {
<
br
/>
Cartoon Network
</
div
>
<
div
className=
"board-member"
>
<
b
>
<
b
className=
"board-title"
>
<
FormattedMessage
id=
"annualReport.leadershipBoardMember"
/>
</
b
>
<
h4
>
Avraham Kadar
</
h4
>
...
...
@@ -1162,18 +1162,19 @@ class AnnualReport extends React.Component {
</
h4
>
<
FlexRow
className=
"leadership-board"
>
<
div
className=
"board-member"
>
<
b
>
<
b
className=
"board-title"
>
<
FormattedMessage
id=
"annualReport.leadershipBoardSecretary"
/>
</
b
>
<
h4
>
Sheri Vammen
</
h4
>
</
div
>
<
div
className=
"board-member"
>
<
b
>
<
b
className=
"board-title"
>
<
FormattedMessage
id=
"annualReport.leadershipBoardTreasurer"
/>
</
b
>
<
h4
>
Rich Sauer
</
h4
>
</
div
>
</
FlexRow
>
<
div
className=
"leadership-scratch-team"
>
<
h3
>
<
FormattedMessage
id=
"annualReport.leadershipScratchTeam"
/>
</
h3
>
...
...
@@ -1190,6 +1191,7 @@ class AnnualReport extends React.Component {
<
PeopleGrid
people=
{
People
}
/>
</
div
>
</
div
>
</
div
>
<
div
className=
"donate-section section"
id=
"donate"
...
...
src/views/annual-report/annual-report.scss
View file @
6624dfcf
...
...
@@ -341,7 +341,7 @@ p {
.transition-images
{
width
:
100%
;
//
overflow-x: hidden;
overflow-x
:
hidden
;
img
{
margin-bottom
:
-200px
;
margin-right
:
-68px
;
...
...
@@ -824,19 +824,40 @@ p {
background-color
:
#EDEDFF
;
.inner
{
width
:
620
;
padding-bottom
:
76px
;
}
h2
,
h3
,
h4
{
text-align
:
center
;
}
h2
{
margin-bottom
:
84px
;
}
.leadership-board
{
justify-content
:
center
;
margin-bottom
:
96px
;
.board-member
{
text-align
:
center
;
width
:
300px
;
margin
:
60px
0
;
margin-top
:
44px
;
line-height
:
1
.5rem
;
}
h4
{
padding
:
12px
0
16px
0
;
}
}
.leadership-scratch-team
{
margin-top
:
128px
;
.avatar-item
{
img
{
background-color
:
#EDEDFF
;
}
}
}
...
...
src/views/annual-report/l10n.json
View file @
6624dfcf
...
...
@@ -88,7 +88,7 @@
"annualReport.leadershipBoard"
:
"Board of Directors"
,
"annualReport.leadershipChair"
:
"Chair"
,
"annualReport.leadershipProfessor"
:
"Professor of Learning Research"
,
"annualReport.leadershipViceChair"
:
"Vice
Chair"
,
"annualReport.leadershipViceChair"
:
"Vice
-
Chair"
,
"annualReport.leadershipBoardMember"
:
"Board Member"
,
"annualReport.leadershipPresidentCEO"
:
"President and CEO"
,
"annualReport.leadershipFormerPresident"
:
"Former President"
,
...
...
src/views/annual-report/people.json
View file @
6624dfcf
...
...
@@ -145,6 +145,11 @@
"userId"
:
26779669
,
"name"
:
"Kathy"
},
{
"userName"
:
"kalakoalasmiles"
,
"userId"
:
62522360
,
"name"
:
"Keyla"
},
{
"userName"
:
"khanning"
,
"userId"
:
1553886
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment