diff options
author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-12-04 11:00:52 +0000 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2017-12-04 11:00:52 +0000 |
commit | 6cf76d652d0ae0b77b1250a81aa24e3ce164ccbc (patch) | |
tree | fe69c32bb56860f6a0e08ab4c362b0577e77a3bf /app/views/projects | |
parent | 02111f4d4d03246530e8453d669c63cdbe80fb44 (diff) | |
download | gitlab-ce-6cf76d652d0ae0b77b1250a81aa24e3ce164ccbc.tar.gz |
Add underline hover state to all links
Diffstat (limited to 'app/views/projects')
-rw-r--r-- | app/views/projects/_readme.html.haml | 2 | ||||
-rw-r--r-- | app/views/projects/artifacts/_tree_directory.html.haml | 4 | ||||
-rw-r--r-- | app/views/projects/artifacts/_tree_file.html.haml | 8 | ||||
-rw-r--r-- | app/views/projects/branches/_branch.html.haml | 3 | ||||
-rw-r--r-- | app/views/projects/commits/_commit.html.haml | 2 | ||||
-rw-r--r-- | app/views/projects/empty.html.haml | 6 | ||||
-rw-r--r-- | app/views/projects/protected_branches/shared/_index.html.haml | 2 | ||||
-rw-r--r-- | app/views/projects/protected_tags/shared/_index.html.haml | 2 | ||||
-rw-r--r-- | app/views/projects/tree/_blob_item.html.haml | 4 | ||||
-rw-r--r-- | app/views/projects/tree/_tree_item.html.haml | 4 | ||||
-rw-r--r-- | app/views/projects/wikis/_sidebar.html.haml | 5 |
11 files changed, 20 insertions, 22 deletions
diff --git a/app/views/projects/_readme.html.haml b/app/views/projects/_readme.html.haml index 44aa9eb3826..32901d30b96 100644 --- a/app/views/projects/_readme.html.haml +++ b/app/views/projects/_readme.html.haml @@ -19,5 +19,5 @@ distributed with computer software, forming part of its documentation. %p We recommend you to - = link_to "add a README", add_special_file_path(@project, file_name: 'README.md'), class: 'underlined-link' + = link_to "add a README", add_special_file_path(@project, file_name: 'README.md') file to the repository and GitLab will render it here instead of this message. diff --git a/app/views/projects/artifacts/_tree_directory.html.haml b/app/views/projects/artifacts/_tree_directory.html.haml index 03be6f15313..1a9ce8d0508 100644 --- a/app/views/projects/artifacts/_tree_directory.html.haml +++ b/app/views/projects/artifacts/_tree_directory.html.haml @@ -3,6 +3,6 @@ %tr.tree-item{ 'data-link' => path_to_directory } %td.tree-item-file-name = tree_icon('folder', '755', directory.name) - = link_to path_to_directory do - %span.str-truncated= directory.name + = link_to path_to_directory, class: 'str-truncated' do + %span= directory.name %td diff --git a/app/views/projects/artifacts/_tree_file.html.haml b/app/views/projects/artifacts/_tree_file.html.haml index a97ddb3c377..cfb91568061 100644 --- a/app/views/projects/artifacts/_tree_file.html.haml +++ b/app/views/projects/artifacts/_tree_file.html.haml @@ -6,12 +6,12 @@ %td.tree-item-file-name = tree_icon('file', blob.mode, blob.name) - if external_link - = link_to path_to_file, class: 'tree-item-file-external-link js-artifact-tree-tooltip', + = link_to path_to_file, class: 'tree-item-file-external-link js-artifact-tree-tooltip str-truncated', target: '_blank', rel: 'noopener noreferrer', title: _('Opens in a new window') do - %span.str-truncated>= blob.name + %span>= blob.name = icon('external-link', class: 'js-artifact-tree-external-icon') - else - = link_to path_to_file do - %span.str-truncated= blob.name + = link_to path_to_file, class: 'str-truncated' do + %span= blob.name %td = number_to_human_size(blob.size, precision: 2) diff --git a/app/views/projects/branches/_branch.html.haml b/app/views/projects/branches/_branch.html.haml index 6e02ae6c9cc..573050e597d 100644 --- a/app/views/projects/branches/_branch.html.haml +++ b/app/views/projects/branches/_branch.html.haml @@ -8,8 +8,7 @@ %li{ class: "js-branch-#{branch.name}" } %div = link_to project_tree_path(@project, branch.name), class: 'item-title str-truncated ref-name' do - = icon('code-fork') - = branch.name + = icon('code-fork', class: 'append-right-5') + "#{branch.name}" - if branch.name == @repository.root_ref %span.label.label-primary default diff --git a/app/views/projects/commits/_commit.html.haml b/app/views/projects/commits/_commit.html.haml index a66177f20e9..1b91a94a9f8 100644 --- a/app/views/projects/commits/_commit.html.haml +++ b/app/views/projects/commits/_commit.html.haml @@ -41,6 +41,6 @@ - if commit.status(ref) = render_commit_status(commit, ref: ref) - = link_to commit.short_id, project_commit_path(project, commit), class: "commit-sha btn btn-transparent" + = link_to commit.short_id, project_commit_path(project, commit), class: "commit-sha btn btn-transparent btn-link" = clipboard_button(text: commit.id, title: _("Copy commit SHA to clipboard")) = link_to_browse_code(project, commit) diff --git a/app/views/projects/empty.html.haml b/app/views/projects/empty.html.haml index af564b93dc3..58e89a481a9 100644 --- a/app/views/projects/empty.html.haml +++ b/app/views/projects/empty.html.haml @@ -14,12 +14,12 @@ %p Otherwise you can start with adding a = succeed ',' do - = link_to "README", add_special_file_path(@project, file_name: 'README.md'), class: 'underlined-link' + = link_to "README", add_special_file_path(@project, file_name: 'README.md') a = succeed ',' do - = link_to "LICENSE", add_special_file_path(@project, file_name: 'LICENSE'), class: 'underlined-link' + = link_to "LICENSE", add_special_file_path(@project, file_name: 'LICENSE') or a - = link_to '.gitignore', add_special_file_path(@project, file_name: '.gitignore'), class: 'underlined-link' + = link_to '.gitignore', add_special_file_path(@project, file_name: '.gitignore') to this project. %p You will need to be owner or have the master permission level for the initial push, as the master branch is automatically protected. diff --git a/app/views/projects/protected_branches/shared/_index.html.haml b/app/views/projects/protected_branches/shared/_index.html.haml index ba7d98228c3..e662b877fbb 100644 --- a/app/views/projects/protected_branches/shared/_index.html.haml +++ b/app/views/projects/protected_branches/shared/_index.html.haml @@ -16,7 +16,7 @@ %li prevent pushes from everybody except Masters %li prevent <strong>anyone</strong> from force pushing to the branch %li prevent <strong>anyone</strong> from deleting the branch - %p Read more about #{link_to "protected branches", help_page_path("user/project/protected_branches"), class: "underlined-link"} and #{link_to "project permissions", help_page_path("user/permissions"), class: "underlined-link"}. + %p Read more about #{link_to "protected branches", help_page_path("user/project/protected_branches")} and #{link_to "project permissions", help_page_path("user/permissions")}. - if can? current_user, :admin_project, @project = content_for :create_protected_branch diff --git a/app/views/projects/protected_tags/shared/_index.html.haml b/app/views/projects/protected_tags/shared/_index.html.haml index e764a37bbd7..24baf1cfc89 100644 --- a/app/views/projects/protected_tags/shared/_index.html.haml +++ b/app/views/projects/protected_tags/shared/_index.html.haml @@ -16,7 +16,7 @@ %li Prevent <strong>anyone</strong> from updating the tag %li Prevent <strong>anyone</strong> from deleting the tag - %p Read more about #{link_to "protected tags", help_page_path("user/project/protected_tags"), class: "underlined-link"}. + %p Read more about #{link_to "protected tags", help_page_path("user/project/protected_tags")}. - if can? current_user, :admin_project, @project = yield :create_protected_tag diff --git a/app/views/projects/tree/_blob_item.html.haml b/app/views/projects/tree/_blob_item.html.haml index fd8175e1e01..c51af901699 100644 --- a/app/views/projects/tree/_blob_item.html.haml +++ b/app/views/projects/tree/_blob_item.html.haml @@ -2,8 +2,8 @@ %td.tree-item-file-name = tree_icon(type, blob_item.mode, blob_item.name) - file_name = blob_item.name - = link_to project_blob_path(@project, tree_join(@id || @commit.id, blob_item.name)), title: file_name do - %span.str-truncated= file_name + = link_to project_blob_path(@project, tree_join(@id || @commit.id, blob_item.name)), class: 'str-truncated', title: file_name do + %span= file_name %td.hidden-xs.tree-commit %td.tree-time-ago.cgray.text-right = render 'projects/tree/spinner' diff --git a/app/views/projects/tree/_tree_item.html.haml b/app/views/projects/tree/_tree_item.html.haml index 56197382a70..af3816fc9f4 100644 --- a/app/views/projects/tree/_tree_item.html.haml +++ b/app/views/projects/tree/_tree_item.html.haml @@ -2,8 +2,8 @@ %td.tree-item-file-name = tree_icon(type, tree_item.mode, tree_item.name) - path = flatten_tree(@path, tree_item) - = link_to project_tree_path(@project, tree_join(@id || @commit.id, path)), title: path do - %span.str-truncated= path + = link_to project_tree_path(@project, tree_join(@id || @commit.id, path)), class: 'str-truncated', title: path do + %span= path %td.hidden-xs.tree-commit %td.tree-time-ago.text-right = render 'projects/tree/spinner' diff --git a/app/views/projects/wikis/_sidebar.html.haml b/app/views/projects/wikis/_sidebar.html.haml index 5b781294d68..2c7551c6f8c 100644 --- a/app/views/projects/wikis/_sidebar.html.haml +++ b/app/views/projects/wikis/_sidebar.html.haml @@ -6,9 +6,8 @@ - git_access_url = project_wikis_git_access_path(@project) = link_to git_access_url, class: active_nav_link?(path: 'wikis#git_access') ? 'active' : '' do - = succeed ' ' do - = icon('cloud-download') - = _("Clone repository") + = icon('cloud-download', class: 'append-right-5') + %span= _("Clone repository") .blocks-container .block.block-first |