Skip to content

Commit

Permalink
Updated .travis.yml
Browse files Browse the repository at this point in the history
  • Loading branch information
pierotofy committed Jul 18, 2017
1 parent 00d367c commit 822b845
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ services:
- docker

env:
DOCKER_COMPOSE_VERSION: 1.8.1
DOCKER_COMPOSE_VERSION: 1.14.0

before_install:
- sudo rm /usr/local/bin/docker-compose
Expand Down
2 changes: 1 addition & 1 deletion app/static/app/js/components/TaskListItem.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ class TaskListItem extends React.Component {
// Ability to change options
if ([statusCodes.FAILED, statusCodes.COMPLETED, statusCodes.CANCELED].indexOf(task.status) !== -1 ||
(!task.processing_node)){
addActionButton("Edit", "btn-primary pull-right", "glyphicon glyphicon-pencil", () => {
addActionButton("Edit", "btn-primary pull-right edit-button", "glyphicon glyphicon-pencil", () => {
this.startEditing();
});
}
Expand Down
1 change: 0 additions & 1 deletion app/static/app/js/css/EditTaskPanel.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
.edit-task-panel{
padding: 12px;
background-color: #ecf0f1;

.actions{
text-align: right;
Expand Down
4 changes: 4 additions & 0 deletions app/static/app/js/css/TaskListItem.scss
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,10 @@
margin-right: 4px;
}

.edit-button{
margin-right: 15px;
}

.asset-download-buttons{
margin-right: 4px;
}
Expand Down

0 comments on commit 822b845

Please sign in to comment.