Skip to content

Commit

Permalink
Merge pull request #1 from pkkummermo/develop
Browse files Browse the repository at this point in the history
Merging develop with master
  • Loading branch information
pkkummermo committed Feb 15, 2015
2 parents e8ae40c + 949f41e commit 6ec58dc
Show file tree
Hide file tree
Showing 51 changed files with 1,146 additions and 0 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
.sass-cache
.idea
node_modules
.sass-cache
.temp
27 changes: 27 additions & 0 deletions .jshintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
{
"node": true,
"esnext": true,
"bitwise": true,
"camelcase": false,
"curly": true,
"eqeqeq": true,
"immed": true,
"indent": 4,
"latedef": true,
"newcap": true,
"noarg": true,
"quotmark": "single",
"undef": true,
"unused": true,
"strict": true,
"trailing": true,
"smarttabs": true,
"white": true,
"globals": {
"define": true,
"module": true,
"require": true,
"requirejs": true,
"window": true
}
}
139 changes: 139 additions & 0 deletions .scss-lint.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,139 @@
# scss-lint configuration
linters:
BorderZero:
enabled: true

CapitalizationInSelector:
enabled: true

ColorKeyword:
enabled: true

Comment:
enabled: true

DebugStatement:
enabled: true

DeclarationOrder:
enabled: true

DuplicateProperty:
enabled: true

ElsePlacement:
enabled: true
style: same_line # or 'new_line'

EmptyLineBetweenBlocks:
enabled: true
ignore_single_line_blocks: true

EmptyRule:
enabled: true

FinalNewline:
enabled: true
present: true

HexLength:
enabled: true
style: short # or 'long'

HexNotation:
enabled: true
style: lowercase # or 'uppercase'

HexValidation:
enabled: true

IdWithExtraneousSelector:
enabled: true

Indentation:
enabled: true
character: space # or 'tab'
width: 2

LeadingZero:
enabled: true
style: exclude_zero # or 'include_zero'

MergeableSelector:
enabled: true
force_nesting: true

NameFormat:
enabled: true
convention: hyphenated_lowercase # or 'BEM', or a regex pattern

PlaceholderInExtend:
enabled: true

PropertySortOrder:
enabled: true
ignore_unspecified: false

PropertySpelling:
enabled: true
extra_properties: []

SelectorDepth:
enabled: true
max_depth: 3

Shorthand:
enabled: true

SingleLinePerProperty:
enabled: true
allow_single_line_rule_sets: true

SingleLinePerSelector:
enabled: true

SpaceAfterComma:
enabled: true

SpaceAfterPropertyColon:
enabled: true
style: one_space # or 'no_space', or 'at_least_one_space', or 'aligned'

SpaceAfterPropertyName:
enabled: true

SpaceBeforeBrace:
enabled: true
allow_single_line_padding: false

SpaceBetweenParens:
enabled: true
spaces: 0

StringQuotes:
enabled: true
style: single_quotes # or double_quotes

TrailingSemicolon:
enabled: false

TrailingZero:
enabled: false

UnnecessaryMantissa:
enabled: true

UnnecessaryParentReference:
enabled: true

UrlFormat:
enabled: true

UrlQuotes:
enabled: true

ZeroUnit:
enabled: true

Compass::*:
enabled: true
68 changes: 68 additions & 0 deletions Gruntfile.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
/*global module,require */
module.exports = function (grunt) {
'use strict';
require('time-grunt')(grunt);
require('load-grunt-tasks')(grunt);

grunt.initConfig({
pkg: grunt.file.readJSON('package.json'),
paths: {
app: 'app',
css: 'css',
sass: 'sass',
build: 'dist',
temp: '.temp',
test: 'test',
images: 'images',
bower: 'lib',
fonts: 'fonts',
example: 'example',
gruntConfig: 'gruntconfig/'
},
jshint: {
options: require('./gruntconfig/jshint_options'),
prod: require('./gruntconfig/jshint_prod.js')
},
clean: require('./gruntconfig/clean.js'),
compass: {
options: require('./gruntconfig/compass_options.js'),
dev: require('./gruntconfig/compass_dev.js'),
prod: require('./gruntconfig/compass_prod.js')
},
watch: require('./gruntconfig/watch.js'),
copy: require('./gruntconfig/copy.js'),
concurrent: require('./gruntconfig/concurrent.js'),
scsslint: require('./gruntconfig/scsslint.js'),
autoprefixer: require('./gruntconfig/autoprefixer.js'),
connect: require('./gruntconfig/connect.js')
});

// Define tasks.
grunt.registerTask('default', [
'build'
]);
grunt.registerTask('build', [
'clean:release',
'concurrent:buildRelease'
]);
grunt.registerTask('serve', [
'clean:temp',
'concurrent:buildDev',
'autoprefixer:watch',
'connect:livereload',
'concurrent:watchDev'
]);
grunt.registerTask('serve-build', [
'build',
'connect:release:keepalive'
]);
grunt.registerTask('test', [
'jshint:prod',
'scsslint'
]);
grunt.registerTask('test-dev', [
'serve',
'jshint',
'watch:test'
]);
};
23 changes: 23 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,2 +1,25 @@
independent-sass-material-design
================================

Simple package used for quickly getting up to speed to Googles Material Design. Primary goal is to supply simple functions to enhance already existing SASS code with basics such as colors, animations and simple elements.

#Requirements
You'll need the following for this package to work

- Ruby with Sass (>= 3.4.12) and Compass installed (>v1.0.3)

Optional (and recommended)

- Sass-lint (>=0.33.0)

#How-to
This project is using grunt, so if you're used to it you're good to go. Otherwise header over to http://gruntjs.com/getting-started to get your grunt fix.

- npm install
- grunt

#Possible improvements
- Awesome demo-page to show how easy (it should be) it is to use the collection
- Complete elements
- Complete list of ratios/paddings/margins and the lot
- Generated default css-file (this is what I want to avoid, but if it's needed it's needed)
27 changes: 27 additions & 0 deletions bower.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
{
"name": "compass-sass-material-design",
"version": "0.0.1",
"homepage": "https://github.com/pkkummermo/compass-sass-material-design",
"authors": [
"Per Kristian Kummermo <per.kristian@kummermo.com>"
],
"main": [
"./dist/**"
],
"description": "Collection of Googles Material Design in a sassy world with a dash of compass",
"keywords": [
"compass",
"material-design",
"sass",
"material",
"design"
],
"license": "MIT",
"ignore": [
"**/.*",
"node_modules",
"bower_components",
"test",
"tests"
]
}
23 changes: 23 additions & 0 deletions example/ex.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
@import '../sass/md-core-with-components';

.page {
margin: 20px auto;
width: 960px;
}

.example-container {
width: 100%;
}

.my-simple-square-box {
@extend %no-select;
@include inline-block;
height: 250px;
margin: 20px;
padding: 20px;
width: 250px;

&:first-child {
margin-left: 0;
}
}
Binary file added fonts/Roboto-Black.ttf
Binary file not shown.
Binary file added fonts/Roboto-BlackItalic.ttf
Binary file not shown.
Binary file added fonts/Roboto-Bold.ttf
Binary file not shown.
Binary file added fonts/Roboto-BoldItalic.ttf
Binary file not shown.
Binary file added fonts/Roboto-Italic.ttf
Binary file not shown.
Binary file added fonts/Roboto-Light.ttf
Binary file not shown.
Binary file added fonts/Roboto-LightItalic.ttf
Binary file not shown.
Binary file added fonts/Roboto-Medium.ttf
Binary file not shown.
Binary file added fonts/Roboto-MediumItalic.ttf
Binary file not shown.
Binary file added fonts/Roboto-Regular.ttf
Binary file not shown.
Binary file added fonts/Roboto-Thin.ttf
Binary file not shown.
Binary file added fonts/Roboto-ThinItalic.ttf
Binary file not shown.
Binary file added fonts/RobotoCondensed-Bold.ttf
Binary file not shown.
Binary file added fonts/RobotoCondensed-BoldItalic.ttf
Binary file not shown.
Binary file added fonts/RobotoCondensed-Italic.ttf
Binary file not shown.
Binary file added fonts/RobotoCondensed-Light.ttf
Binary file not shown.
Binary file added fonts/RobotoCondensed-LightItalic.ttf
Binary file not shown.
Binary file added fonts/RobotoCondensed-Regular.ttf
Binary file not shown.
21 changes: 21 additions & 0 deletions gruntconfig/autoprefixer.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
module.exports = {
options: {
browsers: ['last 1 version']
},
release: {
files: [{
expand: true,
cwd: '<%= paths.build %>/<%= paths.css %>/',
src: '*.css',
dest: '<%= paths.build %>/<%= paths.css %>/'
}]
},
watch: {
files: [{
expand: true,
cwd: '<%= paths.temp %>/<%= paths.css %>/',
src: '*.css',
dest: '<%= paths.temp %>/<%= paths.css %>/'
}]
}
};
23 changes: 23 additions & 0 deletions gruntconfig/clean.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
module.exports = {
release: {
files: [{
dot: true,
src: [
'<%= paths.temp %>/',
'<%= paths.build %>/*',
'!<%= paths.build %>/.git*'
]
}]
},
temp: '<%= paths.temp %>/',
css: {
src: [
'<%= paths.css %>/*.css',
'<%= paths.css %>/!vendor/**/*.css'
],
filter: 'isFile'
},
sass: {
src: ['.sass-cache']
}
};
11 changes: 11 additions & 0 deletions gruntconfig/compass_dev.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
module.exports = {
options: {
sourcemap: true,
environment: 'develop',
sassDir: '<%= paths.example %>/',
cssDir: '<%= paths.temp %>/<%= paths.css %>/',
fontDir: '<%= paths.fonts %>',
noLineComments: true,
force: true
}
};
13 changes: 13 additions & 0 deletions gruntconfig/compass_options.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
module.exports = {
force: true,
relativeAssets: true,
basePath: '.',
cssDir: '<%= paths.css %>',
sassDir: '<%= paths.sass %>',
fontsDir: '<%= paths.fonts %>',
imagesDir: '<%= paths.images %>',
generatedImagesDir: '<%= paths.build %>/sprites'
//importPath: ['<%= paths.assets %>/sass'],
//spriteLoadPath: ['<%= paths.assets %>/images'],
//httpImagesPath: '<%= paths.assets %>/images'
};
Loading

0 comments on commit 6ec58dc

Please sign in to comment.