Skip to content

Commit

Permalink
Merge pull request #21 from e-sites/hotfix/supple-includes-fix
Browse files Browse the repository at this point in the history
Hotfix/supple includes fix
  • Loading branch information
remcotak authored Jul 3, 2020
2 parents ce9bdbe + 9cca626 commit ecc6f9e
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 4 deletions.
9 changes: 8 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
# generator-esites-fe

Yeoman generator for E-sites projects

## Features

- Asset management with [webpack](https://webpack.js.org/)
- [ITCSS](https://www.creativebloq.com/web-design/manage-large-css-projects-itcss-101517528) CSS architecture
- Compile Sass with [libsass](http://libsass.org)
Expand All @@ -13,6 +15,7 @@ Yeoman generator for E-sites projects
- SVG polyfill to enable external SVG's in IE10/IE11 with [svgxuse](https://github.com/Keyamoon/svgxuse)

## Prerequisites

Make sure Node and npm are installed. A great guide can be found here: [https://docs.npmjs.com/getting-started/installing-node](https://docs.npmjs.com/getting-started/installing-node)

First you need to install [Yeoman](http://yeoman.io/):
Expand All @@ -22,26 +25,30 @@ npm install -g yo
```

After that you'll need to install the generator:

```bash
npm install -g @e-sites/generator-esites-fe
```

If you already have these packages installed, you can upgrade them:

```bash
npm update -g yo @e-sites/generator-esites-fe
```

**Note**: Mac users need to run above commands with `sudo`.

## Usage

Please make sure your system meets the [prerequisites](#prerequisites).

- Run `npm update -g @e-sites/generator-esites-fe`.
- From the terminal, navigate to your projects directory.
- Type `yo esites-fe`, answer a few questions about your project, and wait.
- Type `yo @e-sites/esites-fe`, answer a few questions about your project, and wait.
- Bask in the glory of your fully scaffolded frontend installation.

## Options

- `--skip-install`
Skips the automatic execution of `npm` after scaffolding has finished.

Expand Down
2 changes: 1 addition & 1 deletion app/templates/_source/css/admin.scss
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ $supple-font-size: 10px;
Ground zero styles (normalize.css, box-sizing, resets).
========================================================================= */

@import 'supple/lib/generic/normalize';
@import "normalize";
@import 'supple/lib/generic/reset';


Expand Down
2 changes: 1 addition & 1 deletion app/templates/_source/css/app.scss
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
Ground zero styles (normalize.css, box-sizing, resets).
========================================================================= */

@import 'supple/lib/generic/normalize';
@import 'normalize';
@import 'supple/lib/generic/reset';

/* =========================================================================
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@e-sites/generator-esites-fe",
"version": "3.1.2",
"version": "3.1.3",
"description": "Yeoman generator for E-sites frontend",
"main": "index.js",
"scripts": {
Expand Down

0 comments on commit ecc6f9e

Please sign in to comment.