Remove layout CSS styling

This commit is contained in:
lukasmartinelli 2016-09-10 16:11:43 +02:00
parent e4049fa5da
commit 8582496811
5 changed files with 15 additions and 29 deletions

View file

@ -1,11 +0,0 @@
.map {
position: fixed;
top: 0;
bottom: 0;
height: 100%;
width: 100%;
& > div {
height: 100%;
}
}

View file

@ -1,6 +1,6 @@
import React from 'react'
import MapboxGl from 'mapbox-gl';
//import diffStyles from 'mapbox-gl-style-spec/lib/diff'
import diffStyles from 'mapbox-gl-style-spec/lib/diff'
import { fullHeight } from './theme.js'
import Immutable from 'immutable'
@ -50,11 +50,11 @@ export class Map extends React.Component {
}
render() {
return <div style={{
...fullHeight,
width: "100%",
}}>
<div ref={x => this.container = x}></div>
</div>
return <div
ref={x => this.container = x}
style={{
...fullHeight,
width: "100%",
}}></div>
}
}

View file

@ -32,7 +32,7 @@ const themeColors = {
error: baseColors.red
}
const colors = {
export const colors = {
...baseColors,
...themeColors
}

View file

@ -10,6 +10,7 @@ import MdSettings from 'react-icons/lib/md/settings'
import MdLayers from 'react-icons/lib/md/layers'
import MdSave from 'react-icons/lib/md/save'
import { fullHeight } from './theme.js'
import theme from './theme.js';
export class Toolbar extends React.Component {
@ -68,12 +69,10 @@ export class Toolbar extends React.Component {
render() {
return <Container style={{
...fullHeight,
zIndex: 100,
position: "fixed",
height: "100%",
left: "0",
top: "0",
bottom: "0",
left: 0,
top: 0,
backgroundColor: theme.colors.black }
}>
<Block>

View file

@ -1,7 +1,7 @@
import React from 'react'
import { LayerList } from './layers/list.jsx'
import { SettingsEditor } from './settings.jsx'
import theme from './theme.js'
import { colors, fullHeight } from './theme.js'
/** The workspace drawer contains the editor components depending on the edit
* context chosen in the toolbar. It holds the state of the layers.*/
@ -35,14 +35,12 @@ export class WorkspaceDrawer extends React.Component {
}
return <div style={{
...fullHeight,
zIndex: 100,
position: "fixed",
left: 60,
width: 300,
top: 0,
bottom: 0,
overflow: "hidden",
backgroundColor: theme.colors.gray}
backgroundColor: colors.gray}
}>
{workspaceContent}
</div>