Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
ae3dcb6d
Commit
ae3dcb6d
authored
Jul 07, 2020
by
peterhegman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Migrate BS utility classes to GitLab UI
This also fixes a small CSS regression in the location icon alignment
parent
828a1788
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
21 additions
and
35 deletions
+21
-35
app/assets/javascripts/vue_shared/components/user_popover/user_popover.vue
...ripts/vue_shared/components/user_popover/user_popover.vue
+19
-21
app/assets/stylesheets/components/popover.scss
app/assets/stylesheets/components/popover.scss
+0
-12
ee/app/assets/javascripts/requirements/components/requirement_item.vue
.../javascripts/requirements/components/requirement_item.vue
+1
-1
spec/features/projects/user_sees_user_popover_spec.rb
spec/features/projects/user_sees_user_popover_spec.rb
+1
-1
No files found.
app/assets/javascripts/vue_shared/components/user_popover/user_popover.vue
View file @
ae3dcb6d
...
...
@@ -50,11 +50,11 @@ export default {
<
template
>
<!-- 200ms delay so not every mouseover triggers Popover -->
<gl-popover
:target=
"target"
:delay=
"200"
boundary=
"viewport"
triggers=
"hover"
placement=
"top"
>
<div
class=
"
user-popover d-flex
"
>
<div
class=
"
p-1
flex-shrink-1"
>
<user-avatar-image
:img-src=
"user.avatarUrl"
:size=
"60"
css-classes=
"
mr-2
"
/>
<div
class=
"
gl-p-3 gl-line-height-normal gl-display-flex"
data-testid=
"user-popover
"
>
<div
class=
"
gl-p-2
flex-shrink-1"
>
<user-avatar-image
:img-src=
"user.avatarUrl"
:size=
"60"
css-classes=
"
gl-mr-3!
"
/>
</div>
<div
class=
"
p-1 w-100
"
>
<div
class=
"
gl-p-2 gl-w-full
"
>
<template
v-if=
"userIsLoading"
>
<!-- `gl-skeleton-loading` does not support equal length lines -->
<!-- This can be migrated to `gl-skeleton-loader` when https://gitlab.com/gitlab-org/gitlab-ui/-/issues/872 is completed -->
...
...
@@ -62,33 +62,31 @@ export default {
v-for=
"n in $options.maxSkeletonLines"
:key=
"n"
:lines=
"1"
class=
"animation-container-small
mb-1
"
class=
"animation-container-small
gl-mb-2
"
/>
</
template
>
<
template
v-else
>
<div
class=
"
mb-2
"
>
<h5
class=
"m-0"
>
<div
class=
"
gl-mb-3
"
>
<h5
class=
"
gl-
m-0"
>
{{
user
.
name
}}
</h5>
<span
class=
"
text-secondary
"
>
@
{{
user
.
username
}}
</span>
<span
class=
"
gl-text-gray-700
"
>
@
{{
user
.
username
}}
</span>
</div>
<div
class=
"
text-secondary
"
>
<div
v-if=
"user.bio"
class=
"
d-flex mb-1
"
>
<icon
name=
"profile"
class=
"
category-icon
flex-shrink-0"
/>
<span
ref=
"bio"
class=
"
ml-1
"
>
{{
user
.
bio
}}
</span>
<div
class=
"
gl-text-gray-700
"
>
<div
v-if=
"user.bio"
class=
"
gl-display-flex gl-mb-2
"
>
<icon
name=
"profile"
class=
"
gl-text-gray-600 gl-
flex-shrink-0"
/>
<span
ref=
"bio"
class=
"
gl-ml-2
"
>
{{
user
.
bio
}}
</span>
</div>
<div
v-if=
"user.workInformation"
class=
"
d-flex mb-1
"
>
<icon
name=
"work"
class=
"
category-icon
flex-shrink-0"
/>
<span
ref=
"workInformation"
class=
"
ml-1
"
>
{{
user
.
workInformation
}}
</span>
<div
v-if=
"user.workInformation"
class=
"
gl-display-flex gl-mb-2
"
>
<icon
name=
"work"
class=
"
gl-text-gray-600 gl-
flex-shrink-0"
/>
<span
ref=
"workInformation"
class=
"
gl-ml-2
"
>
{{
user
.
workInformation
}}
</span>
</div>
</div>
<div
class=
"js-location text-secondary d-flex"
>
<div
v-if=
"user.location"
>
<icon
name=
"location"
class=
"category-icon flex-shrink-0"
/>
<span
class=
"ml-1"
>
{{
user
.
location
}}
</span>
</div>
<div
v-if=
"user.location"
class=
"js-location gl-text-gray-700 gl-display-flex"
>
<icon
name=
"location"
class=
"gl-text-gray-600 flex-shrink-0"
/>
<span
class=
"gl-ml-2"
>
{{
user
.
location
}}
</span>
</div>
<div
v-if=
"statusHtml"
class=
"js-user-status
mt-2
"
>
<div
v-if=
"statusHtml"
class=
"js-user-status
gl-mt-3
"
>
<span
v-html=
"statusHtml"
></span>
</div>
</
template
>
...
...
app/assets/stylesheets/components/popover.scss
View file @
ae3dcb6d
...
...
@@ -100,18 +100,6 @@
}
}
/**
* user_popover component
*/
.user-popover
{
padding
:
$gl-padding-8
;
line-height
:
$gl-line-height
;
.category-icon
{
color
:
$gray-600
;
}
}
.suggest-gitlab-ci-yml
{
margin-top
:
-1em
;
...
...
ee/app/assets/javascripts/requirements/components/requirement_item.vue
View file @
ae3dcb6d
...
...
@@ -216,7 +216,7 @@ export default {
</div>
</div>
<gl-popover
:target=
"getAuthorPopoverTarget()"
triggers=
"hover focus"
placement=
"top"
>
<div
class=
"
user-popover p-0
d-flex"
>
<div
class=
"
gl-line-height-normal
d-flex"
>
<div
class=
"p-1 flex-shrink-1"
>
<gl-avatar
:entity-name=
"author.name"
:alt=
"author.name"
:src=
"author.avatarUrl"
/>
</div>
...
...
spec/features/projects/user_sees_user_popover_spec.rb
View file @
ae3dcb6d
...
...
@@ -19,7 +19,7 @@ RSpec.describe 'User sees user popover', :js do
subject
{
page
}
describe
'hovering over a user link in a merge request'
do
let
(
:popover_selector
)
{
'
.user-popover
'
}
let
(
:popover_selector
)
{
'
[data-testid="user-popover"]
'
}
before
do
visit
project_merge_request_path
(
project
,
merge_request
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment