diff options
| author | Rubén Dávila <rdavila84@gmail.com> | 2016-01-14 21:05:33 -0500 |
|---|---|---|
| committer | Rubén Dávila <rdavila84@gmail.com> | 2016-01-20 00:17:21 -0500 |
| commit | 833a0f4d9fd4ec8a264812cc42ca52d30d325e13 (patch) | |
| tree | c18b7dad0cca4425f1d1f5f12db3ba95425a3a51 | |
| parent | 40e1ad90526ad35e1d5eba74c0b1d99b6a8ae89d (diff) | |
| download | gitlab-ce-833a0f4d9fd4ec8a264812cc42ca52d30d325e13.tar.gz | |
Add icon for private forks notice. #2406
| -rw-r--r-- | app/assets/stylesheets/pages/projects.scss | 13 | ||||
| -rw-r--r-- | app/helpers/icons_helper.rb | 2 | ||||
| -rw-r--r-- | app/views/projects/forks/index.html.haml | 3 |
3 files changed, 16 insertions, 2 deletions
diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss index 7c3587622c4..a594cc43db2 100644 --- a/app/assets/stylesheets/pages/projects.scss +++ b/app/assets/stylesheets/pages/projects.scss @@ -579,3 +579,16 @@ pre.light-well { color: #E62958; margin-top: 2px; } + +/* + * Forks list rendered on Project's forks page + */ + +.private-forks-notice .private-fork-icon { + i.fa-circle { + color: #2AA056; + } + i.fa-lock { + color: #FFFFFF; + } +} diff --git a/app/helpers/icons_helper.rb b/app/helpers/icons_helper.rb index 5724d3aabec..84c6d0883b0 100644 --- a/app/helpers/icons_helper.rb +++ b/app/helpers/icons_helper.rb @@ -7,7 +7,7 @@ module IconsHelper # font-awesome-rails gem, but should we ever use a different icon pack in the # future we won't have to change hundreds of method calls. def icon(names, options = {}) - fa_icon(names, options) + options.include?(:base) ? fa_stacked_icon(names, options) : fa_icon(names, options) end def spinner(text = nil, visible = false) diff --git a/app/views/projects/forks/index.html.haml b/app/views/projects/forks/index.html.haml index 10ab5c44af1..70f1392a878 100644 --- a/app/views/projects/forks/index.html.haml +++ b/app/views/projects/forks/index.html.haml @@ -51,7 +51,8 @@ forks: true, show_last_commit_as_description: true - if protected_count > 0 - %ul.projects-list + %ul.projects-list.private-forks-notice %li.project-row + = icon('lock fw', base: 'circle', class: 'fa-lg private-fork-icon') %strong= pluralize(protected_count, 'private fork') %span you have no access to. |