Skip to content

Commit 1b9f6de

Browse files
committed
Team fixes 2
1 parent e6bddf4 commit 1b9f6de

File tree

6 files changed

+39
-14
lines changed

6 files changed

+39
-14
lines changed

src/shared/components/GUIKit/JobListCard/style.scss

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,15 +53,15 @@
5353
}
5454

5555
&:nth-child(2) {
56-
width: 204px;
56+
width: 174px;
5757
}
5858

5959
&:nth-child(3) {
60-
width: 263px;
60+
width: 233px;
6161
}
6262

6363
&:nth-child(4) {
64-
width: 195px;
64+
width: 225px;
6565
}
6666

6767
&:last-child {

src/shared/components/GUIKit/SearchCombo/index.jsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,10 @@ function SearchCombo({
2121
return (
2222
<div styleName="container">
2323
<div styleName="input-wrap">
24-
<input type="text" placeholder={placeholder} styleName="input" value={inputVal} onChange={event => setVal(event.target.value)} />
24+
{
25+
!inputVal ? <span styleName="search-placeholder">{placeholder}</span> : null
26+
}
27+
<input type="text" styleName="input" value={inputVal} onChange={event => setVal(event.target.value)} />
2528
{
2629
inputVal ? <IconClearSearch onClick={clearSearch} styleName="clear-search" /> : null
2730
}

src/shared/components/GUIKit/SearchCombo/style.scss

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,26 +9,33 @@
99
width: 100%;
1010
position: relative;
1111
margin-right: 10px;
12+
z-index: 1;
1213

1314
input.input {
14-
background-color: #fff;
15+
background: transparent;
1516
border: 1px solid #aaa;
1617
border-radius: 6px;
1718
height: 39px;
1819
margin: 0;
20+
}
1921

20-
&::placeholder {
21-
color: #aaa;
22-
font-size: 14px;
23-
line-height: 22px;
24-
text-transform: none;
25-
}
22+
.search-placeholder {
23+
color: #aaa;
24+
font-size: 14px;
25+
font-family: Roboto, sans-serif;
26+
line-height: 22px;
27+
text-transform: none;
28+
position: absolute;
29+
z-index: 0;
30+
top: 8px;
31+
left: 15px;
2632
}
2733

2834
.clear-search {
2935
position: absolute;
3036
top: calc(50% - 5px);
3137
right: 15px;
38+
cursor: pointer;
3239
}
3340
}
3441

src/shared/components/Gigs/GigDetails.jsx

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ export default function GigDetails(props) {
3535
if (isomorphy.isClientSide()) {
3636
shareUrl = encodeURIComponent(window.location.href);
3737
}
38+
let skills = getCustomField(job.custom_fields, 'Technologies Required');
39+
if (skills !== 'n/a') skills = skills.split(',').join(', ');
3840

3941
return (
4042
<div styleName="container">
@@ -88,6 +90,8 @@ export default function GigDetails(props) {
8890
</div>
8991
<div styleName="content">
9092
<div styleName="left">
93+
<h4>Required Tech Skills</h4>
94+
<p>{skills}</p>
9195
<h4>Description</h4>
9296
<p>{ReactHtmlParser(job.job_description_text, ReactHtmlParserOptions)}
9397
</p>

src/shared/components/Gigs/style.scss

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,10 @@
134134
}
135135
}
136136
}
137+
138+
.gig-skills {
139+
display: flex;
140+
}
137141
}
138142

139143
.left {
@@ -146,8 +150,15 @@
146150
line-height: 30px;
147151
display: inline-block;
148152
}
149-
150153
/* stylelint-enable */
154+
155+
h4 {
156+
margin-top: 35px;
157+
158+
&:first-child {
159+
margin-top: 0;
160+
}
161+
}
151162
}
152163
}
153164
}

src/shared/containers/Gigs/RecruitCRMJobs.jsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,11 +114,11 @@ class RecruitCRMJobsContainer extends React.Component {
114114
return (
115115
<div styleName="container">
116116
<div styleName="filters">
117-
<SearchCombo placeholder="Search Gig Listings by Name, Skills or Location" onSearch={this.onSearch} term={term} />
117+
<SearchCombo placeholder="Search Gig Listings by Name, Skills, or Location" onSearch={this.onSearch} term={term} />
118118
</div>
119119
<div styleName="jobs-list-container">
120120
{
121-
jobsToDisplay.map(job => <JobListCard job={job} />)
121+
jobsToDisplay.map(job => <JobListCard job={job} key={job.slug} />)
122122
}
123123
</div>
124124
<Paginate onChange={this.onPaginate} pages={pages} page={page} />

0 commit comments

Comments
 (0)