summaryrefslogtreecommitdiff
path: root/app/views
diff options
context:
space:
mode:
authorKamil Trzcinski <ayufan@ayufan.eu>2016-06-14 16:11:28 +0200
committerKamil Trzcinski <ayufan@ayufan.eu>2016-06-14 16:11:28 +0200
commitdc41a933f4f9a79e7160e38f248d33d7beb99bb6 (patch)
tree996081065e7be06caa668e600ac80ef2283974be /app/views
parent975e3887510cd09103363095cafd42fd688d920c (diff)
downloadgitlab-ce-dc41a933f4f9a79e7160e38f248d33d7beb99bb6.tar.gz
Update scss to make the views look nicer
Diffstat (limited to 'app/views')
-rw-r--r--app/views/projects/deployments/_deployment.html.haml2
-rw-r--r--app/views/projects/environments/_environment.html.haml7
-rw-r--r--app/views/projects/environments/index.html.haml2
-rw-r--r--app/views/projects/environments/show.html.haml6
4 files changed, 8 insertions, 9 deletions
diff --git a/app/views/projects/deployments/_deployment.html.haml b/app/views/projects/deployments/_deployment.html.haml
index 1ac17af8b58..28c003d22a8 100644
--- a/app/views/projects/deployments/_deployment.html.haml
+++ b/app/views/projects/deployments/_deployment.html.haml
@@ -9,7 +9,7 @@
&middot;
= link_to deployment.short_sha, namespace_project_commit_path(@project.namespace, @project, deployment.sha), class: "commit-id monospace"
- %p
+ %p.commit-title
%span
- if commit_title = deployment.commit_title
= link_to_gfm commit_title, namespace_project_commit_path(@project.namespace, @project, deployment.sha), class: "commit-row-message"
diff --git a/app/views/projects/environments/_environment.html.haml b/app/views/projects/environments/_environment.html.haml
index 5ca57bd153d..c2e6d11f941 100644
--- a/app/views/projects/environments/_environment.html.haml
+++ b/app/views/projects/environments/_environment.html.haml
@@ -13,17 +13,16 @@
&middot;
= link_to last_deployment.short_sha, namespace_project_commit_path(@project.namespace, @project, last_deployment.sha), class: "commit-id monospace"
- %p
+ %p.commit-title
%span
- if commit_title = last_deployment.commit_title
= link_to_gfm commit_title, namespace_project_commit_path(@project.namespace, @project, last_deployment.sha), class: "commit-row-message"
- else
Cant find HEAD commit for this branch
- else
- %p
+ %p.commit-title
No deployments yet
%td
- if last_deployment
- %p
- #{time_ago_with_tooltip(last_deployment.created_at)}
+ #{time_ago_with_tooltip(last_deployment.created_at)}
diff --git a/app/views/projects/environments/index.html.haml b/app/views/projects/environments/index.html.haml
index 4a445a157ec..fa1046bbe1a 100644
--- a/app/views/projects/environments/index.html.haml
+++ b/app/views/projects/environments/index.html.haml
@@ -15,7 +15,7 @@
No environments to show
- else
.table-holder
- %table.table
+ %table.table.environments
%tbody
%th Environment
%th Last deployment
diff --git a/app/views/projects/environments/show.html.haml b/app/views/projects/environments/show.html.haml
index 1d39bef9427..6454101004a 100644
--- a/app/views/projects/environments/show.html.haml
+++ b/app/views/projects/environments/show.html.haml
@@ -5,7 +5,7 @@
%div{ class: (container_class) }
.top-area
.col-md-9
- %h3= @environment.name.titleize
+ %h3.page-title= @environment.name.titleize
.col-md-3
.nav-controls
@@ -13,13 +13,13 @@
= link_to 'Destroy', namespace_project_environment_path(@project.namespace, @project, @environment), data: { confirm: 'Are you sure?' }, class: 'btn btn-danger', method: :delete
- if @deployments.blank?
- %ul.content-list
+ %ul.content-list.environments
%li.nothing-here-block
No deployments for
%strong= @environment.name
- else
.table-holder
- %table.table.builds
+ %table.table.environments
%thead
%tr
%th ID