diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-08-10 21:20:03 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-08-10 21:20:03 +0300 |
| commit | 0175e665893ca8f8fd660ff55841e95c02fcb987 (patch) | |
| tree | 96b41c7e28352a58cf821af9a8f8deab22f7c933 | |
| parent | 37cf2eb691b19998b69b8ad9bf8489837d00c81a (diff) | |
| download | gitlab-ce-0175e665893ca8f8fd660ff55841e95c02fcb987.tar.gz | |
hide no-ssh message if notice or alert present
| -rw-r--r-- | app/assets/stylesheets/common.scss | 6 | ||||
| -rw-r--r-- | app/views/layouts/_flash.html.haml | 4 | ||||
| -rw-r--r-- | app/views/shared/_no_ssh.html.haml | 2 |
3 files changed, 4 insertions, 8 deletions
diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss index abd38a09929..39e6728b5b0 100644 --- a/app/assets/stylesheets/common.scss +++ b/app/assets/stylesheets/common.scss @@ -49,12 +49,8 @@ table a code { cursor: pointer; margin: 0; text-align: center; - border-radius: 0; color: #fff; - - span { - font-size: 14px; - } + font-size: 14px; .flash-notice { background: #49C; diff --git a/app/views/layouts/_flash.html.haml b/app/views/layouts/_flash.html.haml index 2585030db83..cc8ea066cb9 100644 --- a/app/views/layouts/_flash.html.haml +++ b/app/views/layouts/_flash.html.haml @@ -1,8 +1,8 @@ .flash-container - if alert .flash-alert - %span= alert + = alert - elsif notice .flash-notice - %span= notice + = notice diff --git a/app/views/shared/_no_ssh.html.haml b/app/views/shared/_no_ssh.html.haml index 82bf00aa280..6d363807d62 100644 --- a/app/views/shared/_no_ssh.html.haml +++ b/app/views/shared/_no_ssh.html.haml @@ -1,3 +1,3 @@ -- if current_user.require_ssh_key? +- if current_user.require_ssh_key? && alert.blank? && notice.blank? %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 |