Skip to content
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.

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

Some small styling fixes for skills lists #1162

Merged
merged 1 commit into from
Mar 18, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
19 changes: 15 additions & 4 deletions app/styles/_buttons.scss
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,17 @@
&.large {
font-size: $body-font-size-large;
padding: 15px 40px;

&.skill {
padding: 8px 14px;
}
}

&.normal {
&.skill {
font-size: $body-font-size-normal;
padding: 8px 11px;
}
}

&.on-solid {
Expand Down Expand Up @@ -86,8 +97,8 @@
padding: 6px 14px;

&.skill {
padding: 6px 9px;
font-size: $body-font-size-normal;
padding: 4px 6px;
font-size: $body-font-size-small;
}
}

Expand Down Expand Up @@ -133,7 +144,7 @@
vertical-align: middle;
width: 18px;

&.small {
&.normal, &.small {
height: 10px;
width: 12px;

Expand All @@ -153,7 +164,7 @@

&.x-mark {
@include sprite($x-mark);
&.small {
&.normal, &.small {
@include sprite($x-mark-small);
}
}
Expand Down
19 changes: 10 additions & 9 deletions app/styles/components/project-skills-list.scss
Original file line number Diff line number Diff line change
@@ -1,30 +1,31 @@
.project-skills-list {
$color: $gray--dark;
font-size: $body-font-size-small;

&__header {
text-align: center;
margin-bottom: 0.6em;
position: relative;
text-align: center;
overflow: hidden;
width: 100%;
margin-bottom: 1em;

span {
color: $color;
display: inline-block;
vertical-align: baseline;
zoom: 1;
*display: inline;
*vertical-align: auto;
position: relative;
padding: 0 1em;
color: $color;
position: relative;
vertical-align: baseline;
*vertical-align: auto;
zoom: 1;

&:before, &:after {
border-top: 1px solid $color;
content: '';
display: block;
width: 1000px;
position: absolute;
top: 0.73em;
border-top: 1px solid $color;
width: 1000px;
}

&:before { right: 100%; }
Expand Down
6 changes: 6 additions & 0 deletions app/styles/components/skills-list.scss
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,9 @@
}
}
}

.task-skills-list {
.skill {
margin-bottom: 5px;
}
}
14 changes: 3 additions & 11 deletions app/styles/components/skills-typeahead.scss
Original file line number Diff line number Diff line change
@@ -1,24 +1,16 @@
.skills-typeahead-container {
@include span-columns(12);

margin-top: 15px;
margin-bottom: 30px;
}

.skills-typeahead-area {

margin: 0.6em 0;
}

.skills-typeahead {
&--centered {
margin: 0 auto;
margin: 0 auto;
}

position: relative;
width: 400px;

input {
min-width: 400px;
width: 100%;
}

.dropdown-menu {
Expand Down
10 changes: 10 additions & 0 deletions app/styles/templates/project/tasks/task.scss
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,13 @@
.task-sidebar {
@include span-columns(3);
}

.task-sidebar-section {
&__header {
h2 {
color: $text--dark;
font-size: 16px;
font-weight: 600;
}
}
}
18 changes: 17 additions & 1 deletion app/styles/templates/start/skills.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,32 @@
flex-direction: column;
//justify-content: center;
margin-bottom: 2em;

@include shift(3.5);
@include span-columns(5);

@include media($lg-screen) {
@include shift(2);
@include span-columns(8);
}

@include media($md-screen) {
@include shift(0);
@include span-columns(12);
}
}

.skills__list {
text-align: center;

button {
margin: 0 .5em 1em 0;
margin: 0 5px 5px 0;
}

div {
display: inline-block;
}

p {
color: $text--lightest;
font-style: italic;
Expand Down
2 changes: 1 addition & 1 deletion app/templates/components/project-details.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<button class="clear small" disabled>Request sent</button>
{{/if}}
{{else}}
{{link-to "Sign up" "signup" class="button default small"}} to join this project.
{{link-to "Join project" "signup" class="button default small"}}
{{/if}}
{{/if}}
</aside>
2 changes: 1 addition & 1 deletion app/templates/components/project-skills-list.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@
{{project-skill-item skill=skill onClicked=onSkillClicked}}
{{else}}
<div class="project-skills-list__fallback">
There are no more project skills to be added.
You've added all the project's skills.
</div>
{{/each}}
2 changes: 1 addition & 1 deletion app/templates/components/skills-typeahead.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
focus-in="focus"
focus-out="blur"
getKeyDown=(action "getKeyDown")
placeholder="Start typing a skill, like Ruby or PhotoShop"
placeholder="Search skills"
value=query
}}

Expand Down
2 changes: 1 addition & 1 deletion app/templates/components/task-new-form.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@
{{/each}}
</div>
<div class="input-group">
<input tabindex="4" class="button right" name="submit" type="submit" value="Submit new task" {{action save}} />
<input tabindex="4" class="button default right" name="submit" type="submit" value="Submit new task" {{action save}} />
</div>
</div>
2 changes: 1 addition & 1 deletion app/templates/project/settings/profile.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
iconBefore=false
isLoading=projectSkill.isLoading
remove=(action removeProjectSkill projectSkill)
size="small"
size="normal"
skill=projectSkill.skill
}}
{{/each}}
Expand Down
2 changes: 1 addition & 1 deletion tests/acceptance/project-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ test('A user can join the organization of the project', function(assert) {
visit(projectURL);

andThen(() => {
assert.equal(projectTasksIndexPage.projectDetails.signUpLink.text, 'Sign up', 'The link to sign up is present when logged out');
assert.equal(projectTasksIndexPage.projectDetails.signUpLink.text, 'Join project', 'The link to the sign up page is present when logged out');

authenticateSession(this.application, { user_id: user.id });
visit(projectURL);
Expand Down