kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

hide no-ssh message if notice or alert present

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2013-08-10 21:20:03 +03:00
parent 37cf2eb691
commit 0175e66589
3 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/assets/stylesheets/common.scss
View file

@ -49,12 +49,8 @@ table a code {
cursor: pointer; cursor: pointer;
margin: 0; margin: 0;
text-align: center; text-align: center;
border-radius: 0;
color: #fff; color: #fff;
font-size: 14px;
span {
font-size: 14px;
}
.flash-notice { .flash-notice {
background: #49C; background: #49C;

4
app/views/layouts/_flash.html.haml
View file

@ -1,8 +1,8 @@
.flash-container .flash-container
- if alert - if alert
.flash-alert .flash-alert
%span= alert = alert
- elsif notice - elsif notice
.flash-notice .flash-notice
%span= notice = notice

2
app/views/shared/_no_ssh.html.haml
View file

@ -1,3 +1,3 @@
- if current_user.require_ssh_key? - if current_user.require_ssh_key? && alert.blank? && notice.blank?
%p.error-message.centered %p.error-message.centered
You won't be able to pull or push project code via SSH until you #{link_to 'add an SSH key', new_profile_key_path} to your profile You won't be able to pull or push project code via SSH until you #{link_to 'add an SSH key', new_profile_key_path} to your profile