Merge branch 'zoom-to-edit' of https://github.com/leegenes/iD into leegenes-zoom-to-edit

This commit is contained in:
Bryan Housel
2017-09-17 00:01:50 -04:00
3 changed files with 6 additions and 9 deletions
+3 -5
View File
@@ -3628,18 +3628,17 @@ img.tile-removing {
.notice {
position: absolute;
top: 0;
bottom: 0;
top: 50%;
bottom: 50%;
left: 0;
right: 0;
text-align: center;
background: #fff;
}
.notice .zoom-to {
margin: auto;
width: 80%;
height: 100px;
height: 80px;
border-radius: 5px;
line-height: 40px;
color: #000;
@@ -4203,4 +4202,3 @@ li.hide + li.version .badge .tooltip .tooltip-arrow {
width: 100px;
color: #7092FF;
}
+3 -1
View File
@@ -22,6 +22,7 @@ import { uiLoading } from './loading';
import { uiMapData } from './map_data';
import { uiMapInMap } from './map_in_map';
import { uiModes } from './modes';
import { uiNotice } from './notice';
import { uiRestore } from './restore';
import { uiSave } from './save';
import { uiScale } from './scale';
@@ -82,7 +83,8 @@ export function uiInit(context) {
content
.call(uiMapInMap(context))
.call(uiInfo(context));
.call(uiInfo(context))
.call(uiNotice(context));
bar
.append('div')
-3
View File
@@ -1,7 +1,6 @@
import _ from 'lodash';
import { uiFeatureList } from './feature_list';
import { uiInspector } from './inspector';
import { uiNotice } from './notice';
export function uiSidebar(context) {
@@ -15,8 +14,6 @@ export function uiSidebar(context) {
.attr('class', 'feature-list-pane')
.call(uiFeatureList(context));
selection
.call(uiNotice(context));
var inspectorWrap = selection
.append('div')