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
a9def9c1
Commit
a9def9c1
authored
Jul 22, 2016
by
Technoboy10
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
tweak splash to not be terrible on mobile
parent
b88b8c83
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
45 additions
and
3 deletions
+45
-3
src/views/splash/splash.jsx
src/views/splash/splash.jsx
+12
-1
src/views/splash/splash.scss
src/views/splash/splash.scss
+33
-2
No files found.
src/views/splash/splash.jsx
View file @
a9def9c1
...
@@ -6,6 +6,7 @@ var React = require('react');
...
@@ -6,6 +6,7 @@ var React = require('react');
var
api
=
require
(
'
../../lib/api
'
);
var
api
=
require
(
'
../../lib/api
'
);
var
render
=
require
(
'
../../lib/render.jsx
'
);
var
render
=
require
(
'
../../lib/render.jsx
'
);
var
sessionActions
=
require
(
'
../../redux/session.js
'
);
var
sessionActions
=
require
(
'
../../redux/session.js
'
);
var
layout
=
require
(
'
../../redux/layout.js
'
);
var
shuffle
=
require
(
'
../../lib/shuffle.js
'
).
shuffle
;
var
shuffle
=
require
(
'
../../lib/shuffle.js
'
).
shuffle
;
var
Activity
=
require
(
'
../../components/activity/activity.jsx
'
);
var
Activity
=
require
(
'
../../components/activity/activity.jsx
'
);
...
@@ -42,6 +43,12 @@ var Splash = injectIntl(React.createClass({
...
@@ -42,6 +43,12 @@ var Splash = injectIntl(React.createClass({
permissions
:
{}
permissions
:
{}
};
};
},
},
componentWillMount
:
function
()
{
this
.
props
.
dispatch
(
layout
.
getLayout
());
for
(
var
query
in
layout
.
mediaQueries
)
{
layout
.
mediaQueries
[
query
].
addListener
(
this
.
onResize
);
}
},
componentDidUpdate
:
function
(
prevProps
)
{
componentDidUpdate
:
function
(
prevProps
)
{
if
(
this
.
props
.
session
.
session
.
user
!=
prevProps
.
session
.
session
.
user
)
{
if
(
this
.
props
.
session
.
session
.
user
!=
prevProps
.
session
.
session
.
user
)
{
if
(
this
.
props
.
session
.
session
.
user
)
{
if
(
this
.
props
.
session
.
session
.
user
)
{
...
@@ -87,6 +94,9 @@ var Splash = injectIntl(React.createClass({
...
@@ -87,6 +94,9 @@ var Splash = injectIntl(React.createClass({
}
}
}
}
},
},
onResize
:
function
()
{
this
.
props
.
dispatch
(
layout
.
getLayout
());
},
getActivity
:
function
()
{
getActivity
:
function
()
{
api
({
api
({
uri
:
'
/proxy/users/
'
+
this
.
props
.
session
.
session
.
user
.
username
+
'
/activity?limit=5
'
uri
:
'
/proxy/users/
'
+
this
.
props
.
session
.
session
.
user
.
username
+
'
/activity?limit=5
'
...
@@ -439,7 +449,8 @@ var Splash = injectIntl(React.createClass({
...
@@ -439,7 +449,8 @@ var Splash = injectIntl(React.createClass({
var
mapStateToProps
=
function
(
state
)
{
var
mapStateToProps
=
function
(
state
)
{
return
{
return
{
session
:
state
.
session
,
session
:
state
.
session
,
permissions
:
state
.
permissions
permissions
:
state
.
permissions
,
layout
:
state
.
layout
};
};
};
};
...
...
src/views/splash/splash.scss
View file @
a9def9c1
@import
"../../frameless"
;
.splash
{
.splash
{
.splash-header
{
.splash-header
{
display
:
flex
;
display
:
flex
;
...
@@ -39,3 +41,32 @@
...
@@ -39,3 +41,32 @@
margin-bottom
:
20px
;
margin-bottom
:
20px
;
}
}
}
}
//4 columns
@media
only
screen
and
(
max-width
:
$mobile
-
1
)
{
.splash
{
.splash-header
{
flex-wrap
:
wrap
;
justify-content
:
center
;
.box
{
width
:
$cols4
;
}
}
}
}
//6 columns
@media
only
screen
and
(
min-width
:
$mobile
)
and
(
max-width
:
$tablet
-
1
)
{
.splash
{
.splash-header
{
flex-wrap
:
wrap
;
justify-content
:
center
;
.box
{
width
:
$cols6
;
white-space
:
normal
;
}
}
}
}
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