diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2017-03-28 18:01:47 +0100 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2017-03-28 18:01:47 +0100 |
| commit | 76119cb113f5489458b2a431eeb35fd0e4d06989 (patch) | |
| tree | 5eb799c4162d2ed1685d3d8c9b24dbc48c5e3765 | |
| parent | b64555d36a0b931dc087ddb48674c0fe36581e8c (diff) | |
| download | gitlab-ce-76119cb113f5489458b2a431eeb35fd0e4d06989.tar.gz | |
Changes after review
4 files changed, 7 insertions, 12 deletions
diff --git a/app/assets/javascripts/environments/components/environment_item.js b/app/assets/javascripts/environments/components/environment_item.js index 3fe1042557e..9f297644368 100644 --- a/app/assets/javascripts/environments/components/environment_item.js +++ b/app/assets/javascripts/environments/components/environment_item.js @@ -425,16 +425,18 @@ export default { }, template: ` - <tr :class="{ 'child-row': model.isChildren }"> + <tr> <td> <a v-if="!model.isFolder" class="environment-name" + :class="{ 'prepend-left-default': model.isChildren }" :href="environmentPath"> {{model.name}} </a> <span v-else class="folder-name" - @click="onClickFolder"> + @click="onClickFolder" + role="button"> <span class="folder-icon"> <i diff --git a/app/assets/javascripts/environments/components/environments_table.js b/app/assets/javascripts/environments/components/environments_table.js index 5a1f28d0bdf..0daa942edee 100644 --- a/app/assets/javascripts/environments/components/environments_table.js +++ b/app/assets/javascripts/environments/components/environments_table.js @@ -69,7 +69,7 @@ export default { <template v-if="model.isFolder && model.isOpen && model.children && model.children.length > 0"> <tr v-if="isLoadingFolderContent"> <td colspan="6" class="text-center"> - <i class="fa fa-spin fa-spinner" aria-hidden="true"/> + <i class="fa fa-spin fa-spinner fa-2x" aria-hidden="true"/> </td> </tr> diff --git a/app/assets/javascripts/environments/services/environments_service.js b/app/assets/javascripts/environments/services/environments_service.js index 4917df64a56..ad8d9984561 100644 --- a/app/assets/javascripts/environments/services/environments_service.js +++ b/app/assets/javascripts/environments/services/environments_service.js @@ -18,6 +18,7 @@ export default class EnvironmentsService { } getFolderContent(folderUrl) { - return Vue.http.get(`${folderUrl}.json?per_page=3`); + const results = 3; + return Vue.http.get(`${folderUrl}.json?per_page=${results}`); } } diff --git a/app/assets/stylesheets/pages/environments.scss b/app/assets/stylesheets/pages/environments.scss index b2ec8f38e6a..25be7f408d0 100644 --- a/app/assets/stylesheets/pages/environments.scss +++ b/app/assets/stylesheets/pages/environments.scss @@ -54,14 +54,6 @@ } } - .child-row td:first-child a { - margin-left: 17px; - } - - .environments-show-all { - text-align: center; - } - .btn-group { > a { |