mirror of
https://github.com/scratchfoundation/scratch-www.git
synced 2025-02-16 16:19:48 -05:00
Resolve feedback from PR, fix stylistic issues
This commit is contained in:
parent
730e440ee6
commit
b4147a8d53
8 changed files with 23 additions and 23 deletions
|
@ -1,6 +1,7 @@
|
|||
{
|
||||
"rules": {
|
||||
"curly": [2, "multi-line"],
|
||||
"eol-last": [2],
|
||||
"indent": [2, 4],
|
||||
"quotes": [2, "single"],
|
||||
"linebreak-style": [2, "unix"],
|
||||
|
|
|
@ -25,23 +25,24 @@
|
|||
"compression": "1.5.2",
|
||||
"express": "4.13.3",
|
||||
"lodash.defaults": "3.1.2",
|
||||
"mustache": "2.1.3",
|
||||
"slick-carousel": "^1.5.8"
|
||||
"mustache": "2.1.3"
|
||||
},
|
||||
"devDependencies": {
|
||||
"autoprefixer-loader": "2.1.0",
|
||||
"css-loader": "0.17.0",
|
||||
"eslint": "1.3.1",
|
||||
"eslint-plugin-react": "3.3.1",
|
||||
"file-loader": "^0.8.4",
|
||||
"file-loader": "0.8.4",
|
||||
"json-loader": "0.5.2",
|
||||
"jsx-loader": "0.13.2",
|
||||
"node-sass": "3.3.2",
|
||||
"react": "0.13.3",
|
||||
"react-slick": "0.7.0",
|
||||
"sass-loader": "2.0.1",
|
||||
"slick-carousel": "1.5.8",
|
||||
"style-loader": "0.12.3",
|
||||
"tape": "4.2.0",
|
||||
"url-loader": "^0.5.6",
|
||||
"url-loader": "0.5.6",
|
||||
"watch": "0.16.0",
|
||||
"webpack": "1.12.0",
|
||||
"xhr": "2.0.4"
|
||||
|
|
|
@ -46,4 +46,4 @@
|
|||
"creator": "raimondious",
|
||||
"href": "/projects/1000/"
|
||||
}
|
||||
]
|
||||
]
|
||||
|
|
|
@ -24,10 +24,9 @@ module.exports = React.createClass({
|
|||
}
|
||||
};
|
||||
},
|
||||
|
||||
render: function () {
|
||||
return (
|
||||
<Slider className="carousel" {... this.props.settings}>
|
||||
<Slider className={'carousel ' + this.props.className} {... this.props.settings}>
|
||||
{this.props.items.map(function(item) {
|
||||
return (
|
||||
<Thumbnail key={item.id}
|
||||
|
|
|
@ -44,4 +44,4 @@
|
|||
padding-right: 30px;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
|
|
@ -15,14 +15,13 @@ module.exports = React.createClass({
|
|||
};
|
||||
},
|
||||
render: function () {
|
||||
var className = this.props.className + ' thumbnail';
|
||||
return (
|
||||
<div className={className}>
|
||||
<a className="thumbnailImage" href={this.props.href}>
|
||||
<div className={'thumbnail ' + this.props.className}>
|
||||
<a className='thumbnail-image' href={this.props.href}>
|
||||
<img src={this.props.src} />
|
||||
</a>
|
||||
<span className="thumbnailTitle"><a href={this.props.href}>{this.props.title}</a></span>
|
||||
<span className="thumbnailExtra">{this.props.extra}</span>
|
||||
<span className='thumbnail-title'><a href={this.props.href}>{this.props.title}</a></span>
|
||||
<span className='thumbnail-extra'>{this.props.extra}</span>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
|
|
@ -1,22 +1,22 @@
|
|||
.thumbnail {
|
||||
.thumbnailImage,
|
||||
.thumbnailTitle,
|
||||
.thumbnailExtra {
|
||||
.thumbnail-image,
|
||||
.thumbnail-title,
|
||||
.thumbnail-extra {
|
||||
display: block;
|
||||
}
|
||||
|
||||
.thumbnailImage img {
|
||||
.thumbnail-image img {
|
||||
margin-bottom: 2px;
|
||||
border: 1px solid #ddd;
|
||||
}
|
||||
|
||||
.thumbnailTitle,
|
||||
.thumbnailExtra {
|
||||
.thumbnail-title,
|
||||
.thumbnail-extra {
|
||||
line-height: normal;
|
||||
word-wrap: break-word;
|
||||
}
|
||||
|
||||
.thumbnailTitle {
|
||||
.thumbnail-title {
|
||||
margin-bottom: 1px;
|
||||
text-overflow: ellipsis;
|
||||
overflow: hidden;
|
||||
|
@ -25,9 +25,9 @@
|
|||
font-size: .9230em;
|
||||
}
|
||||
|
||||
.thumbnailExtra {
|
||||
.thumbnail-extra {
|
||||
font-size: .8462em;
|
||||
color: #666;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
|
|
@ -311,4 +311,4 @@
|
|||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
]
|
||||
|
|
Loading…
Reference in a new issue