summaryrefslogtreecommitdiff
path: root/app/views/help
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-03-16 12:09:12 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-03-16 12:09:12 +0000
commitcbfe03ae04a52d9825ff7cbeccdfe5d313adf6a2 (patch)
treee4879b35d019d3bbba1689f3ac4c48b81bf7b451 /app/views/help
parent3fd97b4bba24ca412112aad025a38a32c7a6cf8c (diff)
downloadgitlab-ce-cbfe03ae04a52d9825ff7cbeccdfe5d313adf6a2.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/help')
-rw-r--r--app/views/help/ui.html.haml15
1 files changed, 7 insertions, 8 deletions
diff --git a/app/views/help/ui.html.haml b/app/views/help/ui.html.haml
index 038befac420..d71650ae50c 100644
--- a/app/views/help/ui.html.haml
+++ b/app/views/help/ui.html.haml
@@ -1,5 +1,6 @@
- page_title "UI Development Kit", "Help"
- lorem = "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed fermentum nisi sapien, non consequat lectus aliquam ultrices. Suspendisse sodales est euismod nunc condimentum, a consectetur diam ornare."
+- link_classes = "flex-grow-1 mx-1 "
.gitlab-ui-dev-kit
%h1 GitLab UI development kit
@@ -64,7 +65,12 @@
Cover block for profile page with avatar, name and description
%code .cover-block
.example
- .cover-block
+ .cover-block.user-cover-block
+ = render layout: 'users/cover_controls' do
+ = link_to '#', class: link_classes + 'btn btn-default' do
+ = icon('pencil')
+ = link_to '#', class: link_classes + 'btn btn-default' do
+ = icon('rss')
.avatar-holder
= image_tag avatar_icon_for_email('admin@example.com', 90), class: "avatar s90", alt: ''
.cover-title
@@ -73,13 +79,6 @@
.cover-desc.cgray
= lorem
- .cover-controls
- = link_to '#', class: 'btn btn-default' do
- = icon('pencil')
- &nbsp;
- = link_to '#', class: 'btn btn-default' do
- = icon('rss')
-
%h2#lists Lists
.lead