diff --git a/app/static/app/js/components/AssetDownloadButtons.jsx b/app/static/app/js/components/AssetDownloadButtons.jsx index 445d62d6f..da128f533 100644 --- a/app/static/app/js/components/AssetDownloadButtons.jsx +++ b/app/static/app/js/components/AssetDownloadButtons.jsx @@ -53,7 +53,7 @@ class AssetDownloadButtons extends React.Component { : ""} - {this.props.showLabel ? " " + _("Download Assets") : ""} + {this.props.showLabel ? " " + _("Download Assets") : ""} {this.props.showLabel ? diff --git a/app/static/app/js/components/EditProjectDialog.jsx b/app/static/app/js/components/EditProjectDialog.jsx index a1315e5e8..e7c7183fc 100644 --- a/app/static/app/js/components/EditProjectDialog.jsx +++ b/app/static/app/js/components/EditProjectDialog.jsx @@ -162,7 +162,7 @@ class EditProjectDialog extends React.Component { getFormData={this.getFormData} reset={this.reset} onShow={this.onShow} - leftButtons={this.props.showDuplicate ? [ Duplicate] : undefined} + leftButtons={this.props.showDuplicate ? [ {_("Duplicate")}] : 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")} - {_("Import")} + {_("Import")} {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 = ( - {button.label} + {button.label} ); 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 ? diff --git a/app/static/app/js/css/ProjectListItem.scss b/app/static/app/js/css/ProjectListItem.scss index 800417673..4572e4edd 100644 --- a/app/static/app/js/css/ProjectListItem.scss +++ b/app/static/app/js/css/ProjectListItem.scss @@ -3,13 +3,6 @@ .project-name{ font-weight: bold; - - @media screen and (max-width: 768px){ - font-size: x-large; - text-align: center; - margin-top: 5px; - margin-bottom: 5px; - } } .project-description{ @@ -85,21 +78,6 @@ .project-buttons { float: right; - - @media screen and (max-width: 768px){ - - .asset-download-buttons { - width: 100%; - } - - float: none; - - width: 100%; - - .btn { - width: 100%; - } - } } .task-filters{ @@ -168,4 +146,9 @@ .quick-clear-filter{ margin-right: 6px !important; } + + .asset-download-buttons > button:last-child{ + border-top-right-radius: 3px !important; + border-bottom-right-radius: 3px !important; + } } diff --git a/app/static/app/js/css/TaskListItem.scss b/app/static/app/js/css/TaskListItem.scss index 18b50b047..1b151b916 100644 --- a/app/static/app/js/css/TaskListItem.scss +++ b/app/static/app/js/css/TaskListItem.scss @@ -41,9 +41,21 @@ border-style: solid; border-width: 1px; border-radius: 2px; + margin-right: 16px; + } + + .actions{ + display: flex; + align-items: center; + padding-right: 2px; + } - @media screen and (max-width: 768px){ - margin-top: 5px; + @media screen and (max-width: 576px){ + .status-label { + & > span{ + display: none; + } + text-align: center; } }