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
f86bd5b8
Commit
f86bd5b8
authored
May 25, 2018
by
Sean Hickey
Committed by
chrisgarrity
May 29, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed up page/render include order. Fixed up code readability issue in details page.
parent
f54379e0
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
7 deletions
+9
-7
src/views/conference/2018/details/details.jsx
src/views/conference/2018/details/details.jsx
+5
-5
src/views/conference/2018/plan/plan.jsx
src/views/conference/2018/plan/plan.jsx
+2
-1
src/views/conference/2018/schedule/schedule.jsx
src/views/conference/2018/schedule/schedule.jsx
+2
-1
No files found.
src/views/conference/2018/details/details.jsx
View file @
f86bd5b8
...
@@ -25,11 +25,11 @@ class ConferenceDetails extends React.Component {
...
@@ -25,11 +25,11 @@ class ConferenceDetails extends React.Component {
if
(
!
this
.
props
.
conferenceDetails
.
error
&&
!
this
.
props
.
conferenceDetails
.
fetching
)
{
if
(
!
this
.
props
.
conferenceDetails
.
error
&&
!
this
.
props
.
conferenceDetails
.
fetching
)
{
backUri
=
`
${
backUri
}
#
${
this
.
props
.
conferenceDetails
.
Day
}
`
;
backUri
=
`
${
backUri
}
#
${
this
.
props
.
conferenceDetails
.
Day
}
`
;
}
}
const
classes
=
classNames
(
{
const
classes
=
classNames
(
inner
:
true
,
'
inner
'
,
details
:
true
,
'
details
'
,
fetching
:
this
.
props
.
conferenceDetails
.
fetching
{
fetching
:
this
.
props
.
conferenceDetails
.
fetching
}
}
);
);
return
(
return
(
<
div
className=
{
classes
}
>
<
div
className=
{
classes
}
>
<
div
className=
"back"
>
<
div
className=
"back"
>
...
...
src/views/conference/2018/plan/plan.jsx
View file @
f86bd5b8
...
@@ -5,8 +5,9 @@ const Button = require('../../../../components/forms/button.jsx');
...
@@ -5,8 +5,9 @@ const Button = require('../../../../components/forms/button.jsx');
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
Page
=
require
(
'
../../../../components/page/conference/2018/page.jsx
'
);
const
render
=
require
(
'
../../../../lib/render.jsx
'
);
const
render
=
require
(
'
../../../../lib/render.jsx
'
);
const
Page
=
require
(
'
../../../../components/page/conference/2018/page.jsx
'
);
require
(
'
./plan.scss
'
);
require
(
'
./plan.scss
'
);
...
...
src/views/conference/2018/schedule/schedule.jsx
View file @
f86bd5b8
...
@@ -10,8 +10,9 @@ const FlexRow = require('../../../../components/flex-row/flex-row.jsx');
...
@@ -10,8 +10,9 @@ const FlexRow = require('../../../../components/flex-row/flex-row.jsx');
const
SubNavigation
=
require
(
'
../../../../components/subnavigation/subnavigation.jsx
'
);
const
SubNavigation
=
require
(
'
../../../../components/subnavigation/subnavigation.jsx
'
);
const
TitleBanner
=
require
(
'
../../../../components/title-banner/title-banner.jsx
'
);
const
TitleBanner
=
require
(
'
../../../../components/title-banner/title-banner.jsx
'
);
const
Page
=
require
(
'
../../../../components/page/conference/2018/page.jsx
'
);
const
render
=
require
(
'
../../../../lib/render.jsx
'
);
const
render
=
require
(
'
../../../../lib/render.jsx
'
);
const
Page
=
require
(
'
../../../../components/page/conference/2018/page.jsx
'
);
require
(
'
./schedule.scss
'
);
require
(
'
./schedule.scss
'
);
...
...
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