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
a8d4184b
Commit
a8d4184b
authored
Jan 29, 2019
by
Ben Wheeler
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
renamed frameless.js tablet var to mobileIntermediate, use tabletPortrait for breaks
parent
4b660b01
Changes
14
Hide whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
25 additions
and
23 deletions
+25
-23
src/_frameless.scss
src/_frameless.scss
+1
-1
src/components/carousel/carousel.jsx
src/components/carousel/carousel.jsx
+1
-1
src/components/carousel/legacy-carousel.jsx
src/components/carousel/legacy-carousel.jsx
+1
-1
src/components/footer/www/footer.jsx
src/components/footer/www/footer.jsx
+2
-2
src/components/masonrygrid/masonrygrid.jsx
src/components/masonrygrid/masonrygrid.jsx
+2
-2
src/components/modal/comments/modal.scss
src/components/modal/comments/modal.scss
+1
-1
src/lib/frameless.js
src/lib/frameless.js
+1
-1
src/views/parents/parents.scss
src/views/parents/parents.scss
+2
-2
src/views/preview/presentation.jsx
src/views/preview/presentation.jsx
+4
-4
src/views/preview/preview.scss
src/views/preview/preview.scss
+2
-0
src/views/splash/feature/top-banner.scss
src/views/splash/feature/top-banner.scss
+3
-3
src/views/splash/presentation.jsx
src/views/splash/presentation.jsx
+3
-3
src/views/splash/splash.scss
src/views/splash/splash.scss
+1
-1
src/views/wedo2-legacy/wedo2.scss
src/views/wedo2-legacy/wedo2.scss
+1
-1
No files found.
src/_frameless.scss
View file @
a8d4184b
...
...
@@ -35,7 +35,7 @@ $cols11: (11 * ($column + $gutter) - $gutter) / $em;
$cols12
:
(
12
*
(
$column
+
$gutter
)
-
$gutter
)
/
$em
;
$desktop
:
942px
;
$mobileIntermedia
ry
:
640px
;
$mobileIntermedia
te
:
640px
;
$tabletPortrait
:
768px
;
$mobile
:
480px
;
...
...
src/components/carousel/carousel.jsx
View file @
a8d4184b
...
...
@@ -31,7 +31,7 @@ const Carousel = props => {
}
},
{
breakpoint
:
frameless
.
tablet
,
breakpoint
:
frameless
.
mobileIntermediate
,
settings
:
{
slidesToScroll
:
2
,
slidesToShow
:
2
...
...
src/components/carousel/legacy-carousel.jsx
View file @
a8d4184b
...
...
@@ -35,7 +35,7 @@ const Carousel = props => {
}
},
{
breakpoint
:
frameless
.
tablet
,
breakpoint
:
frameless
.
mobileIntermediate
,
settings
:
{
slidesToScroll
:
2
,
slidesToShow
:
2
...
...
src/components/footer/www/footer.jsx
View file @
a8d4184b
...
...
@@ -13,7 +13,7 @@ require('./footer.scss');
const
Footer
=
props
=>
(
<
FooterBox
>
<
MediaQuery
maxWidth=
{
frameless
.
tablet
-
1
}
>
<
MediaQuery
maxWidth=
{
frameless
.
mobileIntermediate
-
1
}
>
<
div
className=
"lists"
>
<
dl
>
<
dd
>
...
...
@@ -51,7 +51,7 @@ const Footer = props => (
</
dl
>
</
div
>
</
MediaQuery
>
<
MediaQuery
minWidth=
{
frameless
.
tablet
}
>
<
MediaQuery
minWidth=
{
frameless
.
mobileIntermediate
}
>
<
div
className=
"lists"
>
<
dl
>
<
dt
>
...
...
src/components/masonrygrid/masonrygrid.jsx
View file @
a8d4184b
...
...
@@ -39,12 +39,12 @@ class MasonryGrid extends React.Component {
render
()
{
return
(
<
this
.
props
.
as
className=
{
classNames
(
'
masonry
'
,
this
.
props
.
className
)
}
>
<
MediaQuery
maxWidth=
{
frameless
.
tablet
-
1
}
>
<
MediaQuery
maxWidth=
{
frameless
.
mobileIntermediate
-
1
}
>
{
this
.
props
.
children
}
</
MediaQuery
>
<
MediaQuery
maxWidth=
{
frameless
.
desktop
-
1
}
minWidth=
{
frameless
.
tablet
}
minWidth=
{
frameless
.
mobileIntermediate
}
>
{
this
.
reorderColumns
(
this
.
props
.
children
,
2
)
}
</
MediaQuery
>
...
...
src/components/modal/comments/modal.scss
View file @
a8d4184b
@import
"../../../colors"
;
@import
"../../../frameless"
;
$medium-and-small
:
"screen and (max-width :
#{
$mobileIntermedia
ry
}
-1)"
;
$medium-and-small
:
"screen and (max-width :
#{
$mobileIntermedia
te
}
-1)"
;
.mod-report
*
{
box-sizing
:
border-box
;
...
...
src/lib/frameless.js
View file @
a8d4184b
...
...
@@ -3,7 +3,7 @@
*/
const
frameless
=
{
desktop
:
942
,
tablet
:
640
,
mobileIntermediate
:
640
,
tabletPortrait
:
768
,
mobile
:
480
};
...
...
src/views/parents/parents.scss
View file @
a8d4184b
...
...
@@ -150,7 +150,7 @@ $story-width: $cols3;
}
//6 columns
@media
only
screen
and
(
min-width
:
$mobile
)
and
(
max-width
:
$mobileIntermedia
ry
-
1
)
{
@media
only
screen
and
(
min-width
:
$mobile
)
and
(
max-width
:
$mobileIntermedia
te
-
1
)
{
.flex-row
{
&
.sidebar-row
{
...
...
@@ -179,7 +179,7 @@ $story-width: $cols3;
//8 columns
@media
only
screen
and
(
min-width
:
$mobileIntermedia
ry
)
and
(
max-width
:
$desktop
-
1
)
{
@media
only
screen
and
(
min-width
:
$mobileIntermedia
te
)
and
(
max-width
:
$desktop
-
1
)
{
.masthead
{
h1
{
text-align
:
center
;
...
...
src/views/preview/presentation.jsx
View file @
a8d4184b
...
...
@@ -343,7 +343,7 @@ const PreviewPresentation = ({
onUpdateProjectThumbnail=
{
onUpdateProjectThumbnail
}
/>
</
div
>
<
MediaQuery
maxWidth=
{
frameless
.
tablet
-
1
}
>
<
MediaQuery
maxWidth=
{
frameless
.
tablet
Portrait
-
1
}
>
<
FlexRow
className=
"preview-row force-center"
>
<
div
className=
"wrappable-item"
>
<
Stats
...
...
@@ -380,7 +380,7 @@ const PreviewPresentation = ({
<
RemixCredit
projectInfo=
{
parentInfo
}
/>
<
RemixCredit
projectInfo=
{
originalInfo
}
/>
{
/* eslint-disable max-len */
}
<
MediaQuery
maxWidth=
{
frameless
.
tablet
-
1
}
>
<
MediaQuery
maxWidth=
{
frameless
.
tablet
Portrait
-
1
}
>
{
(
extensions
&&
extensions
.
length
)
?
(
<
FlexRow
className=
"preview-row"
>
{
extensionChips
}
...
...
@@ -491,7 +491,7 @@ const PreviewPresentation = ({
{
/* eslint-enable max-len */
}
</
FlexRow
>
</
FlexRow
>
<
MediaQuery
minWidth=
{
frameless
.
tablet
}
>
<
MediaQuery
minWidth=
{
frameless
.
tablet
Portrait
}
>
<
FlexRow
className=
"preview-row"
>
<
Stats
faved=
{
faved
}
...
...
@@ -521,7 +521,7 @@ const PreviewPresentation = ({
/>
</
FlexRow
>
</
MediaQuery
>
<
MediaQuery
minWidth=
{
frameless
.
tablet
}
>
<
MediaQuery
minWidth=
{
frameless
.
tablet
Portrait
}
>
{
(
extensions
&&
extensions
.
length
)
?
(
<
FlexRow
className=
"preview-row"
>
{
extensionChips
}
...
...
src/views/preview/preview.scss
View file @
a8d4184b
...
...
@@ -352,6 +352,7 @@ $stage-width: 480px;
@media
#{
$medium-and-smaller
}
{
.preview-row
{
margin-top
:
.5rem
;
align-items
:
center
;
}
}
...
...
@@ -419,6 +420,7 @@ $stage-width: 480px;
@media
#{
$medium-and-smaller
}
{
flex-direction
:
row
;
margin-bottom
:
.5rem
;
}
}
...
...
src/views/splash/feature/top-banner.scss
View file @
a8d4184b
...
...
@@ -106,7 +106,7 @@
}
}
@media
only
screen
and
(
min-width
:
$mobileIntermedia
ry
)
{
@media
only
screen
and
(
min-width
:
$mobileIntermedia
te
)
{
.feature-top-banner
{
margin-bottom
:
80px
;
// double the normal banner 40px for the notch
...
...
@@ -161,7 +161,7 @@
}
}
@media
only
screen
and
(
min-width
:
$mobileIntermedia
ry
)
and
(
max-width
:
$desktop
-
1
)
{
@media
only
screen
and
(
min-width
:
$mobileIntermedia
te
)
and
(
max-width
:
$desktop
-
1
)
{
.feature-top-banner
{
.feature-banner-images
{
overflow
:
hidden
;
// make sure overflow is hidden to avoid scrolling with translated content
...
...
@@ -176,7 +176,7 @@
}
}
@media
only
screen
and
(
min-width
:
$mobile
)
and
(
max-width
:
$mobileIntermedia
ry
-
1
)
{
@media
only
screen
and
(
min-width
:
$mobile
)
and
(
max-width
:
$mobileIntermedia
te
-
1
)
{
.feature-top-banner
{
.feature-banner-image
{
&
.right
{
...
...
src/views/splash/presentation.jsx
View file @
a8d4184b
...
...
@@ -278,7 +278,7 @@ class SplashPresentation extends React.Component { // eslint-disable-line react/
</
Box
>
);
}
if
(
this
.
props
.
sessionStatus
===
sessionActions
.
Status
.
FETCHED
&&
Object
.
keys
(
this
.
props
.
user
).
length
===
0
&&
...
...
@@ -287,7 +287,7 @@ class SplashPresentation extends React.Component { // eslint-disable-line react/
rows
.
push
(
<
MediaQuery
key=
"frameless-tablet"
minWidth=
{
frameless
.
tablet
}
minWidth=
{
frameless
.
mobileIntermediate
}
>
<
MiddleBanner
/>
</
MediaQuery
>
...
...
@@ -473,7 +473,7 @@ class SplashPresentation extends React.Component { // eslint-disable-line react/
>
{
this
.
props
.
sessionStatus
===
sessionActions
.
Status
.
FETCHED
&&
Object
.
keys
(
this
.
props
.
user
).
length
>
0
&&
// user is logged in
Object
.
keys
(
this
.
props
.
user
).
length
>
0
&&
// user is logged in
<
div
className=
"splash-header"
key=
"header"
...
...
src/views/splash/splash.scss
View file @
a8d4184b
...
...
@@ -165,7 +165,7 @@
.modal-content-iframe.mod-confirmation
{
border-radius
:
0
;
width
:
$mobileIntermedia
ry
-
1
;
width
:
$mobileIntermedia
te
-
1
;
}
}
...
...
src/views/wedo2-legacy/wedo2.scss
View file @
a8d4184b
...
...
@@ -226,7 +226,7 @@
.inner
{
margin
:
0
auto
;
width
:
$mobileIntermedia
ry
;
width
:
$mobileIntermedia
te
;
}
}
}
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