Skip to content

Commit

Permalink
Merge branch 'release/v1.3.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
cjpatoilo committed Jan 26, 2017
2 parents c1d5a80 + dbbb625 commit 7a1c78f
Show file tree
Hide file tree
Showing 56 changed files with 5,340 additions and 269 deletions.
12 changes: 1 addition & 11 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -1,13 +1,3 @@
{
"parserOptions": {
"ecmaVersion": 6,
"sourceType": "module",
"ecmaFeatures": {
"jsx": true
}
},
"rules": {
"semi": 2,
"quotes": ["error", "single"]
}
"extends": "styled"
}
16 changes: 0 additions & 16 deletions .npmignore

This file was deleted.

44 changes: 28 additions & 16 deletions backstop.conf.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,20 @@
module.exports = {
viewports: [
{ name: 'phone', width: 320, height: 480 },
{ name: 'laptop', width: 1280, height: 800 }
],
'use strict'
const config = {
viewports: [{
name: 'phone',
width: 320,
height: 480
}, {
name: 'laptop',
width: 1280,
height: 800
}],
scenarios: [{
label: 'Typography',
url: 'http://localhost:3000',
hideSelectors: [],
removeSelectors: [],
selectors: ['#typography'],
selectors: ['#typography .example'],
readyEvent: null,
delay: 500,
misMatchThreshold: 0.1,
Expand All @@ -19,7 +25,7 @@ module.exports = {
url: 'http://localhost:3000',
hideSelectors: [],
removeSelectors: [],
selectors: ['#blockquotes'],
selectors: ['#blockquotes .example'],
readyEvent: null,
delay: 500,
misMatchThreshold: 0.1,
Expand All @@ -30,7 +36,7 @@ module.exports = {
url: 'http://localhost:3000',
hideSelectors: [],
removeSelectors: [],
selectors: ['#buttons'],
selectors: ['#buttons .example'],
readyEvent: null,
delay: 500,
misMatchThreshold: 0.1,
Expand All @@ -41,7 +47,7 @@ module.exports = {
url: 'http://localhost:3000',
hideSelectors: [],
removeSelectors: [],
selectors: ['#lists'],
selectors: ['#lists .example'],
readyEvent: null,
delay: 500,
misMatchThreshold: 0.1,
Expand All @@ -52,7 +58,7 @@ module.exports = {
url: 'http://localhost:3000',
hideSelectors: [],
removeSelectors: [],
selectors: ['#forms'],
selectors: ['#forms .example'],
readyEvent: null,
delay: 500,
misMatchThreshold: 0.1,
Expand All @@ -63,7 +69,7 @@ module.exports = {
url: 'http://localhost:3000',
hideSelectors: [],
removeSelectors: [],
selectors: ['#tables'],
selectors: ['#tables .example'],
readyEvent: null,
delay: 500,
misMatchThreshold: 0.1,
Expand All @@ -74,7 +80,7 @@ module.exports = {
url: 'http://localhost:3000',
hideSelectors: [],
removeSelectors: [],
selectors: ['#grids'],
selectors: ['#grids .example'],
readyEvent: null,
delay: 500,
misMatchThreshold: 0.1,
Expand All @@ -85,7 +91,7 @@ module.exports = {
url: 'http://localhost:3000',
hideSelectors: [],
removeSelectors: [],
selectors: ['#codes'],
selectors: ['#codes .example'],
readyEvent: null,
delay: 500,
misMatchThreshold: 0.1,
Expand All @@ -96,7 +102,7 @@ module.exports = {
url: 'http://localhost:3000',
hideSelectors: [],
removeSelectors: [],
selectors: ['#utilities'],
selectors: ['#utilities .example'],
readyEvent: null,
delay: 500,
misMatchThreshold: 0.1,
Expand All @@ -111,8 +117,14 @@ module.exports = {
ci_report: 'node_modules/backstopjs/.tmp/ci_report'
},
engine: 'phantomjs',
report: ['browser', 'CLI', 'CI'],
report: [
'browser',
'CLI',
'CI'
],
casperFlags: [],
debug: false,
port: 3002
};
}

module.exports = config
4 changes: 2 additions & 2 deletions bower.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"name": "milligram",
"version": "1.2.4",
"version": "1.3.0",
"description": "A minimalist CSS framework.",
"homepage": "http://milligram.github.io",
"homepage": "https://milligram.github.io",
"repository": "milligram/milligram",
"license": "MIT",
"author": "CJ Patoilo <[email protected]>",
Expand Down
4 changes: 2 additions & 2 deletions changelog.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Changelog

Milligram uses [GitHub's Releases feature](https://github.com/blog/1547-release-your-software) for its changelogs.
**Milligram** uses [GitHub's Releases feature](https://github.com/blog/1547-release-your-software) for its changelogs.

See our [releases](https://github.com/milligram/milligram/releases) to accompany at the improvements for each version of Milligram.
See our [releases](https://github.com/milligram/milligram/releases) to accompany at the improvements for each version of **Milligram**.
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"name": "milligram/milligram",
"version": "1.2.4",
"version": "1.3.0",
"description": "A minimalist CSS framework.",
"homepage": "http://milligram.github.io",
"homepage": "https://milligram.github.io",
"repository": "milligram/milligram",
"license": "MIT",
"author": "CJ Patoilo <[email protected]>",
Expand Down
36 changes: 8 additions & 28 deletions dist/milligram.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/milligram.css.map

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions dist/milligram.min.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/milligram.min.css.map

Large diffs are not rendered by default.

Loading

0 comments on commit 7a1c78f

Please sign in to comment.