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
08178a58
Commit
08178a58
authored
Jul 03, 2018
by
Connor Hudson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Initial work on responsive middle banner
parent
0eb12ae4
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
45 additions
and
8 deletions
+45
-8
src/views/splash/beta/middle-banner.jsx
src/views/splash/beta/middle-banner.jsx
+13
-2
src/views/splash/beta/middle-banner.scss
src/views/splash/beta/middle-banner.scss
+32
-6
No files found.
src/views/splash/beta/middle-banner.jsx
View file @
08178a58
...
@@ -2,9 +2,13 @@ const FormattedMessage = require('react-intl').FormattedMessage;
...
@@ -2,9 +2,13 @@ const FormattedMessage = require('react-intl').FormattedMessage;
const
injectIntl
=
require
(
'
react-intl
'
).
injectIntl
;
const
injectIntl
=
require
(
'
react-intl
'
).
injectIntl
;
const
React
=
require
(
'
react
'
);
const
React
=
require
(
'
react
'
);
const
MediaQuery
=
require
(
'
react-responsive
'
).
default
;
const
FlexRow
=
require
(
'
../../../components/flex-row/flex-row.jsx
'
);
const
FlexRow
=
require
(
'
../../../components/flex-row/flex-row.jsx
'
);
const
TitleBanner
=
require
(
'
../../../components/title-banner/title-banner.jsx
'
);
const
TitleBanner
=
require
(
'
../../../components/title-banner/title-banner.jsx
'
);
const
frameless
=
require
(
'
../../../lib/frameless
'
);
require
(
'
./middle-banner.scss
'
);
require
(
'
./middle-banner.scss
'
);
const
MiddleBanner
=
()
=>
(
const
MiddleBanner
=
()
=>
(
...
@@ -17,8 +21,15 @@ const MiddleBanner = () => (
...
@@ -17,8 +21,15 @@ const MiddleBanner = () => (
href=
"https://beta.scratch.mit.edu/"
href=
"https://beta.scratch.mit.edu/"
>
Try it!
</
a
>
>
Try it!
</
a
>
</
FlexRow
>
</
FlexRow
>
<
div
className=
"beta-banner-image"
>
<
div
className=
"beta-banner-images"
>
<
img
src=
"/images/beta/right-illustration.png"
/>
<
MediaQuery
maxWidth=
{
frameless
.
desktop
-
1
}
>
<
div
className=
"beta-banner-image left"
>
<
img
src=
"/images/beta/left-illustration.png"
/>
</
div
>
</
MediaQuery
>
<
div
className=
"beta-banner-image right"
>
<
img
src=
"/images/beta/right-illustration.png"
/>
</
div
>
</
div
>
</
div
>
</
TitleBanner
>
</
TitleBanner
>
);
);
...
...
src/views/splash/beta/middle-banner.scss
View file @
08178a58
...
@@ -10,6 +10,7 @@
...
@@ -10,6 +10,7 @@
background-size
:
cover
;
background-size
:
cover
;
padding
:
0
;
padding
:
0
;
height
:
17rem
;
height
:
17rem
;
overflow
:
hidden
;
box-sizing
:
border-box
;
box-sizing
:
border-box
;
justify-content
:
center
;
justify-content
:
center
;
...
@@ -19,15 +20,20 @@
...
@@ -19,15 +20,20 @@
flex-shrink
:
0
;
flex-shrink
:
0
;
}
}
.beta-banner-image
{
.beta-banner-image
s
{
display
:
flex
;
display
:
flex
;
margin-right
:
2rem
;
min-width
:
0
;
align-self
:
flex-end
;
align-self
:
flex-end
;
img
{
.beta-banner-image
{
max-width
:
100%
;
display
:
flex
;
height
:
auto
;
margin-right
:
2rem
;
min-width
:
0
;
align-self
:
flex-end
;
img
{
max-width
:
100%
;
height
:
auto
;
}
}
}
}
}
...
@@ -46,9 +52,29 @@
...
@@ -46,9 +52,29 @@
@media
only
screen
and
(
min-width
:
$tablet
)
and
(
max-width
:
$desktop
-
1
)
{
@media
only
screen
and
(
min-width
:
$tablet
)
and
(
max-width
:
$desktop
-
1
)
{
.beta-middle-banner
{
.beta-middle-banner
{
height
:
initial
;
flex-direction
:
column
;
.beta-middle-container
{
.beta-middle-container
{
padding-top
:
4rem
;
padding-left
:
0
;
align-items
:
center
;
align-items
:
center
;
}
}
.beta-banner-images
{
.beta-banner-image
{
margin
:
0
;
padding
:
0
;
&
.left
{
margin-left
:
-2
.5rem
;
}
&
.right
{
margin-right
:
-2
.5rem
;
}
}
}
}
}
}
}
...
...
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