Skip to content

Fix user skills list #1495

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 8, 2017
Merged

Fix user skills list #1495

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4a6e161
Fix user skills list display
joshsmith Nov 7, 2017
d5b56c5
Fix contributors list styles
joshsmith Nov 7, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
81 changes: 69 additions & 12 deletions app/styles/components/user-list-item.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
.user-list-item {
@include outer-container;
align-items: center;
border-top: 1px solid $gray--lightest;
display: flex;
padding: .7em 1em;
position: relative;

@include media($sm-screen) {
padding: .7em 0;
}

&:hover {
background-color: #F9F9F9;
}
Expand All @@ -14,21 +17,75 @@
}

.project-user {
&__actions {
@include span-columns(2);
text-align: right;
}
&__avatar {
@include span-columns(1);
&__user {
@include span-columns(4);

@include media($sm-screen) {
@include span-columns(12);

.icon {
height: 40px;
width: 40px;
}
}

&__avatar {
float: left;
}

&__name {
padding: 5px 10px 5px 60px;

@include media($sm-screen) {
padding: 2px 0 2px 50px;
}

strong {
font-weight: 700;
}
}
}
&__name {

&__actions {
@include span-columns(3);
strong {
font-weight: 700;

text-align: left;

button {
margin-top: 5px;
}

@include media($sm-screen) {
@include span-columns(12);
display: flex;
justify-content: space-between;
button {
flex: 1;
margin-right: 5px;
&:last-of-type {
margin-right: 0;
}
}
}
}

&__skills {
@include span-columns(6);
@include span-columns(5);
padding-top: 5px;

@include media($sm-screen) {
@include span-columns(12);
padding-left: 50px;

h4 {
display: none;
}

.user__skills-list ul {
margin: 0;
}
}

font-size: $body-font-size-small;
}
}
Expand Down
5 changes: 2 additions & 3 deletions app/styles/components/user/skills-list.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
.user__skills-list {
ul {
align-items: flex-start;
display: flex;
margin-top: 10px;

li {
background: #E8EBED;
border-radius: 2px;
color: #333;
display: inline-block;
font-weight: 600;
margin-right: 5px;
margin: 0 3px 5px 0;
padding: 4px 7px;
}
}
Expand Down
2 changes: 1 addition & 1 deletion app/styles/templates/project/settings/contributors.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@
.contributors-list--empty {
background: $background-gray;
border-radius: 4px;
padding: 20px 60px;
padding: 5px 20px;
}
38 changes: 20 additions & 18 deletions app/templates/components/user-list-item.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,26 @@
<div class="project-user__avatar">
{{#link-to 'slugged-route' user.username}}
<img class="icon" src= {{user.photoThumbUrl}} />
{{/link-to}}
</div>
<div class="project-user__user">
<div class="project-user__user__avatar">
{{#link-to 'slugged-route' user.username}}
<img class="icon" src= {{user.photoThumbUrl}} />
{{/link-to}}
</div>

<div class="project-user__name">
<strong>
{{#if user.name}}
{{link-to user.name 'slugged-route' user.username}}
{{else}}
{{link-to user.username 'slugged-route' user.username}}
{{/if}}
</strong>
<br>
<span>
{{user.username}}
</span>
<div data-test-project-user-name class="project-user__user__name">
<strong>
{{#if user.name}}
{{link-to user.name 'slugged-route' user.username}}
{{else}}
{{link-to user.username 'slugged-route' user.username}}
{{/if}}
</strong>
<br>
<span>
{{user.username}}
</span>
</div>
</div>

<div class="project-user__skills">
<div data-test-project-user-skills class="project-user__skills">
<h4>Skills</h4>
{{user/skills-list data-test-user-skills-list user=user}}
</div>
Expand Down
4 changes: 2 additions & 2 deletions tests/pages/components/user-list-item.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ export default {
},

name: {
scope: '.project-user__name',
scope: '[data-test-project-user-name]',
name: {
scope: 'strong',
text: text()
Expand All @@ -52,7 +52,7 @@ export default {
},

skills: collection({
scope: '.project-user__skills',
scope: '[data-test-project-user-skills]',
itemScope: 'li',
item: {
text: text()
Expand Down