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
49edbc5b
Unverified
Commit
49edbc5b
authored
Jul 25, 2018
by
Ray Schamp
Committed by
GitHub
Jul 25, 2018
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #1995 from LLK/hotfix/conference-2018-livestream
[Develop] Conference 2018 Livestream
parents
4f927b1d
767fabb2
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
4 deletions
+10
-4
src/views/conference/2018/index/index.jsx
src/views/conference/2018/index/index.jsx
+3
-4
src/views/conference/2018/index/index.scss
src/views/conference/2018/index/index.scss
+7
-0
No files found.
src/views/conference/2018/index/index.jsx
View file @
49edbc5b
...
@@ -18,10 +18,9 @@ const ConferenceSplash = () => (
...
@@ -18,10 +18,9 @@ const ConferenceSplash = () => (
July 26-28, 2018 | Cambridge, MA, USA
July 26-28, 2018 | Cambridge, MA, USA
</
h3
>
</
h3
>
<
h3
>
<
h3
>
(Opening Reception on Evening of July 25)
<
a
href=
"http://www.media.mit.edu/events/medialabtalk/"
>
</
h3
>
Watch the keynotes live 7/26-7/28 at 9:30 a.m. EDT
<
h3
>
</
a
>
Scratch@MIT is sold out!
</
h3
>
</
h3
>
<
p
>
<
p
>
<
a
href=
"/conference/2018/schedule"
>
<
a
href=
"/conference/2018/schedule"
>
...
...
src/views/conference/2018/index/index.scss
View file @
49edbc5b
...
@@ -27,6 +27,13 @@
...
@@ -27,6 +27,13 @@
font-size
:
4rem
;
font-size
:
4rem
;
}
}
h3
{
a
{
text-decoration
:
underline
;
color
:
$type-white
;
}
}
p
{
p
{
margin-top
:
1rem
;
margin-top
:
1rem
;
...
...
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