diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-12-01 10:43:26 -0700 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-12-01 13:35:37 -0700 |
| commit | b13740436783b7cd753bcb50d9acd9800ba2febb (patch) | |
| tree | b24c356eba0a856154b90780a045d8ac63c3ef5c | |
| parent | 0ab19c70fd50bb10172e44779dec3a8d0f94b4b6 (diff) | |
| download | gitlab-ce-24129-underline-all-links.tar.gz | |
Fix spacing; remove underlined-link from repo24129-underline-all-links
| -rw-r--r-- | app/assets/stylesheets/framework/common.scss | 1 | ||||
| -rw-r--r-- | app/views/projects/branches/_branch.html.haml | 1 | ||||
| -rw-r--r-- | doc/development/doc_styleguide.md | 6 |
3 files changed, 1 insertions, 7 deletions
diff --git a/app/assets/stylesheets/framework/common.scss b/app/assets/stylesheets/framework/common.scss index cb1aad90a9c..a42fab50db5 100644 --- a/app/assets/stylesheets/framework/common.scss +++ b/app/assets/stylesheets/framework/common.scss @@ -39,7 +39,6 @@ color: $brand-info; } -.underlined-link { text-decoration: underline; } .hint { font-style: italic; color: $hint-color; } .light { color: $common-gray; } diff --git a/app/views/projects/branches/_branch.html.haml b/app/views/projects/branches/_branch.html.haml index a8115ef6d6b..573050e597d 100644 --- a/app/views/projects/branches/_branch.html.haml +++ b/app/views/projects/branches/_branch.html.haml @@ -9,6 +9,7 @@ %div = link_to project_tree_path(@project, branch.name), class: 'item-title str-truncated ref-name' do = icon('code-fork', class: 'append-right-5') + "#{branch.name}" + - if branch.name == @repository.root_ref %span.label.label-primary default - elsif merged diff --git a/doc/development/doc_styleguide.md b/doc/development/doc_styleguide.md index aaa7032cadb..db13e0e6249 100644 --- a/doc/development/doc_styleguide.md +++ b/doc/development/doc_styleguide.md @@ -170,12 +170,6 @@ You can combine one or more of the following: = link_to 'Help page', help_page_path('user/permissions'), class: 'btn btn-info' ``` -1. **Underlining a link.** - - ```haml - = link_to 'Help page', help_page_path('user/permissions'), class: 'underlined-link' - ``` - 1. **Using links inline of some text.** ```haml |