Skip to content

Commit 8c56d33

Browse files
author
DNZ\darius
committed
Merge branch 'hotfix/Dist_folder_missing' into develop
2 parents 7713f08 + 21dd417 commit 8c56d33

File tree

7 files changed

+14
-35
lines changed

7 files changed

+14
-35
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
*.log
22
thumbs.db
33

4-
node_modules
4+
node_modules

Gruntfile.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ module.exports = function(grunt) {
2929
// Rewrite and save sourcemap as seperate file
3030
map: {
3131
inline: false,
32-
annotation: 'styles/'
32+
annotation: 'dist/css/'
3333
},
3434
processors: [
3535
// Add fallbacks for rem units

README.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,10 @@ Use this Boilerplate to get started with your project right away!
1414
## Get started
1515
1. Clone ```git clone https://github.com/CastleCSS/castlecss.git``` or [download](https://github.com/CastleCSS/castlecss-boilerplate/archive/master.zip) CastleCSS Boilerplate.
1616
2. Set up your project directory and a basic site structure.
17-
3. Run Grunt from your directory by typing ```Grunt``` in the commandline. If you haven't used Grunt before, be sure to check out the Getting Started guide.
18-
4. Add some content, do some styling and include functionality.
19-
5. Run your site locally and see how it all works out!
17+
3. From your directory, open a commandline and download the required packages by typing ```npm install```.
18+
4. Run Grunt from your directory by typing ```Grunt``` in the commandline. If you haven't used Grunt before, be sure to check out the [Getting Started guide](http://gruntjs.com/getting-started).
19+
5. Add some content, do some styling and include functionality.
20+
6. Run your site locally and see how it all works out!
2021

2122
## Basic structure
2223
The basis structure for your website should look similar like this:

dist/css/styles.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/css/styles.min.css.map

Lines changed: 1 addition & 23 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
{
2-
"name": "castlecss",
2+
"name": "castlecss-boilerplate",
33
"version": "1.0.0",
4-
"description": "CastleCSS is a modulular, mobile first, upgradable SCSS framework",
4+
"description": "Boilerplate for CastleCSS",
55
"main": "index.js",
66
"scripts": {
77
"test": "echo \"Error: no test specified\" && exit 1"
88
},
99
"repository": {
1010
"type": "git",
11-
"url": "git+https://github.com/CastleCSS/castlecss.git"
11+
"url": "git+https://github.com/CastleCSS/castlecss-boilerplate.git"
1212
},
1313
"keywords": [
14+
"boilerplate",
1415
"castlecss",
1516
"castle",
1617
"css",
@@ -23,12 +24,12 @@
2324
"author": "Darius Rosendahl <darius@denieuwezaak.nl> (http://www.castlecss.com)",
2425
"license": "MIT",
2526
"bugs": {
26-
"url": "https://github.com/CastleCSS/castlecss/issues"
27+
"url": "https://github.com/CastleCSS/castlecss-boilerplate/issues"
2728
},
2829
"homepage": "http://www.castlecss.com",
2930
"dependencies": {
3031
"castlecss-buttons": "^0.4.1",
31-
"castlecss-core": "^1.7.3",
32+
"castlecss-core": "^2.0.1",
3233
"castlecss-notifications": "^0.3.0"
3334
},
3435
"devDependencies": {

styles/styles.min.css.map

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)