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
240606b3
Commit
240606b3
authored
Dec 12, 2017
by
Sheshank Shankar
Committed by
chrisgarrity
Dec 13, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixes #1702: Scratch Conference site - small edits (#1727)
Update the conference page with new banner image and small copy edits.
parent
04e1e369
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
6 deletions
+10
-6
src/views/conference/2018/index/index.jsx
src/views/conference/2018/index/index.jsx
+3
-0
src/views/conference/2018/index/index.scss
src/views/conference/2018/index/index.scss
+5
-5
src/views/conference/2018/index/l10n.json
src/views/conference/2018/index/l10n.json
+2
-1
static/images/conference/index/2018/title-banner.jpg
static/images/conference/index/2018/title-banner.jpg
+0
-0
No files found.
src/views/conference/2018/index/index.jsx
View file @
240606b3
...
...
@@ -108,6 +108,9 @@ var ConferenceSplash = React.createClass({
</
b
>
{
'
'
}
<
FormattedMessage
id=
'conference-2018.sessionItem4Desc'
/>
</
p
>
<
p
className=
'conf2018-panel-deadline'
>
<
FormattedMessage
id=
'conference-2018.deadline'
/>
</
p
>
</
p
>
<
a
className=
'button mod-2018-panel'
href=
'https://docs.google.com/forms/d/e/1FAIpQLSd7SkuQ-dfW-P3aArSQokK9GkKAUKufTVBHod_ElNIiFE9iBQ/viewform?usp=sf_link'
>
<
FormattedMessage
id=
'conference-2018.proposal'
/>
...
...
src/views/conference/2018/index/index.scss
View file @
240606b3
...
...
@@ -8,13 +8,17 @@
.title-banner-image.mod-2018
{
opacity
:
.75
;
margin-bottom
:
1
.75rem
;
background-image
:
url("/images/conference/index/201
7
/title-banner.jpg")
;
background-image
:
url("/images/conference/index/201
8
/title-banner.jpg")
;
background-position
:
center
;
background-size
:
cover
;
width
:
100%
;
height
:
20rem
;
}
.title-banner-h1.mod-2018
{
line-height
:
1
.25em
;
}
.conf2018-panel
,
.title-banner-h3.mod-2018
{
margin
:
auto
;
...
...
@@ -73,10 +77,6 @@ td {
height
:
10rem
;
}
.title-banner-h1.mod-2018
{
line-height
:
1
.25em
;
}
.conf2018-panel
,
.title-banner-h3.mod-2018
{
width
:
initial
;
...
...
src/views/conference/2018/index/l10n.json
View file @
240606b3
{
"conference-2018.title"
:
"Scratch Conference 2018"
,
"conference-2018.title"
:
"Scratch Conference 2018
:
"
,
"conference-2018.subtitle"
:
"The Next Generation"
,
"conference-2018.dateDesc"
:
"July 26-28, 2018 | Cambridge, MA, USA"
,
"conference-2018.dateDescMore"
:
" (with opening reception the evening of July 25)"
,
...
...
@@ -22,6 +22,7 @@
"conference-2018.sessionItem4Title"
:
"Ignite talk (5 minutes)."
,
"conference-2018.sessionItem4Desc"
:
"Share what you've been doing in a short, lively presentation."
,
"conference-2018.deadline"
:
"Deadline for proposals is February 5, 2018."
,
"conference-2018.proposal"
:
" Submit Your Proposal"
,
"conference-2018.proposalDeadline"
:
"Deadline for proposals: February 5"
,
"conference-2018.proposalAccept"
:
"Notification of acceptance: March 1"
,
...
...
static/images/conference/index/2018/title-banner.jpg
0 → 100644
View file @
240606b3
331 KB
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