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
755e24f7
Commit
755e24f7
authored
Jan 29, 2016
by
Ray Schamp
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #343 from LLK/release/2.2.5
Release/2.2.5 (develop)
parents
15c11aca
0603b3b9
Changes
4
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
63 additions
and
53 deletions
+63
-53
src/components/carousel/carousel.scss
src/components/carousel/carousel.scss
+13
-10
src/components/intro/intro.jsx
src/components/intro/intro.jsx
+14
-7
src/views/about/about.jsx
src/views/about/about.jsx
+5
-5
src/views/credits/credits.jsx
src/views/credits/credits.jsx
+31
-31
No files found.
src/components/carousel/carousel.scss
View file @
755e24f7
...
...
@@ -5,6 +5,7 @@
$button-offset
:
$icon-size
+
5px
;
$box-content-offset
:
20px
;
margin-bottom
:
0
;
padding
:
12px
$button-offset
;
.box-content
&
{
...
...
@@ -28,8 +29,10 @@
content
:
""
;
}
&
.slick-disabled
:before
{
opacity
:
1
;
&
.slick-disabled
{
&
:before
{
opacity
:
1
;
}
}
}
...
...
@@ -38,11 +41,11 @@
&
:before
{
background-image
:
url("/svgs/carousel/prev_ui-dark-gray.svg")
;
}
&
:hover:before
{
background-image
:
url("/svgs/carousel/prev_ui-blue.svg")
;
background-size
:
90%
;
&
:hover
{
background-image
:
url("/svgs/carousel/prev_ui-blue.svg")
;
background-size
:
90%
;
}
}
...
...
@@ -56,11 +59,11 @@
&
:before
{
background-image
:
url("/svgs/carousel/next_ui-dark-gray.svg")
;
}
&
:hover:before
{
background-image
:
url("/svgs/carousel/next_ui-blue.svg")
;
background-size
:
90%
;
&
:hover
{
background-image
:
url("/svgs/carousel/next_ui-blue.svg")
;
background-size
:
90%
;
}
}
.box-content
&
{
...
...
src/components/intro/intro.jsx
View file @
755e24f7
...
...
@@ -64,10 +64,12 @@ var Intro = React.createClass({
<
a
className=
"sprite sprite-1"
href=
"/projects/editor/?tip_bar=getStarted"
>
<
img
className=
"costume costume-1"
src=
"//cdn.scratch.mit.edu/scratchr2/static/images/cat-a.png"
/>
src=
"//cdn.scratch.mit.edu/scratchr2/static/images/cat-a.png"
alt=
"Scratch Cat"
/>
<
img
className=
"costume costume-2"
src=
"//cdn.scratch.mit.edu/scratchr2/static/images/cat-b.png"
/>
src=
"//cdn.scratch.mit.edu/scratchr2/static/images/cat-b.png"
alt=
"Scratch Cat"
/>
<
div
className=
"circle"
></
div
>
<
div
className=
"text"
>
{
this
.
props
.
messages
[
'
intro.tryItOut
'
]
}
...
...
@@ -76,10 +78,12 @@ var Intro = React.createClass({
<
a
className=
"sprite sprite-2"
href=
"/starter_projects/"
>
<
img
className=
"costume costume-1"
src=
"//cdn.scratch.mit.edu/scratchr2/static/images/tera-a.png"
/>
src=
"//cdn.scratch.mit.edu/scratchr2/static/images/tera-a.png"
alt=
"Tera"
/>
<
img
className=
"costume costume-2"
src=
"//cdn.scratch.mit.edu/scratchr2/static/images/tera-b.png"
/>
src=
"//cdn.scratch.mit.edu/scratchr2/static/images/tera-b.png"
alt=
"Tera"
/>
<
div
className=
"circle"
></
div
>
<
div
className=
"text"
>
{
this
.
props
.
messages
[
'
intro.seeExamples
'
]
}
...
...
@@ -88,10 +92,12 @@ var Intro = React.createClass({
<
a
className=
"sprite sprite-3"
href=
"#"
onClick=
{
this
.
handleJoinClick
}
>
<
img
className=
"costume costume-1"
src=
"//cdn.scratch.mit.edu/scratchr2/static/images/gobo-a.png"
/>
src=
"//cdn.scratch.mit.edu/scratchr2/static/images/gobo-a.png"
alt=
"Gobo"
/>
<
img
className=
"costume costume-2"
src=
"//cdn.scratch.mit.edu/scratchr2/static/images/gobo-b.png"
/>
src=
"//cdn.scratch.mit.edu/scratchr2/static/images/gobo-b.png"
alt=
"Gobo"
/>
<
div
className=
"circle"
></
div
>
<
div
className=
"text"
>
{
this
.
props
.
messages
[
'
intro.joinScratch
'
]
}
...
...
@@ -122,7 +128,8 @@ var Intro = React.createClass({
</
div
>
<
div
className=
"video"
>
<
div
className=
"play-button"
onClick=
{
this
.
showVideo
}
></
div
>
<
img
src=
"//cdn.scratch.mit.edu/scratchr2/static/images/hp-video-screenshot.png"
/>
<
img
src=
"//cdn.scratch.mit.edu/scratchr2/static/images/hp-video-screenshot.png"
alt=
"Intro Video"
/>
</
div
>
<
Modal
className=
"video-modal"
...
...
src/views/about/about.jsx
View file @
755e24f7
...
...
@@ -39,7 +39,7 @@ var About = React.createClass({
<
ul
>
<
li
>
<
h2
><
FormattedMessage
id=
'about.whoUsesScratch'
/></
h2
>
<
img
src=
"/images/about/who-uses-scratch.jpg"
/>
<
img
src=
"/images/about/who-uses-scratch.jpg"
alt=
""
/>
<
p
><
FormattedHTMLMessage
id=
'about.whoUsesScratchDescription'
/></
p
>
</
li
>
...
...
@@ -56,25 +56,25 @@ var About = React.createClass({
<
li
>
<
h2
><
FormattedMessage
id=
'about.aroundTheWorld'
/></
h2
>
<
img
src=
"/images/about/around-the-world.png"
/>
<
img
src=
"/images/about/around-the-world.png"
alt=
""
/>
<
p
><
FormattedHTMLMessage
id=
'about.aroundTheWorldDescription'
/></
p
>
</
li
>
<
li
>
<
h2
><
FormattedMessage
id=
'about.schools'
/></
h2
>
<
img
src=
"/images/about/scratch-in-schools.jpg"
/>
<
img
src=
"/images/about/scratch-in-schools.jpg"
alt=
""
/>
<
p
><
FormattedHTMLMessage
id=
'about.schoolsDescription'
/></
p
>
</
li
>
<
li
>
<
h2
><
FormattedMessage
id=
'about.quotes'
/></
h2
>
<
img
src=
"/images/about/quotes.gif"
/>
<
img
src=
"/images/about/quotes.gif"
alt=
"Quotes about Scratch"
/>
<
p
><
FormattedHTMLMessage
id=
'about.quotesDescription'
/></
p
>
</
li
>
<
li
>
<
h2
><
FormattedMessage
id=
'about.research'
/></
h2
>
<
img
src=
"/images/about/research-remix.png"
/>
<
img
src=
"/images/about/research-remix.png"
alt=
""
/>
<
p
><
FormattedHTMLMessage
id=
'about.researchDescription'
/></
p
>
</
li
>
...
...
src/views/credits/credits.jsx
View file @
755e24f7
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