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
e2894dd1
Commit
e2894dd1
authored
Oct 27, 2020
by
carljbowman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix photo credit typographic styles
parent
3ab4eb18
Changes
2
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
108 additions
and
103 deletions
+108
-103
src/views/annual-report/annual-report.jsx
src/views/annual-report/annual-report.jsx
+45
-37
src/views/annual-report/annual-report.scss
src/views/annual-report/annual-report.scss
+63
-66
No files found.
src/views/annual-report/annual-report.jsx
View file @
e2894dd1
...
...
@@ -1519,9 +1519,9 @@ class AnnualReport extends React.Component {
</
div
>
<
div
className=
"blm-image"
>
<
img
src=
"/images/annual-report/initiatives/BLM Hero.svg"
/>
<
b
>
<
span
className=
"photo-credit"
>
<
FormattedMessage
id=
"annualReport.communityArtwork"
/>
</
b
>
</
span
>
</
div
>
<
div
className=
"blm-projects"
>
<
Grid
...
...
@@ -1684,11 +1684,9 @@ class AnnualReport extends React.Component {
<
div
className=
"pizza-img"
>
<
img
src=
"/images/annual-report/initiatives/schools/CPS Story/Pizza.svg"
/>
</
div
>
<
div
className=
"photo-credit"
>
<
p
>
<
FormattedMessage
id=
"annualReport.familyNightsPhotoCredit"
/>
</
p
>
</
div
>
<
span
className=
"photo-credit"
>
<
FormattedMessage
id=
"annualReport.familyNightsPhotoCredit"
/>
</
span
>
</
div
>
<
div
className=
"inner schools"
>
<
h4
>
...
...
@@ -1786,12 +1784,14 @@ class AnnualReport extends React.Component {
<
div
className=
"conferences-hero-and-caption"
>
{
/* eslint-disable-next-line max-len */
}
<
img
src=
"/images/annual-report/initiatives/schools/Conferences Story/Scratch Conferences Hero.png"
/>
<
FormattedMessage
id=
"annualReport.conferencesHeroImageCaption"
values=
{
{
photoCredit
:
'
Carmelo Presicce
'
}
}
/>
<
span
className=
"photo-credit"
>
<
FormattedMessage
id=
"annualReport.conferencesHeroImageCaption"
values=
{
{
photoCredit
:
'
Carmelo Presicce
'
}
}
/>
</
span
>
</
div
>
</
MediaQuery
>
</
div
>
...
...
@@ -1799,12 +1799,14 @@ class AnnualReport extends React.Component {
<
MediaQuery
maxWidth=
{
frameless
.
mobile
-
1
}
>
<
div
className=
"conferences-hero-and-caption"
>
<
div
className=
"conferences-hero"
/>
<
FormattedMessage
id=
"annualReport.conferencesHeroImageCaption"
values=
{
{
photoCredit
:
'
Carmelo Presicce
'
}
}
/>
<
span
className=
"photo-credit"
>
<
FormattedMessage
id=
"annualReport.conferencesHeroImageCaption"
values=
{
{
photoCredit
:
'
Carmelo Presicce
'
}
}
/>
</
span
>
</
div
>
</
MediaQuery
>
<
div
className=
"inner schools-conferences bottom"
>
...
...
@@ -1813,12 +1815,14 @@ class AnnualReport extends React.Component {
<
div
className=
"conference-image-and-caption left"
>
{
/* eslint-disable-next-line max-len */
}
<
img
src=
"/images/annual-report/initiatives/schools/Conferences Story/Latin America Conference.png"
/>
<
FormattedMessage
id=
"annualReport.conferencesLatinAmericaImageCaption"
values=
{
{
photoCredit
:
'
Scratch al Sur
'
}
}
/>
<
span
className=
"photo-credit"
>
<
FormattedMessage
id=
"annualReport.conferencesLatinAmericaImageCaption"
values=
{
{
photoCredit
:
'
Scratch al Sur
'
}
}
/>
</
span
>
</
div
>
<
div
className=
"conference-title-and-description"
>
<
h4
>
...
...
@@ -1887,24 +1891,28 @@ class AnnualReport extends React.Component {
<
div
className=
"conference-image-and-caption"
>
{
/* eslint-disable-next-line max-len */
}
<
img
src=
"/images/annual-report/initiatives/schools/Conferences Story/Europe Conference.png"
/>
<
FormattedMessage
id=
"annualReport.conferencesEuropeImageCaption"
values=
{
{
photoCredit
:
'
Raspberry Pi
'
}
}
/>
<
span
className=
"photo-credit"
>
<
FormattedMessage
id=
"annualReport.conferencesEuropeImageCaption"
values=
{
{
photoCredit
:
'
Raspberry Pi
'
}
}
/>
</
span
>
</
div
>
</
div
>
<
div
className=
"schools-conferences-region"
>
<
div
className=
"conference-image-and-caption left"
>
{
/* eslint-disable-next-line max-len */
}
<
img
src=
"/images/annual-report/initiatives/schools/Conferences Story/Africa Conference.png"
/>
<
FormattedMessage
id=
"annualReport.conferencesAfricaImageCaption"
values=
{
{
photoCredit
:
'
Carmelo Presicce
'
}
}
/>
<
span
className=
"photo-credit"
>
<
FormattedMessage
id=
"annualReport.conferencesAfricaImageCaption"
values=
{
{
photoCredit
:
'
Carmelo Presicce
'
}
}
/>
</
span
>
</
div
>
<
div
className=
"conference-title-and-description"
>
<
h4
>
...
...
src/views/annual-report/annual-report.scss
View file @
e2894dd1
This diff is collapsed.
Click to expand it.
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