Skip to content
This repository has been archived by the owner on Mar 5, 2020. It is now read-only.

Commit

Permalink
Get rid of the vendor directory, part 1
Browse files Browse the repository at this point in the history
(first TODO in #246)
  • Loading branch information
gesa committed Mar 12, 2015
1 parent 66e4bc4 commit f792847
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 17 deletions.
1 change: 0 additions & 1 deletion components/blockquote.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ var Blockquote = React.createClass({
return (
<blockquote className={this.props.className}>
<figure>
<img src={this.props.imgSrc} alt={this.props.imgAlt} width="148" />
<ImageTag src1x={this.props.imgSrc} src2x={this.props.imgSrc2x || this.props.imgSrc}
alt={this.props.imgAlt} width={this.props.imgWidth || 148} />
</figure>
Expand Down
6 changes: 6 additions & 0 deletions gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ var sitemap = require('gulp-sitemap');
var beautify = require('gulp-jsbeautify');
var jscs = require('gulp-jscs');
var jshint = require('gulp-jshint');
var autoprefixer = require('gulp-autoprefixer');

require('node-jsx').install();

Expand Down Expand Up @@ -97,6 +98,11 @@ gulp.task('less', function() {
.pipe(less({
paths: [path.join(__dirname, 'less')]
}))
.pipe(autoprefixer({
browsers: ['last 2 versions'],
cascade: false,
remove: true
}))
.pipe(sourcemaps.write('./'))
.pipe(gulp.dest('./dist'));
});
Expand Down
26 changes: 13 additions & 13 deletions less/styles.less
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,14 @@ body {

@media (min-width: @screen-md-min) {
.page.container-fluid {
display: flex;
flex-direction: column;
min-height: 100vh;
.flex-block();
.flex-direction(column);
}

.page.container-fluid > .row {
.flex-grow(1);
.flex-block();
display: flex;
flex-grow:1;
}

.hero-unit {
Expand All @@ -56,10 +56,10 @@ body {
background-size: cover;
height: 45rem;
color: white;
display: flex;
flex-direction: column;
justify-content:center;
text-align: center;
.flex-block();
.flex-direction(column);
.justify-content(center);
}

h1 {
Expand Down Expand Up @@ -316,8 +316,8 @@ img.img-scale-to-fit.img-circle {
font-size: 3rem;

@media (min-width: @screen-sm-min) {
.flex-block();
.align-items(center);
align-items: center;
display: flex;
}
}

Expand Down Expand Up @@ -362,8 +362,8 @@ blockquote {

@media (min-width: @screen-sm-min) {
.row {
.flex-block();
.align-items(stretch);
align-items: stretch;
display: flex;
}
}

Expand Down Expand Up @@ -392,8 +392,8 @@ footer {
.sidebar {
line-height: 4rem;
@media (min-width: @screen-md-min) {
.flex-block();
.align-items(flex-end);
align-items: flex-end;
display: flex;
}
}

Expand Down
7 changes: 4 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@
"dependencies": {
"es5-shim": "^4.1.0",
"gulp": "^3.8.11",
"gulp-jsbeautify": "^0.1.1",
"gulp-autoprefixer": "^2.1.0",
"gulp-gzip": "^1.0.0",
"gulp-jsbeautify": "^0.1.1",
"gulp-jscs": "^1.4.0",
"gulp-jshint": "^1.9.2",
"gulp-less": "^3.0.1",
Expand All @@ -19,8 +20,8 @@
"gulp-webpack": "^1.2.0",
"gulp-webserver": "^0.9.0",
"imports-loader": "^0.6.3",
"jsx-loader": "^0.12.2",
"json-loader": "^0.5.1",
"jsx-loader": "^0.12.2",
"mapbox.js": "^2.1.5",
"merge-stream": "^0.1.7",
"mocha": "^2.1.0",
Expand All @@ -32,9 +33,9 @@
"react-a11y": "0.0.6",
"react-router": "^0.12.4",
"should": "^5.1.0",
"sinon": "git://github.com/cjohansen/Sinon.JS#b672042043517b9f84e14ed0fb8265126168778a",
"underscore": "^1.8.2",
"vinyl": "^0.4.6",
"sinon": "git://github.com/cjohansen/Sinon.JS#b672042043517b9f84e14ed0fb8265126168778a",
"webpack": "^1.6.0"
},
"devDependencies": {},
Expand Down

0 comments on commit f792847

Please sign in to comment.