fix map upperRightUI layout

This commit is contained in:
Connor Turland 2017-03-11 21:24:43 -05:00
parent d2d35c9a3d
commit 9013d49ca1
3 changed files with 4 additions and 2 deletions

View file

@ -167,7 +167,7 @@
} }
.upperRightMapButtons { .upperRightMapButtons {
top: -42px; /* puts it just offscreen */ right: 134px;
} }
.mapPage .upperRightMapButtons, .topicPage .upperRightMapButtons { .mapPage .upperRightMapButtons, .topicPage .upperRightMapButtons {
top: 0; top: 0;

View file

@ -10,6 +10,7 @@ import { notifyUser } from './index.js'
import Active from '../Active' import Active from '../Active'
import DataModel from '../DataModel' import DataModel from '../DataModel'
import { ExploreMaps, ChatView, TopicCard } from '../Views' import { ExploreMaps, ChatView, TopicCard } from '../Views'
import Filter from '../Filter'
import Realtime from '../Realtime' import Realtime from '../Realtime'
import Map, { InfoBox } from '../Map' import Map, { InfoBox } from '../Map'
import Topic from '../Topic' import Topic from '../Topic'
@ -75,6 +76,7 @@ const ReactApp = {
endActiveMap: Map.end, endActiveMap: Map.end,
launchNewMap: Map.launch, launchNewMap: Map.launch,
toggleMapInfoBox: InfoBox.toggleBox, toggleMapInfoBox: InfoBox.toggleBox,
toggleFilterBox: Filter.toggleBox,
infoBoxHtml: InfoBox.html infoBoxHtml: InfoBox.html
// filters // filters
} }

View file

@ -10,7 +10,7 @@ class MapButtons extends Component {
render () { render () {
const { currentUser, filterBoxOpen } = this.props const { currentUser, filterBoxOpen } = this.props
return <div className="mapElement upperRightEl upperRightMapButtons"> return <div className="mapElement upperRightEl upperRightMapButtons upperRightUI">
{currentUser && <div className="importDialog upperRightEl upperRightIcon mapElement openLightbox" data-open="import-dialog-lightbox"> {currentUser && <div className="importDialog upperRightEl upperRightIcon mapElement openLightbox" data-open="import-dialog-lightbox">
<div className="tooltipsUnder"> <div className="tooltipsUnder">
Import Data Import Data