diff --git a/app/assets/stylesheets/pages/environments.scss b/app/assets/stylesheets/pages/environments.scss index c60455e148fda25a51bf4d105a74e8defdd8b011..cb9196dde9282ef33373eac69350415c66d402a6 100644 --- a/app/assets/stylesheets/pages/environments.scss +++ b/app/assets/stylesheets/pages/environments.scss @@ -4,6 +4,11 @@ overflow: auto; } +.environments-list-loading { + width: 100%; + font-size: 34px; +} + .environments { .deployment-column { .avatar { @@ -58,14 +63,23 @@ } } } + + .children-name{ + margin-left: 17px; + margin-right: -17px; + } + + .folder-icon { + padding: 0 5px 0 0; + } + + .folder-name { + cursor: pointer; + } } .table.ci-table.environments { - .environment-children td:first-child { - padding-left: 40px; - } - .icon-container { width: 20px; text-align: center; @@ -76,13 +90,4 @@ margin-right: 0; } } - - .environment-folder-name { - cursor: pointer; - } -} - -.environments-list-loading { - width: 100%; - font-size: 34px; } diff --git a/app/views/projects/environments/components/_environment.html.haml b/app/views/projects/environments/components/_environment.html.haml index 8db294449350dbf7ad1d1d49b28d873797ca3295..ae080137361760e7b8fabc225d58242383e451b9 100644 --- a/app/views/projects/environments/components/_environment.html.haml +++ b/app/views/projects/environments/components/_environment.html.haml @@ -1,22 +1,23 @@ %script#environment-item-template{ "type"=> "text/x-template" } %tr.environment - %td.environment-folder-name{ "@click" => "toggle" } + %td.folder-name{ "@click" => "toggle" } %a{ "v-if" => "!isFolder", ":href" => "'#{namespace_project_environments_path(@project.namespace, @project)}/' + model.id" } {{model.name}} %span{ "v-if" => "isFolder" } - %i{ "v-show" => "open" } + %i.folder-icon{ "v-show" => "open" } = icon("caret-down") - %i{ "v-show" => "!open" } + %i.folder-icon{ "v-show" => "!open" } = icon("caret-right") {{model.name}} %td.deployment-column %span{ "v-if" => "!isFolder && model.last_deployment && model.last_deployment.iid" } - {{model.last_deployment.iid}} + = precede '#' do + {{model.last_deployment.iid}} %span{ "v-if" => "model.last_deployment.user" } by @@ -52,18 +53,19 @@ -# = render "projects/environments/stop", environment: "{{model}}" -# = render "projects/deployments/rollback", deployment: "{{model.last_deployment}}" - %tr.environment-children{ "v-show" => "open", + %tr{ "v-show" => "open", "v-if"=>"isFolder", "v-for" => "child in model.children", ":model" => "child" } %td - %a{ ":href" => "'#{namespace_project_environments_path(@project.namespace, @project)}/' + child.id" } + %a.children-name{ ":href" => "'#{namespace_project_environments_path(@project.namespace, @project)}/' + child.id" } {{child.name}} %td.deployment-column %span{ "v-if" => "child.last_deployment && child.last_deployment.iid" } - {{child.last_deployment.iid}} + = precede '#' do + {{child.last_deployment.iid}} %span{ "v-if" => "child.last_deployment.user" } by