Skip to content

GitLab

S
scratch-www
Commit c10a8051 authored by Karishma Chadha's avatar Karishma Chadha
Browse files
Options

Add updated blocks images for reach section, clean up images folder (creating... 

Add updated blocks images for reach section, clean up images folder (creating financials and reach subfolders)
parent 9a0ce3db
Hide whitespace changes
Inline Side-by-side
Showing with 36 additions and 57 deletions
src/views/annual-report/annual-report.jsx
View file @ c10a8051
......@@ -647,7 +647,7 @@ class AnnualReport extends React.Component {
<p>
<FormattedMessage id="annualReport.reachSubtitle" />
</p>
<img src="/images/annual-report/Calendar.svg" />
<img src="/images/annual-report/reach/Calendar.svg" />
<div className="reach-numbers">
<div className="reach-datapoint">
<FormattedMessage
......@@ -720,7 +720,7 @@ class AnnualReport extends React.Component {
<FormattedMessage id="annualReport.reachGrowthBlurb" />
</p>
</div>
<img src="/images/annual-report/milestones/community-growth-graph.svg" />
<img src="/images/annual-report/reach/community-growth-graph.svg" />
</div>
</div>
<div className="map-inner">
......@@ -783,17 +783,17 @@ class AnnualReport extends React.Component {
<FormattedMessage id="annualReport.reachTranslationBlurb" />
</p>
</div>
<img src="/images/annual-report/translated-illustration.svg" />
<img src="/images/annual-report/reach/translated-illustration.svg" />
</div>
</div>
<div className="scratch-jr-transition-img">
<img src="/images/annual-report/horizontal-command.svg" />
<img src="/images/annual-report/reach/horizontal-command.svg" />
</div>
</div>
<div className="reach-scratch-jr">
<div className="inner">
<div className="scratch-jr-intro">
<img src="/images/annual-report/ScratchJr-Logo.svg" />
<img src="/images/annual-report/reach/ScratchJr-Logo.svg" />
<p>
<FormattedMessage id="annualReport.reachScratchJrBlurb" />
</p>
......@@ -815,7 +815,7 @@ class AnnualReport extends React.Component {
</div>
</div>
<div className="scratch-jr-transition-img">
<img src="/images/annual-report/horizontal-loop.svg" />
<img src="/images/annual-report/reach/horizontal-loop.svg" />
</div>
</div>
<div
......@@ -1844,7 +1844,7 @@ class AnnualReport extends React.Component {
<div className="financials-content">
<div className="financials-table">
<div className="circle-and-words">
<img src="/images/annual-report/blue-circle.svg" />
<img src="/images/annual-report/financials/blue-circle.svg" />
<div className="key-and-money">
<p className="key">
<FormattedMessage id="annualReport.financialsGrants" />
......@@ -1856,7 +1856,7 @@ class AnnualReport extends React.Component {
</div>
</div>
<div className="circle-and-words">
<img src="/images/annual-report/yellow-circle.svg" />
<img src="/images/annual-report/financials/yellow-circle.svg" />
<div className="key-and-money">
<p className="key">
<FormattedMessage id="annualReport.financialsEvents" />
......@@ -1868,7 +1868,7 @@ class AnnualReport extends React.Component {
</div>
</div>
<div className="circle-and-words">
<img src="/images/annual-report/green-circle.svg" />
<img src="/images/annual-report/financials/green-circle.svg" />
<div className="key-and-money">
<p className="key">
<FormattedMessage id="annualReport.financialsOther" />
......@@ -1892,7 +1892,7 @@ class AnnualReport extends React.Component {
</div>
<img
className="graph"
src="/images/annual-report/revenue-graph.svg"
src="/images/annual-report/financials/revenue-graph.svg"
/>
</div>
<h3>
......@@ -1902,7 +1902,7 @@ class AnnualReport extends React.Component {
<div className="financials-content">
<div className="financials-table">
<div className="circle-and-words">
<img src="/images/annual-report/blue-circle.svg" />
<img src="/images/annual-report/financials/blue-circle.svg" />
<div className="key-and-money">
<p className="key">
<FormattedMessage id="annualReport.financialsProgram" />
......@@ -1914,7 +1914,7 @@ class AnnualReport extends React.Component {
</div>
</div>
<div className="circle-and-words">
<img src="/images/annual-report/yellow-circle.svg" />
<img src="/images/annual-report/financials/yellow-circle.svg" />
<div className="key-and-money">
<p className="key">
<FormattedMessage id="annualReport.financialsGeneral" />
......@@ -1926,7 +1926,7 @@ class AnnualReport extends React.Component {
</div>
</div>
<div className="circle-and-words">
<img src="/images/annual-report/green-circle.svg" />
<img src="/images/annual-report/financials/green-circle.svg" />
<div className="key-and-money">
<p className="key">
<FormattedMessage id="annualReport.financialsFundraising" />
......@@ -1950,7 +1950,7 @@ class AnnualReport extends React.Component {
</div>
<img
className="graph"
src="/images/annual-report/expenses-graph.svg"
src="/images/annual-report/financials/expenses-graph.svg"
/>
</div>
<div className="financials-button-wrapper">
......@@ -1962,7 +1962,7 @@ class AnnualReport extends React.Component {
<FormattedMessage id="annualReport.financialsButton" />
<img
className="download-icon"
src="/images/annual-report/download-icon.svg"
src="/images/annual-report/financials/download-icon.svg"
/>
</Button>
</a>
......
static/images/annual-report/horizontal-command.svg deleted 100644 → 0
View file @ 9a0ce3db
<?xml version="1.0" encoding="UTF-8"?>
<svg width="88px" height="88px" viewBox="0 0 88 88" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>ScratchJr Command</title>
<defs>
<filter id="filter-1">
<feColorMatrix in="SourceGraphic" type="matrix" values="0 0 0 0 1.000000 0 0 0 0 0.749020 0 0 0 0 0.000000 0 0 0 1.000000 0"></feColorMatrix>
</filter>
</defs>
<g id="ScratchJr-Command" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round">
<g id="Horizontal/Block/Command" transform="translate(8.000000, 12.000000)" filter="url(#filter-1)">
<g transform="translate(36.000000, 32.000000) rotate(14.000000) translate(-36.000000, -32.000000) ">
<path d="M0,49.6568542 C0,48.5959883 0.421427361,47.5785726 1.17157288,46.8284271 L1.17157288,46.8284271 L6.82842712,41.1715729 C7.57857264,40.4214274 8,39.4040117 8,38.3431458 L8,38.3431458 L8,25.6568542 C8,24.5959883 7.57857264,23.5785726 6.82842712,22.8284271 L6.82842712,22.8284271 L1.17157288,17.1715729 C0.421427361,16.4214274 0,15.4040117 0,14.3431458 L0,14.3431458 L0,4 C-2.705415e-16,1.790861 1.790861,4.05812251e-16 4,0 L60,0 C62.209139,-4.05812251e-16 64,1.790861 64,4 L64,14.375 L64.0064166,14.5697275 C64.061881,15.5479932 64.4750092,16.4750092 65.1715729,17.1715729 L70.8284271,22.8284271 C71.5785726,23.5785726 72,24.5959883 72,25.6568542 L72,38.3431458 C72,39.4040117 71.5785726,40.4214274 70.8284271,41.1715729 L65.1715729,46.8284271 C64.4290142,47.5709858 64.0085581,48.5754358 64.0001292,49.6246797 L64,60 C64,62.209139 62.209139,64 60,64 L4,64 C1.790861,64 2.705415e-16,62.209139 0,60 Z" id="Command" stroke="#CC9900" fill="#FFBF00"></path>
</g>
</g>
</g>
</svg>
\ No newline at end of file
static/images/annual-report/horizontal-loop.svg deleted 100644 → 0
View file @ 9a0ce3db
<?xml version="1.0" encoding="UTF-8"?>
<svg width="144px" height="120px" viewBox="0 0 144 120" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>ScratchJr Loop</title>
<defs>
<filter id="filter-1">
<feColorMatrix in="SourceGraphic" type="matrix" values="0 0 0 0 1.000000 0 0 0 0 0.670588 0 0 0 0 0.098039 0 0 0 1.000000 0"></feColorMatrix>
</filter>
</defs>
<g id="ScratchJr-Loop" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round">
<g id="Horizontal/Block/Forever-Loop" transform="translate(10.000000, 22.000000)" filter="url(#filter-1)">
<g transform="translate(62.000000, 38.000000) rotate(-15.000000) translate(-62.000000, -38.000000) ">
<path d="M120,0 C122.209139,-4.05812251e-16 124,1.790861 124,4 L124,72 C124,74.209139 122.209139,76 120,76 L64,76 C61.790861,76 60,74.209139 60,72 L60,61.6568542 C60,60.5959883 60.4214274,59.5785726 61.1715729,58.8284271 L61.1715729,58.8284271 L66.8284271,53.1715729 C67.5785726,52.4214274 68,51.4040117 68,50.3431458 L68,50.3431458 L68,37.6568542 C68,36.5959883 67.5785726,35.5785726 66.8284271,34.8284271 L66.8284271,34.8284271 L61.1715729,29.1715729 C60.4214274,28.4214274 60,27.4040117 60,26.3431458 L60,26.3431458 L60,16 C60,13.790861 58.209139,12 56,12 L28,12 C25.790861,12 24,13.790861 24,16 L24,26.3431458 C24,27.4040117 24.4214274,28.4214274 25.1715729,29.1715729 L30.8284271,34.8284271 C31.5785726,35.5785726 32,36.5959883 32,37.6568542 L32,50.3431458 C32,51.4040117 31.5785726,52.4214274 30.8284271,53.1715729 L25.1715729,58.8284271 C24.4214274,59.5785726 24,60.5959883 24,61.6568542 L24,72 C24,74.209139 22.209139,76 20,76 L4,76 C1.790861,76 -4.86779581e-14,74.209139 -4.89484996e-14,72 L-4.89484996e-14,61.6568542 C-4.89484996e-14,60.5959883 0.421427361,59.5785726 1.17157288,58.8284271 L1.17157288,58.8284271 L6.82842712,53.1715729 C7.57857264,52.4214274 8,51.4040117 8,50.3431458 L8,50.3431458 L8,37.6568542 C8,36.5959883 7.57857264,35.5785726 6.82842712,34.8284271 L6.82842712,34.8284271 L1.17157288,29.1715729 C0.421427361,28.4214274 -4.89484996e-14,27.4040117 -4.89484996e-14,26.3431458 L-4.89484996e-14,26.3431458 L-4.89484996e-14,4 C-4.92190411e-14,1.790861 1.790861,4.05812251e-16 4,0 L120,0 Z" id="Forever-Loop" stroke="#CF8B17" fill="#FFAB19"></path>
</g>
</g>
</g>
</svg>
\ No newline at end of file
static/images/annual-report/milestones/vertical-loop.svg
View file @ c10a8051
<?xml version="1.0" encoding="UTF-8"?>
<svg width="216px" height="216px" viewBox="0 0 216 216" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>Vertical Loop Block</title>
<defs>
<filter id="filter-1">
<feColorMatrix in="SourceGraphic" type="matrix" values="0 0 0 0 1.000000 0 0 0 0 0.670588 0 0 0 0 0.098039 0 0 0 1.000000 0"></feColorMatrix>
</filter>
</defs>
<g id="Vertical-Loop-Block" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round">
<g id="Vertical/Block/Loop" transform="translate(27.000000, 40.000000)" filter="url(#filter-1)">
<g transform="translate(84.000000, 68.000000) rotate(-25.000000) translate(-84.000000, -68.000000) ">
<path d="M16,92 C16,94.209139 17.790861,96 20,96 L30.3431458,96 C31.4040117,96 32.4214274,96.4214274 33.1715729,97.1715729 L33.1715729,97.1715729 L38.8284271,102.828427 C39.5785726,103.578573 40.5959883,104 41.6568542,104 L41.6568542,104 L54.3431458,104 C55.4040117,104 56.4214274,103.578573 57.1715729,102.828427 L57.1715729,102.828427 L62.8284271,97.1715729 C63.5785726,96.4214274 64.5959883,96 65.6568542,96 L65.6568542,96 L164,96 C166.209139,96 168,97.790861 168,100 L168,124 C168,126.209139 166.209139,128 164,128 L49.6568542,128 C48.5959883,128 47.5785726,128.421427 46.8284271,129.171573 L41.1715729,134.828427 C40.4214274,135.578573 39.4040117,136 38.3431458,136 L25.6568542,136 C24.5959883,136 23.5785726,135.578573 22.8284271,134.828427 L17.1715729,129.171573 C16.4214274,128.421427 15.4040117,128 14.3431458,128 L4,128 C1.790861,128 3.22449646e-14,126.209139 3.19744231e-14,124 L3.19744231e-14,4 C3.17038816e-14,1.790861 1.790861,-1.84335299e-13 4,-1.84741111e-13 L14.3431458,-1.37667655e-14 C15.4040117,-1.37667655e-14 16.4214274,0.421427361 17.1715729,1.17157288 L17.1715729,1.17157288 L22.8284271,6.82842712 C23.5785726,7.57857264 24.5959883,8 25.6568542,8 L25.6568542,8 L38.3431458,8 C39.4040117,8 40.4214274,7.57857264 41.1715729,6.82842712 L41.1715729,6.82842712 L46.8284271,1.17157288 C47.5785726,0.421427361 48.5959883,-1.37667655e-14 49.6568542,-1.37667655e-14 L49.6568542,-1.37667655e-14 L164,-1.84741111e-13 C166.209139,-1.85146924e-13 168,1.790861 168,4 L168,44 C168,46.209139 166.209139,48 164,48 L65.6568542,48 C64.5959883,48 63.5785726,48.4214274 62.8284271,49.1715729 L57.1715729,54.8284271 C56.4214274,55.5785726 55.4040117,56 54.3431458,56 L41.6568542,56 C40.5959883,56 39.5785726,55.5785726 38.8284271,54.8284271 L33.1715729,49.1715729 C32.4214274,48.4214274 31.4040117,48 30.3431458,48 L20,48 C17.790861,48 16,49.790861 16,52 L16,92 Z" id="Loop-C-Block" stroke="#CF8B17" fill="#FFAB19"></path>
</g>
<g id="Vertical-Loop-Block" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="Vertical/Block/Loop" transform="translate(111.000000, 108.000000) rotate(-25.000000) translate(-111.000000, -108.000000) translate(27.000000, 40.000000)" fill="#FFAB19">
<path d="M16,92 C16,94.209139 17.790861,96 20,96 L30.3431458,96 C31.4040117,96 32.4214274,96.4214274 33.1715729,97.1715729 L33.1715729,97.1715729 L38.8284271,102.828427 C39.5785726,103.578573 40.5959883,104 41.6568542,104 L41.6568542,104 L54.3431458,104 C55.4040117,104 56.4214274,103.578573 57.1715729,102.828427 L57.1715729,102.828427 L62.8284271,97.1715729 C63.5785726,96.4214274 64.5959883,96 65.6568542,96 L65.6568542,96 L164,96 C166.209139,96 168,97.790861 168,100 L168,124 C168,126.209139 166.209139,128 164,128 L49.6568542,128 C48.5959883,128 47.5785726,128.421427 46.8284271,129.171573 L41.1715729,134.828427 C40.4214274,135.578573 39.4040117,136 38.3431458,136 L25.6568542,136 C24.5959883,136 23.5785726,135.578573 22.8284271,134.828427 L17.1715729,129.171573 C16.4214274,128.421427 15.4040117,128 14.3431458,128 L4,128 C1.790861,128 3.22449646e-14,126.209139 3.19744231e-14,124 L3.19744231e-14,4 C3.17038816e-14,1.790861 1.790861,-1.84335299e-13 4,-1.84741111e-13 L14.3431458,-1.37667655e-14 C15.4040117,-1.37667655e-14 16.4214274,0.421427361 17.1715729,1.17157288 L17.1715729,1.17157288 L22.8284271,6.82842712 C23.5785726,7.57857264 24.5959883,8 25.6568542,8 L25.6568542,8 L38.3431458,8 C39.4040117,8 40.4214274,7.57857264 41.1715729,6.82842712 L41.1715729,6.82842712 L46.8284271,1.17157288 C47.5785726,0.421427361 48.5959883,-1.37667655e-14 49.6568542,-1.37667655e-14 L49.6568542,-1.37667655e-14 L164,-1.84741111e-13 C166.209139,-1.85146924e-13 168,1.790861 168,4 L168,44 C168,46.209139 166.209139,48 164,48 L65.6568542,48 C64.5959883,48 63.5785726,48.4214274 62.8284271,49.1715729 L57.1715729,54.8284271 C56.4214274,55.5785726 55.4040117,56 54.3431458,56 L41.6568542,56 C40.5959883,56 39.5785726,55.5785726 38.8284271,54.8284271 L33.1715729,49.1715729 C32.4214274,48.4214274 31.4040117,48 30.3431458,48 L20,48 C17.790861,48 16,49.790861 16,52 L16,92 Z" id="Loop-C-Block"></path>
</g>
</g>
</svg>
\ No newline at end of file
static/images/annual-report/reach/horizontal-command.svg 0 → 100644
View file @ c10a8051
<?xml version="1.0" encoding="UTF-8"?>
<svg width="88px" height="88px" viewBox="0 0 88 88" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>ScratchJr Command</title>
<g id="ScratchJr-Command" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="Horizontal/Block/Command" transform="translate(44.000000, 44.000000) rotate(14.000000) translate(-44.000000, -44.000000) translate(8.000000, 12.000000)" fill="#FFBF00">
<path d="M0,49.6568542 C0,48.5959883 0.421427361,47.5785726 1.17157288,46.8284271 L1.17157288,46.8284271 L6.82842712,41.1715729 C7.57857264,40.4214274 8,39.4040117 8,38.3431458 L8,38.3431458 L8,25.6568542 C8,24.5959883 7.57857264,23.5785726 6.82842712,22.8284271 L6.82842712,22.8284271 L1.17157288,17.1715729 C0.421427361,16.4214274 0,15.4040117 0,14.3431458 L0,14.3431458 L0,4 C-2.705415e-16,1.790861 1.790861,4.05812251e-16 4,0 L60,0 C62.209139,-4.05812251e-16 64,1.790861 64,4 L64,14.375 L64.0064166,14.5697275 C64.061881,15.5479932 64.4750092,16.4750092 65.1715729,17.1715729 L70.8284271,22.8284271 C71.5785726,23.5785726 72,24.5959883 72,25.6568542 L72,38.3431458 C72,39.4040117 71.5785726,40.4214274 70.8284271,41.1715729 L65.1715729,46.8284271 C64.4290142,47.5709858 64.0085581,48.5754358 64.0001292,49.6246797 L64,60 C64,62.209139 62.209139,64 60,64 L4,64 C1.790861,64 2.705415e-16,62.209139 0,60 Z" id="Command"></path>
</g>
</g>
</svg>
\ No newline at end of file
static/images/annual-report/reach/horizontal-loop.svg 0 → 100644
View file @ c10a8051
<?xml version="1.0" encoding="UTF-8"?>
<svg width="144px" height="120px" viewBox="0 0 144 120" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>ScratchJr Loop</title>
<g id="ScratchJr-Loop" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="Horizontal/Block/Forever-Loop" transform="translate(72.000000, 60.000000) rotate(-15.000000) translate(-72.000000, -60.000000) translate(10.000000, 22.000000)" fill="#FFAB19">
<path d="M120,0 C122.209139,-4.05812251e-16 124,1.790861 124,4 L124,72 C124,74.209139 122.209139,76 120,76 L64,76 C61.790861,76 60,74.209139 60,72 L60,61.6568542 C60,60.5959883 60.4214274,59.5785726 61.1715729,58.8284271 L61.1715729,58.8284271 L66.8284271,53.1715729 C67.5785726,52.4214274 68,51.4040117 68,50.3431458 L68,50.3431458 L68,37.6568542 C68,36.5959883 67.5785726,35.5785726 66.8284271,34.8284271 L66.8284271,34.8284271 L61.1715729,29.1715729 C60.4214274,28.4214274 60,27.4040117 60,26.3431458 L60,26.3431458 L60,16 C60,13.790861 58.209139,12 56,12 L28,12 C25.790861,12 24,13.790861 24,16 L24,26.3431458 C24,27.4040117 24.4214274,28.4214274 25.1715729,29.1715729 L30.8284271,34.8284271 C31.5785726,35.5785726 32,36.5959883 32,37.6568542 L32,50.3431458 C32,51.4040117 31.5785726,52.4214274 30.8284271,53.1715729 L25.1715729,58.8284271 C24.4214274,59.5785726 24,60.5959883 24,61.6568542 L24,72 C24,74.209139 22.209139,76 20,76 L4,76 C1.790861,76 -4.86779581e-14,74.209139 -4.89484996e-14,72 L-4.89484996e-14,61.6568542 C-4.89484996e-14,60.5959883 0.421427361,59.5785726 1.17157288,58.8284271 L1.17157288,58.8284271 L6.82842712,53.1715729 C7.57857264,52.4214274 8,51.4040117 8,50.3431458 L8,50.3431458 L8,37.6568542 C8,36.5959883 7.57857264,35.5785726 6.82842712,34.8284271 L6.82842712,34.8284271 L1.17157288,29.1715729 C0.421427361,28.4214274 -4.89484996e-14,27.4040117 -4.89484996e-14,26.3431458 L-4.89484996e-14,26.3431458 L-4.89484996e-14,4 C-4.92190411e-14,1.790861 1.790861,4.05812251e-16 4,0 L120,0 Z" id="Forever-Loop"></path>
</g>
</g>
</svg>
\ No newline at end of file
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