Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Mirador Video
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
IIIF
Mirador
Mirador Video
Commits
c2488dce
Commit
c2488dce
authored
6 years ago
by
Jack Reed
Committed by
Chris Beer
6 years ago
Browse files
Options
Downloads
Patches
Plain Diff
proof of concept using light and dark themes
parent
9540b316
No related branches found
No related tags found
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/components/App.js
+22
-9
22 additions, 9 deletions
src/components/App.js
src/config/settings.js
+1
-0
1 addition, 0 deletions
src/config/settings.js
src/containers/App.js
+1
-0
1 addition, 0 deletions
src/containers/App.js
with
24 additions
and
9 deletions
src/components/App.js
+
22
−
9
View file @
c2488dce
import
React
,
{
Component
}
from
'
react
'
;
import
React
,
{
Component
}
from
'
react
'
;
import
PropTypes
from
'
prop-types
'
;
import
PropTypes
from
'
prop-types
'
;
import
CssBaseline
from
'
@material-ui/core/CssBaseline
'
;
import
CssBaseline
from
'
@material-ui/core/CssBaseline
'
;
import
{
MuiThemeProvider
,
createMuiTheme
}
from
'
@material-ui/core/styles
'
;
import
Fullscreen
from
'
react-fullscreen-crossbrowser
'
;
import
Fullscreen
from
'
react-fullscreen-crossbrowser
'
;
import
WorkspaceControlPanel
from
'
./WorkspaceControlPanel
'
;
import
WorkspaceControlPanel
from
'
./WorkspaceControlPanel
'
;
import
Workspace
from
'
../containers/Workspace
'
;
import
Workspace
from
'
../containers/Workspace
'
;
...
@@ -16,9 +17,19 @@ class App extends Component {
...
@@ -16,9 +17,19 @@ class App extends Component {
* @return {String} - HTML markup for the component
* @return {String} - HTML markup for the component
*/
*/
render
()
{
render
()
{
const
{
workspace
,
setWorkspaceFullscreen
}
=
this
.
props
;
const
{
workspace
,
setWorkspaceFullscreen
,
config
}
=
this
.
props
;
const
theme
=
createMuiTheme
({
palette
:
{
type
:
config
.
theme
,
},
typography
:
{
useNextVariants
:
true
,
},
});
return
(
return
(
<
div
className
=
{
ns
(
'
app
'
)}
>
<
div
className
=
{
ns
(
'
app
'
)}
>
<
MuiThemeProvider
theme
=
{
theme
}
>
<
CssBaseline
/>
<
CssBaseline
/>
<
Fullscreen
<
Fullscreen
enabled
=
{
workspace
.
isFullscreenEnabled
}
enabled
=
{
workspace
.
isFullscreenEnabled
}
...
@@ -27,12 +38,14 @@ class App extends Component {
...
@@ -27,12 +38,14 @@ class App extends Component {
<
Workspace
/>
<
Workspace
/>
<
/Fullscreen
>
<
/Fullscreen
>
<
WorkspaceControlPanel
/>
<
WorkspaceControlPanel
/>
<
/MuiThemeProvider
>
<
/div
>
<
/div
>
);
);
}
}
}
}
App
.
propTypes
=
{
App
.
propTypes
=
{
config
:
PropTypes
.
object
.
isRequired
,
// eslint-disable-line react/forbid-prop-types
workspace
:
PropTypes
.
object
,
// eslint-disable-line react/forbid-prop-types
workspace
:
PropTypes
.
object
,
// eslint-disable-line react/forbid-prop-types
setWorkspaceFullscreen
:
PropTypes
.
func
,
setWorkspaceFullscreen
:
PropTypes
.
func
,
};
};
...
...
This diff is collapsed.
Click to expand it.
src/config/settings.js
+
1
−
0
View file @
c2488dce
export
default
{
export
default
{
theme
:
'
light
'
,
// dark also available
windows
:
[],
windows
:
[],
thumbnailNavigation
:
{
thumbnailNavigation
:
{
defaultPosition
:
'
bottom
'
,
defaultPosition
:
'
bottom
'
,
...
...
This diff is collapsed.
Click to expand it.
src/containers/App.js
+
1
−
0
View file @
c2488dce
...
@@ -10,6 +10,7 @@ import App from '../components/App';
...
@@ -10,6 +10,7 @@ import App from '../components/App';
*/
*/
const
mapStateToProps
=
state
=>
(
const
mapStateToProps
=
state
=>
(
{
{
config
:
state
.
config
,
workspace
:
state
.
workspace
,
workspace
:
state
.
workspace
,
manifests
:
state
.
manifests
,
manifests
:
state
.
manifests
,
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment