Skip to content

GitLab

S
scratch-www
Commit 6624dfcf authored by seotts's avatar seotts Committed by Karishma Chadha
Browse files
Options

finalize leadership section

parent d53a8f71
Hide whitespace changes
Inline Side-by-side
Showing with 52 additions and 24 deletions
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,32 +1162,34 @@ 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>
<h3>
<FormattedMessage id="annualReport.leadershipScratchTeam" />
</h3>
<div className="executive-director">
<PeopleGrid
people={[{
userName: 'Champ99',
userId: 900283,
name: 'Champika'
}]}
/>
<FormattedMessage id="annualReport.leadershipInterim" />
<div className="leadership-scratch-team">
<h3>
<FormattedMessage id="annualReport.leadershipScratchTeam" />
</h3>
<div className="executive-director">
<PeopleGrid
people={[{
userName: 'Champ99',
userId: 900283,
name: 'Champika'
}]}
/>
<FormattedMessage id="annualReport.leadershipInterim" />
</div>
<PeopleGrid people={People} />
</div>
<PeopleGrid people={People} />
</div>
</div>
<div
......
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,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment