diff options
| author | Yoginth <me@yoginth.com> | 2019-06-19 17:31:05 +0000 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.m.gray@gmail.com> | 2019-06-19 17:31:05 +0000 |
| commit | a2c373f9ef7c68b86d6a4e983d7cbb6fc142e7a1 (patch) | |
| tree | 41889b7d990ac205efff5898bdd1bf93a2a1f4a3 | |
| parent | 11367613713405e6efa7359efcb8e3791f6b3431 (diff) | |
| download | gitlab-ce-a2c373f9ef7c68b86d6a4e983d7cbb6fc142e7a1.tar.gz | |
Fix double border in profile page
| -rw-r--r-- | app/assets/stylesheets/framework/blocks.scss | 1 | ||||
| -rw-r--r-- | app/views/users/show.html.haml | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/63227-fix-double-border.yml | 5 |
3 files changed, 6 insertions, 2 deletions
diff --git a/app/assets/stylesheets/framework/blocks.scss b/app/assets/stylesheets/framework/blocks.scss index 65c0ee74c60..53a8f7c483a 100644 --- a/app/assets/stylesheets/framework/blocks.scss +++ b/app/assets/stylesheets/framework/blocks.scss @@ -199,7 +199,6 @@ &.user-cover-block { padding: 24px 0 0; - border-bottom: 1px solid $border-color; .nav-links { width: 100%; diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml index a71bfd624e4..b3a73030859 100644 --- a/app/views/users/show.html.haml +++ b/app/views/users/show.html.haml @@ -9,7 +9,7 @@ = auto_discovery_link_tag(:atom, user_url(@user, format: :atom), title: "#{@user.name} activity") .user-profile - .cover-block.user-cover-block + .cover-block.user-cover-block{ class: [('border-bottom' if profile_tabs.empty?)] } .cover-controls - if @user == current_user = link_to profile_path, class: 'btn btn-default has-tooltip', title: s_('UserProfile|Edit profile'), 'aria-label': 'Edit profile' do diff --git a/changelogs/unreleased/63227-fix-double-border.yml b/changelogs/unreleased/63227-fix-double-border.yml new file mode 100644 index 00000000000..6cc4040d333 --- /dev/null +++ b/changelogs/unreleased/63227-fix-double-border.yml @@ -0,0 +1,5 @@ +--- +title: Fix Double Border in Profile Page +merge_request: 29784 +author: Yoginth <@yo> +type: fixed |