Commit 0d5766e6 authored by Jacob Schatz's avatar Jacob Schatz

Merge branch 'deploy-key-alert-color' into 'master'

Fixed project settings alert colors

In another MR, the class name was changed making all the alert messages have no background color

![Screen_Shot_2016-05-16_at_15.41.23](/uploads/58c9cb8016c4cdd0b7a02609554d3598/Screen_Shot_2016-05-16_at_15.41.23.png)![Screen_Shot_2016-05-16_at_15.41.15](/uploads/03e0a9f6d2b6c583cef79efbb3fc73cc/Screen_Shot_2016-05-16_at_15.41.15.png)![Screen_Shot_2016-05-16_at_15.41.31](/uploads/41481ab2a4069def0e44c4bb8784fbb3/Screen_Shot_2016-05-16_at_15.41.31.png)

See merge request !4161
parents 86b22b4f caca3bb7
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
%ul.well-list %ul.well-list
= render @enabled_keys = render @enabled_keys
- else - else
.profile-settings-message.text-center .settings-message.text-center
No deploy keys found. Create one with the form above or add existing one below. No deploy keys found. Create one with the form above or add existing one below.
%h5.prepend-top-default %h5.prepend-top-default
Deploy keys from projects you have access to (#{@available_project_keys.size}) Deploy keys from projects you have access to (#{@available_project_keys.size})
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
%ul.well-list %ul.well-list
= render @available_project_keys = render @available_project_keys
- else - else
.profile-settings-message.text-center .settings-message.text-center
No deploy keys from your projects could be found. Create one with the form above or add existing one below. No deploy keys from your projects could be found. Create one with the form above or add existing one below.
- if @available_public_keys.any? - if @available_public_keys.any?
%h5.prepend-top-default %h5.prepend-top-default
......
...@@ -80,5 +80,5 @@ ...@@ -80,5 +80,5 @@
- @hooks.each do |hook| - @hooks.each do |hook|
= render "project_hook", hook: hook = render "project_hook", hook: hook
- else - else
%p.profile-settings-message.text-center.append-bottom-0 %p.settings-message.text-center.append-bottom-0
No webhooks found, add one in the form above. No webhooks found, add one in the form above.
%h5.prepend-top-0 %h5.prepend-top-0
Already Protected (#{@branches.size}) Already Protected (#{@branches.size})
- if @branches.empty? - if @branches.empty?
%p.profile-settings-message.text-center %p.settings-message.text-center
No branches are protected, protect a branch with the form above. No branches are protected, protect a branch with the form above.
- else - else
- can_admin_project = can?(current_user, :admin_project, @project) - can_admin_project = can?(current_user, :admin_project, @project)
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
%th %th
= render partial: 'trigger', collection: @triggers, as: :trigger = render partial: 'trigger', collection: @triggers, as: :trigger
- else - else
%p.profile-settings-message.text-center.append-bottom-default %p.settings-message.text-center.append-bottom-default
There are no triggers to use, add one by the button below. There are no triggers to use, add one by the button below.
= form_for @trigger, url: url_for(controller: 'projects/triggers', action: 'create') do |f| = form_for @trigger, url: url_for(controller: 'projects/triggers', action: 'create') do |f|
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment