diff options
author | Filipa Lacerda <filipa@gitlab.com> | 2017-09-22 19:12:06 +0100 |
---|---|---|
committer | Filipa Lacerda <filipa@gitlab.com> | 2017-09-22 19:12:06 +0100 |
commit | b187426720068903184ca33a63f9dfe22c29f49a (patch) | |
tree | 7195f00ce276848916a7cedfbe9aba0feecad560 | |
parent | a4a6b0f50eecc278d00093dad109424fa63db675 (diff) | |
download | gitlab-ce-b187426720068903184ca33a63f9dfe22c29f49a.tar.gz |
Change layout order
-rw-r--r-- | app/assets/stylesheets/pages/settings_ci_cd.scss | 4 | ||||
-rw-r--r-- | app/views/projects/registry/repositories/index.html.haml | 15 |
2 files changed, 12 insertions, 7 deletions
diff --git a/app/assets/stylesheets/pages/settings_ci_cd.scss b/app/assets/stylesheets/pages/settings_ci_cd.scss index fe22d186af1..b3e06fdf5f6 100644 --- a/app/assets/stylesheets/pages/settings_ci_cd.scss +++ b/app/assets/stylesheets/pages/settings_ci_cd.scss @@ -12,3 +12,7 @@ margin-left: 10px; } } + +.registry-placeholder { + min-height: 60px; +}
\ No newline at end of file diff --git a/app/views/projects/registry/repositories/index.html.haml b/app/views/projects/registry/repositories/index.html.haml index ca78ecf1226..f201fd44bc9 100644 --- a/app/views/projects/registry/repositories/index.html.haml +++ b/app/views/projects/registry/repositories/index.html.haml @@ -10,7 +10,14 @@ = succeed '.' do = _('Learn more about') = link_to _('Container Registry'), help_page_path('user/project/container_registry'), target: '_blank' - .row + .row.registry-placeholder.prepend-bottom-10 + .col-lg-12 + #js-vue-registry-images{ data: { endpoint: project_container_registry_index_path(@project, format: :json) } } + + = page_specific_javascript_bundle_tag('common_vue') + = page_specific_javascript_bundle_tag('registry_list') + + .row.prepend-top-10 .col-lg-12 .panel.panel-default .panel-heading @@ -47,9 +54,3 @@ #{escape_once(@project.container_registry_url)}:tag #{escape_once(@project.container_registry_url)}/optional-image-name:tag #{escape_once(@project.container_registry_url)}/optional-name/optional-image-name:tag - .row - .col-lg-12 - #js-vue-registry-images{ data: { endpoint: project_container_registry_index_path(@project, format: :json)}} - - = page_specific_javascript_bundle_tag('common_vue') - = page_specific_javascript_bundle_tag('registry_list') |