diff --git a/app/static/app/css/main.scss b/app/static/app/css/main.scss index b2908526e..ed8a59213 100644 --- a/app/static/app/css/main.scss +++ b/app/static/app/css/main.scss @@ -34,6 +34,7 @@ html, body, section.main, .content, #wrapper, #page-wrapper{ } [data-mapview], .model-view{ height: calc(100vh); + height: calc(100dvh); } } @@ -110,13 +111,15 @@ ul#side-menu.nav{ } .content{ - clear: both; padding-top: 8px; h1,h2,h3,h4,h5{ padding-top: 4px; margin-top: 0; } + h3{ + font-size: 24px; + } } .top-buffer { @@ -147,6 +150,7 @@ ul#side-menu.nav{ .modal-body { max-height: calc(100vh - 220px); + max-height: calc(100dvh - 220px); overflow-y: auto; } @@ -216,7 +220,7 @@ button i.glyphicon{ float: right; margin-right: 15px; padding: 9px 10px; - margin-top: 5px; + margin-top: 7px; margin-bottom: 5px; } @@ -263,9 +267,16 @@ footer{ .full-height{ height: calc(100vh - 110px); + height: calc(100dvh - 110px); padding-bottom: 12px; } .floatfix{ clear: both; } + +.model-title{ + text-overflow: ellipsis; + overflow: hidden; + white-space: nowrap; +} diff --git a/app/static/app/js/MapView.jsx b/app/static/app/js/MapView.jsx index 10931964f..a6316e69b 100644 --- a/app/static/app/js/MapView.jsx +++ b/app/static/app/js/MapView.jsx @@ -112,18 +112,21 @@ class MapView extends React.Component { if (mapTypeButtons.length === 1) mapTypeButtons = []; return (
-
- {mapTypeButtons.map(mapType => - - )} +
+ {this.props.title ? +

{this.props.title}

+ : ""} + +
+ {mapTypeButtons.map(mapType => + + )} +
- - {this.props.title ? -

{this.props.title}

- : ""}
- {this.props.showLabel ? " " + _("Download Assets") : ""} + {this.props.showLabel ? " " + _("Download Assets") : ""} {this.props.showLabel ? ] : undefined} + leftButtons={this.props.showDuplicate ? [] : undefined} ref={(domNode) => { this.dialog = domNode; }}>
diff --git a/app/static/app/js/components/FormDialog.jsx b/app/static/app/js/components/FormDialog.jsx index 0314405e9..608d7608b 100644 --- a/app/static/app/js/components/FormDialog.jsx +++ b/app/static/app/js/components/FormDialog.jsx @@ -166,10 +166,10 @@ class FormDialog extends React.Component { onClick={this.handleDelete}> {this.state.deleting ? - {_("Deleting...")} + {_("Deleting...")} : - {_("Delete")} + {_("Delete")} } ); } diff --git a/app/static/app/js/components/ProjectListItem.jsx b/app/static/app/js/components/ProjectListItem.jsx index 6a7cc488e..e689e591f 100644 --- a/app/static/app/js/components/ProjectListItem.jsx +++ b/app/static/app/js/components/ProjectListItem.jsx @@ -638,12 +638,12 @@ class ProjectListItem extends React.Component { onClick={this.handleUpload} ref={this.setRef("uploadButton")}> - {_("Select Images and GCP")} + {_("Select Images and GCP")} {this.state.buttons.map((button, i) => {button})}
diff --git a/app/static/app/js/components/TaskListItem.jsx b/app/static/app/js/components/TaskListItem.jsx index f895582a0..01b8d91a8 100644 --- a/app/static/app/js/components/TaskListItem.jsx +++ b/app/static/app/js/components/TaskListItem.jsx @@ -507,7 +507,7 @@ class TaskListItem extends React.Component { let buttonHtml = (); if (subItems.length > 0){ // The button expands sub items @@ -654,7 +654,7 @@ class TaskListItem extends React.Component { return (
{text}
); + title={text}> {text}
); } let statusLabel = ""; @@ -739,36 +739,22 @@ class TaskListItem extends React.Component { /> : ""}
-
+
{name} {userTags.length > 0 ? userTags.map((t, i) =>
{t}
) : ""}
-
+
{task.images_count}
-
+
{this.hoursMinutesSecs(this.state.time)}
-
- {taskActions.length > 0 ? -
- -
    - {taskActions} -
-
- : ""} -
-
+
{showEditLink ? {statusLabel} : statusLabel} -
-
{taskActions.length > 0 ?