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.

Sign up for GitHub

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

Sync upstream repo kristoferjoseph/flexboxgrid #5

Merged
merged 15 commits into from
Aug 31, 2015
Merged

Sync upstream repo kristoferjoseph/flexboxgrid #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
c9b0ce4
Deleted unnecesary styles from offset columns
gotbahn May 31, 2015
6931539
Merge pull request #79 from godban/offset-columns
kristoferjoseph Jun 1, 2015
d47b7f7
Updates breakpoints
kristoferjoseph May 23, 2015
76fde52
Fixes #86
kristoferjoseph Jun 17, 2015
774cc72
Add margins to .container class to match bootstrap behavior
stephen Jun 18, 2015
5c7015b
Merge pull request #87 from stephen/container-margins
kristoferjoseph Jun 18, 2015
65d73b0
adding a sketch template to allow for easy design using flexboxgrid
Jun 18, 2015
ff0f032
Merge pull request #88 from nnnnic/design
kristoferjoseph Jun 18, 2015
ae5a967
change directory structure
gronke Aug 5, 2015
c158a9d
bower ignores demo assets
gronke Aug 5, 2015
0e84a10
increase semver MAJOR version
gronke Aug 6, 2015
e392b48
Merge branch 'master' of https://github.com/hugeinc/flexboxgrid-sass
gronke Aug 14, 2015
51dc808
Merge remote-tracking branch 'upstream/master'
gronke Aug 14, 2015
5f9ad3c
remove gulp-postcss plugin
gronke Aug 14, 2015
85e94ec
apply changes from upstream repo kristoferjoseph/flexboxgrid
gronke Aug 14, 2015
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
7 changes: 1 addition & 6 deletions Gulpfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,6 @@ gulp.task('styles:demo', function () {
includePaths: ['.', 'bower_components'],
onError: console.error.bind(console, 'Sass error:')
}))
.pipe($.postcss([
require('autoprefixer-core')({browsers: ['last 1 version']})
]))
.pipe($.sourcemaps.write())
.pipe(gulp.dest('demo'));
});
Expand All @@ -47,9 +44,6 @@ gulp.task('styles:dist', function () {
includePaths: ['.', 'bower_components'],
onError: console.error.bind(console, 'Sass error:')
}))
.pipe($.postcss([
require('autoprefixer-core')({browsers: ['last 1 version']})
]))
.pipe($.sourcemaps.write())
.pipe(gulp.dest('dist'));
});
Expand All @@ -60,6 +54,7 @@ gulp.task('watch', ['jade:demo', 'styles:demo', 'styles:dist'], function () {
// watch for changes
gulp.watch('demo/*.jade', ['jade:demo']);
gulp.watch('*.scss', ['styles:dist']);
gulp.watch('bower_components/**/*.scss', ['styles:dist']);
gulp.watch('demo/sass/*.scss', ['styles:demo']);
gulp.watch('bower.json', ['wiredep']);
});
Expand Down
75 changes: 55 additions & 20 deletions demo/demo.css
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion demo/sass/demo.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ body {
}

.box, .box-first, .box-large, .box-nested, .box-row {
padding: 0.5rem;
padding: 1rem;
}

.box-row {
Expand Down
Loading