diff options
| author | Phil Hughes <me@iamphill.com> | 2016-05-16 10:26:11 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2016-05-16 10:26:11 +0100 |
| commit | c9b3c08c21daf421ec36828c990ccceb21e1577f (patch) | |
| tree | 3ffab1f98ca9fdc33050d074651d0abdecb41049 | |
| parent | 99428f193b2fe51b16e43f7cd98029326b5c30f9 (diff) | |
| download | gitlab-ce-c9b3c08c21daf421ec36828c990ccceb21e1577f.tar.gz | |
Changed table border colorproject-variables-ui
Fixed issue with form errors not displaying
| -rw-r--r-- | app/assets/stylesheets/framework/variables.scss | 2 | ||||
| -rw-r--r-- | app/views/projects/variables/_table.html.haml | 25 | ||||
| -rw-r--r-- | app/views/projects/variables/index.html.haml | 2 |
3 files changed, 15 insertions, 14 deletions
diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss index 5fa4c266607..7360bdbcc82 100644 --- a/app/assets/stylesheets/framework/variables.scss +++ b/app/assets/stylesheets/framework/variables.scss @@ -12,7 +12,7 @@ $gutter_inner_width: 258px; */ $border-color: #e5e5e5; $focus-border-color: #3aabf0; -$table-border-color: #ececec; +$table-border-color: #f0f0f0; $background-color: #fafafa; /* diff --git a/app/views/projects/variables/_table.html.haml b/app/views/projects/variables/_table.html.haml index f51a52d7cb3..6c43f822db4 100644 --- a/app/views/projects/variables/_table.html.haml +++ b/app/views/projects/variables/_table.html.haml @@ -10,15 +10,16 @@ %th %tbody - @project.variables.each do |variable| - %tr - %td= variable.key - %td= variable.value - %td - = link_to namespace_project_variable_path(@project.namespace, @project, variable), class: "btn btn-transparent btn-variable-edit" do - %span.sr-only - Update - = icon("pencil") - = link_to namespace_project_variable_path(@project.namespace, @project, variable), class: "btn btn-transparent btn-variable-delete", method: :delete, data: { confirm: "Are you sure?" } do - %span.sr-only - Remove - = icon("trash") + - if variable.id? + %tr + %td= variable.key + %td= variable.value + %td + = link_to namespace_project_variable_path(@project.namespace, @project, variable), class: "btn btn-transparent btn-variable-edit" do + %span.sr-only + Update + = icon("pencil") + = link_to namespace_project_variable_path(@project.namespace, @project, variable), class: "btn btn-transparent btn-variable-delete", method: :delete, data: { confirm: "Are you sure?" } do + %span.sr-only + Remove + = icon("trash") diff --git a/app/views/projects/variables/index.html.haml b/app/views/projects/variables/index.html.haml index 89ef79fb2e9..09bb54600af 100644 --- a/app/views/projects/variables/index.html.haml +++ b/app/views/projects/variables/index.html.haml @@ -11,7 +11,7 @@ %h5.prepend-top-0 Your variables (#{@project.variables.size}) - if @project.variables.empty? - %p.profile-settings-message.text-center.append-bottom-0 + %p.settings-message.text-center.append-bottom-0 No variables found, add one with the form above. - else = render "table" |