Skip to content

Commit e362a23

Browse files
committed
Updated site
1 parent 891279a commit e362a23

File tree

8 files changed

+34
-78
lines changed

8 files changed

+34
-78
lines changed

app/components/section/education.js

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
const React = require('react');
44

5-
const config = require('../../config');
65
const ResumePropTypes = require('../../prop_types/resume');
76
const Datetime = require('../../utils/datetime');
87

@@ -17,17 +16,12 @@ const Entry = React.createClass({
1716
return (
1817
<div className='row item'>
1918
<div className='twelve columns'>
20-
<div className='two columns logo'>
21-
<img src={config.logo[this.props.entry.institution]} alt={this.props.entry.company}/>
22-
</div>
23-
<div className='ten columns additional-spacing content'>
24-
<h3>{this.props.entry.institution}</h3>
25-
<p className='info'>
26-
{this.props.entry.area}
27-
<span> &bull; </span>
28-
<em className='date'>{startDate} - {endDate}</em>
29-
</p>
30-
</div>
19+
<h3>{this.props.entry.institution}</h3>
20+
<p className='info'>
21+
{this.props.entry.area}
22+
<span> &bull; </span>
23+
<em className='date'>{startDate} - {endDate}</em>
24+
</p>
3125
</div>
3226
</div>
3327
);

app/components/section/work.js

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
const React = require('react');
44
const PropTypes = React.PropTypes;
55

6-
const config = require('../../config');
76
const ResumePropTypes = require('../../prop_types/resume');
87
const BulletPoints = require('../bullet_points');
98
const Datetime = require('../../utils/datetime');
@@ -24,18 +23,13 @@ const Entry = React.createClass({
2423
return (
2524
<div className='row item'>
2625
<div className='twelve columns'>
27-
<div className='two columns logo'>
28-
<img src={config.logo[this.props.entry.company]} alt={this.props.entry.company}/>
29-
</div>
30-
<div className='ten columns content'>
31-
<h3>{this.props.entry.company}</h3>
32-
<p className='info'>
33-
{this.props.entry.position}
34-
&nbsp;&bull;&nbsp;
35-
<em className='date'>{startDate} - {endDate}</em>
36-
</p>
37-
<BulletPoints points={this.props.entry.highlights}/>
38-
</div>
26+
<h3>{this.props.entry.company}</h3>
27+
<p className='info'>
28+
{this.props.entry.position}
29+
&nbsp;&bull;&nbsp;
30+
<em className='date'>{startDate} - {endDate}</em>
31+
</p>
32+
<BulletPoints points={this.props.entry.highlights}/>
3933
</div>
4034
{divider}
4135
</div>

app/config.js

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,5 @@ module.exports = {
1515
// works: 'Works',
1616
testimonials: 'References'
1717
// contact: 'Contact'
18-
},
19-
20-
logo: {
21-
'AfterShip Limited': 'public/images/section/aftership.png',
22-
'The University of Hong Kong': 'public/images/section/hku.png',
23-
'Demand Analytics Limited': 'public/images/section/da.png',
24-
'eSolutions Limited': 'public/images/section/esolutions.png',
25-
'Universal Enterprises (Pvt) Limited': 'public/images/section/universal.png',
26-
'The Hong Kong University of Science and Technology': 'public/images/section/hkust.png',
27-
'Simon Fraser University': 'public/images/section/sfu.png'
2818
}
2919
};

package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,12 @@
2727
"npm": ">= 2.14.7"
2828
},
2929
"scripts": {
30-
"bundle": "webpack -p",
30+
"bundle": "webpack --production",
3131
"lint": "eslint .",
3232
"prepush": "npm run lint",
3333
"setup": ". ./setup.sh",
34-
"start": "webpack-dev-server --hot --inline"
34+
"start": "webpack-dev-server --hot --inline",
35+
"watch": "webpack --watch"
3536
},
3637
"dependencies": {},
3738
"devDependencies": {

public/bundle.js

Lines changed: 17 additions & 17 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/bundle.js.map

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/css/layout.css

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -289,10 +289,6 @@ strong.fa-quora {
289289

290290
#work .header-col { padding-top: 9px; }
291291
#work .main-col { padding-right: 10%; }
292-
#work .row {
293-
padding-left: 0px;
294-
padding-right: 0px;
295-
}
296292

297293
.education, .work {
298294
margin-bottom: 48px;
@@ -347,14 +343,6 @@ strong.fa-quora {
347343

348344
#education .header-col { padding-top: 9px; }
349345
#education .main-col { padding-right: 10%; }
350-
#education .row {
351-
padding-left: 0px;
352-
padding-right: 0px;
353-
}
354-
#education .additional-spacing {
355-
padding-top: 10px;
356-
padding-bottom: 10px;
357-
}
358346

359347
#education .info {
360348
font: 16px/24px 'librebaskerville-italic', serif;
@@ -404,14 +392,6 @@ strong.fa-quora {
404392

405393
#skill .header-col { padding-top: 9px; }
406394
#skill .main-col { padding-right: 10%; }
407-
#skill .row {
408-
padding-left: 0px;
409-
padding-right: 0px;
410-
}
411-
412-
#skill .inside {
413-
margin-left: 10px;
414-
}
415395

416396
#skill .info {
417397
font: 16px/24px 'librebaskerville-italic', serif;

public/css/media-queries.css

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,13 +61,9 @@
6161
------------------------------------------------------------------- */
6262
#work h1 { font: 16px/24px 'opensans-bold', sans-serif; }
6363
#work .main-col { padding-right: 5%; }
64-
#work .logo { display: none; }
65-
#work .content { padding-top: 5%; }
6664

6765
#education h1 { font: 16px/24px 'opensans-bold', sans-serif; }
6866
#education .main-col { padding-right: 5%; }
69-
#education .logo { display: none; }
70-
#education .content { padding-top: 5%; }
7167

7268
#skill h1 { font: 16px/24px 'opensans-bold', sans-serif; }
7369
#skill .main-col { padding-right: 5%; }

0 commit comments

Comments
 (0)