Skip to content

Commit

Permalink
Merge branch 'master' into greenkeeper-input-plugin-password-0.1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Snugug committed Jul 19, 2016
2 parents f0fa9c6 + 5a2fc01 commit f428b6c
Show file tree
Hide file tree
Showing 38 changed files with 1,372 additions and 210 deletions.
7 changes: 4 additions & 3 deletions .github/ISSUE_TEMPLATE.md
Expand Up @@ -8,10 +8,11 @@ Feature: {{feature}}
Scenario: {{scenario}}
Given {{thing}}
When {{action}}
Then {{result}}
When {{action}}
Then {{result}}
```

---

- [ ] {{feature}}/{{scenario}}
**{{feature}}**
- [ ] {{scenario}}
11 changes: 9 additions & 2 deletions .sass-lint.yml
Expand Up @@ -36,7 +36,10 @@ rules:
no-transition-all: 2
no-universal-selectors: 0
no-url-protocols: 2
no-vendor-prefixes: 2
no-vendor-prefixes:
- 2
-
ignore-non-standard: true
no-warn: 1
property-units: 0

Expand Down Expand Up @@ -88,7 +91,11 @@ rules:
hex-notation: 2
indentation: 2
leading-zero: 2
nesting-depth: 2
# TODO: Revert to 2 once https://github.com/sasstools/sass-lint/pull/677 lands
nesting-depth:
- 2
-
max-depth: 3
property-sort-order: 2
pseudo-element: 2
quotes: 2
Expand Down
Binary file added favicon.ico
Binary file not shown.
3 changes: 3 additions & 0 deletions lib/routes.js
Expand Up @@ -5,13 +5,16 @@ const content = require('./routes/content');
const login = require('./routes/login');
const users = require('./routes/users');
const errors = require('./routes/errors');
const styles = require('./routes/styles');


module.exports = application => {
return index(application).then(app => {
return login(app);
}).then(app => {
return users(app);
}).then(app => {
return styles(app);
}).then(app => {
return content(app);
}).then(app => {
Expand Down
27 changes: 27 additions & 0 deletions lib/routes/styles.js
@@ -0,0 +1,27 @@
'use strict';

/*
* Styles Route Handling
* @description Adds index routing to an Express app
*
* @param {object} application - Express Application
* @returns {object} - Configured Express Application
*/
const styles = application => {
return new Promise(resolve => {
const app = application;

/*
* Home Page Router
* @function
* @name /
*/
app.get('/styles', (req, res) => {
res.render('styles', { pageTitle: 'Styles Page' });
});

resolve(app);
});
};

module.exports = styles;
1 change: 1 addition & 0 deletions package.json
Expand Up @@ -82,6 +82,7 @@
"input-plugin-text": "0.0.5",
"jsdom": "^9.2.0",
"mock-express-response": "^0.1.2",
"modularscale-sass": "^2.1.1",
"nyc": "^6.6.1",
"punchcard-commit-msg": "^1.0.0",
"punchcard-runner": "^2.1.2",
Expand Down
1 change: 1 addition & 0 deletions src/images/punchcard-404.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/images/punchcard-type.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 6 additions & 1 deletion src/sass/_punchcard.scss
Expand Up @@ -4,24 +4,29 @@
@import 'toolkit';
@import 'breakpoint';
@import 'ibm-colors';
@import 'modular-scale';
////////////////////////

//////////////////////////////
// GLOBALS
@import 'partials/global/variables';
@import 'partials/global/functions';
@import 'partials/global/mixins';
@import 'partials/global/extends';
//////////////////////////////

//////////////////////////////
// BASE
@import 'partials/base/base';
@import 'partials/base/content';
//////////////////////////////

//////////////////////////////
// COMPONENTS
@import 'partials/components/404';
@import 'partials/components/forms';
@import 'partials/components/introduction';
@import 'partials/components/nav';
@import 'partials/components/siteheader';
//////////////////////////////

//////////////////////////////
Expand Down

0 comments on commit f428b6c

Please sign in to comment.