Skip to content
This repository has been archived by the owner on Nov 14, 2018. It is now read-only.

Commit

Permalink
Merge pull request #126 from openjck/add-stylus
Browse files Browse the repository at this point in the history
Fix #121: Add Stylus
  • Loading branch information
groovecoder committed Mar 22, 2016
2 parents c904817 + b078456 commit 88cbc35
Show file tree
Hide file tree
Showing 12 changed files with 52 additions and 11 deletions.
35 changes: 35 additions & 0 deletions .stylintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
{
"blocks": false,
"brackets": "always",
"colons": "always",
"colors": false,
"commaSpace": "always",
"commentSpace": "always",
"cssLiteral": "never",
"depthLimit": false,
"duplicates": true,
"efficient": "always",
"extendPref": "@extend",
"globalDupe": true,
"indentPref": 4,
"leadingZero": "never",
"maxErrors": false,
"maxWarnings": false,
"mixed": false,
"namingConvention": "lowercase-dash",
"namingConventionStrict": true,
"none": "always",
"noImportant": true,
"parenSpace": "never",
"placeholders": "always",
"prefixVarsWithDollar": "always",
"quotePref": false,
"semicolons": "always",
"sortOrder": "alphabetical",
"stackedProperties": "never",
"trailingWhitespace": "never",
"universal": false,
"valid": true,
"zeroUnits": "never",
"zIndexNormalize": false
}
19 changes: 11 additions & 8 deletions dashboard/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -158,26 +158,29 @@ def path(*parts):
# django-pipeline
DISABLE_WRAPPER = True
PIPELINE = {
'COMPILERS': (
'pipeline.compilers.stylus.StylusCompiler',
),
'STYLESHEETS': {
'dashboard': {
'source_filenames': (
# Global
'css/main.css',
'css/elements.css',
'css/forms.css',
'css/navigation.css',
'styles/main.styl',
'styles/elements.styl',
'styles/forms.styl',
'styles/navigation.styl',

# Login page
'css/login.css',
'styles/login.styl',

# Push applicaton landing page
'css/landing.css',
'styles/landing.styl',

# Push application listing page
'css/list.css',
'styles/list.styl',

# Push application details page
'css/details.css',
'styles/details.styl',
),
'output_filename': 'css/dashboard.css',
},
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 2 additions & 0 deletions docs/development.rst
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ Install Locally
#. `Install requirements`_::

pip install -r requirements-dev.txt
npm install
npm link stylus yuglify

#. Source the ``.env`` file to set environment config vars (Can also use `autoenv`_)::

Expand Down
7 changes: 4 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
{
"scripts": {
"test": "eslint --ignore-pattern 'staticfiles/**/*.js' --ignore-pattern 'env/**/*.js' .; csslint --quiet --exclude-list='node_modules,staticfiles,env' --warnings=' ' ."
"test": "eslint --ignore-pattern 'staticfiles/**/*.js' --ignore-pattern 'env/**/*.js' .; stylint **/static/styles/*.styl"
},
"dependencies": {
"stylus": "^0.54.2",
"yuglify": "^0.1.4"
},
"devDependencies": {
"csslint": "^0.10.0",
"eslint": "^2.3.0"
"eslint": "^2.3.0",
"stylint": "^1.3.6"
}
}
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit 88cbc35

Please sign in to comment.