From 9013d49ca1f0b288c3dff5d13a694277b5868ee0 Mon Sep 17 00:00:00 2001 From: Connor Turland Date: Sat, 11 Mar 2017 21:24:43 -0500 Subject: [PATCH] fix map upperRightUI layout --- app/assets/stylesheets/clean.css.erb | 2 +- frontend/src/Metamaps/GlobalUI/ReactApp.js | 2 ++ frontend/src/components/MapView/MapButtons.js | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/assets/stylesheets/clean.css.erb b/app/assets/stylesheets/clean.css.erb index 69bbecf7..dc576800 100644 --- a/app/assets/stylesheets/clean.css.erb +++ b/app/assets/stylesheets/clean.css.erb @@ -167,7 +167,7 @@ } .upperRightMapButtons { - top: -42px; /* puts it just offscreen */ + right: 134px; } .mapPage .upperRightMapButtons, .topicPage .upperRightMapButtons { top: 0; diff --git a/frontend/src/Metamaps/GlobalUI/ReactApp.js b/frontend/src/Metamaps/GlobalUI/ReactApp.js index 5d9a474a..f224e206 100644 --- a/frontend/src/Metamaps/GlobalUI/ReactApp.js +++ b/frontend/src/Metamaps/GlobalUI/ReactApp.js @@ -10,6 +10,7 @@ import { notifyUser } from './index.js' import Active from '../Active' import DataModel from '../DataModel' import { ExploreMaps, ChatView, TopicCard } from '../Views' +import Filter from '../Filter' import Realtime from '../Realtime' import Map, { InfoBox } from '../Map' import Topic from '../Topic' @@ -75,6 +76,7 @@ const ReactApp = { endActiveMap: Map.end, launchNewMap: Map.launch, toggleMapInfoBox: InfoBox.toggleBox, + toggleFilterBox: Filter.toggleBox, infoBoxHtml: InfoBox.html // filters } diff --git a/frontend/src/components/MapView/MapButtons.js b/frontend/src/components/MapView/MapButtons.js index 1d65f71f..c15960a1 100644 --- a/frontend/src/components/MapView/MapButtons.js +++ b/frontend/src/components/MapView/MapButtons.js @@ -10,7 +10,7 @@ class MapButtons extends Component { render () { const { currentUser, filterBoxOpen } = this.props - return
+ return
{currentUser &&
Import Data