Skip to content

Commit 244829f

Browse files
committed
Fixed build. I think there may not have been a real problem, it may have been a version issue with a node module. Works now!
1 parent 041f583 commit 244829f

10 files changed

+378
-55
lines changed

Gruntfile.js

+6-28
Original file line numberDiff line numberDiff line change
@@ -53,30 +53,11 @@ module.exports = function(grunt) {
5353
// combine our files into one file, language by language
5454
assemble: {
5555
options: {
56-
layoutdir: './_layouts',
57-
layout: 'main.hbs',
5856
marked: {
59-
gfm: true,
60-
tables: true,
61-
breaks: false,
62-
pedantic: false,
63-
sanitize: false,
64-
smartLists: true,
65-
smartypants: false
66-
// ,
67-
// highlight: function (code, lang) {
68-
// try {
69-
// if (languages[lang]) {
70-
// lang = languages[lang];
71-
// } else {
72-
// return code;
73-
// }
74-
// return hljs.highlight(lang, code).value;
75-
// } catch(e) {
76-
// return hljs.highlightAuto(code).value;
77-
// }
78-
// }
79-
}
57+
sanitize: false
58+
},
59+
flatten : true,
60+
layout: './_layouts/main.hbs'
8061
},
8162
en: {
8263
options : {
@@ -100,12 +81,9 @@ module.exports = function(grunt) {
10081
nglayout: {
10182
options : {
10283
data : 'content/en/build/data.json'
103-
// ,
104-
// partials: ['content/en/*.md']
10584
},
106-
files : {
107-
'nglayout.html' : ['content/en/build/en.hbs']
108-
}
85+
src : 'content/en/build/en.hbs',
86+
dest : 'nglayout.html'
10987
},
11088
},
11189

content/en/build/en.hbs

+6-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11

22
<article>
33

4-
{{#markdown}}
5-
{{md 'content/en/test.md' }}
6-
{{/markdown}}
4+
<section>{{md 'content/en/general.md' }}</section>
5+
<section>{{md 'content/en/html.md' }}</section>
6+
<section>{{md 'content/en/css.md' }}</section>
7+
<section>{{md 'content/en/javascript.md' }}</section>
8+
<section>{{md 'content/en/responsive.md' }}</section>
9+
<section>{{md 'content/en/performance.md' }}</section>
710

811
</article>

content/en/css.md

-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
<section>
21
## CSS
32

43
CSS is where the visual presentation logic of a website belongs. Well-written CSS makes good use of its cascading nature - general styles are applied first, and those styles are overridden for more specific instances as necessary.
@@ -86,5 +85,3 @@ Avoid using the `!important` keyword. Treat it like the nuclear option, only to
8685
### Resources
8786

8887
Further reading on the wiki etc.
89-
90-
</section>

content/en/general.md

-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
<section>
21
# Front-End Code Standards
32

43
## General
@@ -43,4 +42,3 @@ We encourage liberal use of whitespace, comments, and descriptive variable names
4342
### Resources
4443

4544
Further reading on the wiki
46-
</section>

content/en/html.md

-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
<section>
21
## HTML
32

43
HTML markup defines the content of a document and gives it a rudimentary structure such as headers, paragraphs, and lists. It provides a number of semantic constructs that allow automated tools like search engines and screen readers to make sense of the document and to understand relationships between pieces of content. A well-written HTML document will make appropriate use of these semantic elements and leave all responsibility for controlling the presentation of the document to the CSS stylesheet.
@@ -140,4 +139,3 @@ All input fields should be associated with a `<label>` element. The `for` attrib
140139
### Resources
141140
Further information on the wiki...
142141

143-
</section>

content/en/javascript.md

-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
<section>
21
## JavaScript
32

43
### Goals
@@ -57,4 +56,3 @@ Always test for the existence of a browser API, function, or object property bef
5756
### Resources
5857
- Links to wiki, etc.
5958

60-
</section>

content/en/performance.md

-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
<section>
21
## Performance
32

43
### Goals
@@ -14,6 +13,3 @@
1413
...
1514

1615
### Resources
17-
18-
</section>
19-

content/en/responsive.md

-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11

2-
<section>
32
## Responsive Web Design
43

54
(Get notes from nring)
@@ -18,5 +17,3 @@
1817

1918
### Resources
2019
Link to wiki...
21-
22-
</section>

nglayout.html

+339
Large diffs are not rendered by default.

package.json

+27-8
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,35 @@
1212
"bugs": {
1313
"url": "https://github.com/isobar-idev/code-standards/issues"
1414
},
15+
"dependencies": {
16+
"assemble": "~0.4.37"
17+
},
1518
"devDependencies": {
16-
"grunt": "~0.4.1",
17-
"grunt-contrib-concat": "~0.2.0",
18-
"grunt-contrib-compass": "~0.5.0",
19-
"grunt-contrib-watch": "~0.5.1",
20-
"handlebars-helpers": "~0.5.5",
21-
"assemble": "~0.4.33",
19+
"assemble-handlebars": "~0.2.0",
20+
"assemble-yaml": "^0.1.8",
21+
"async": "^0.2.10",
22+
"chai": "^1.8.1",
23+
"frep": "^0.1.8",
24+
"grunt": "^0.4.2",
25+
"grunt-cli": "~0.1.13",
2226
"grunt-contrib-clean": "~0.5.0",
23-
"grunt-contrib-copy": "~0.4.1",
27+
"grunt-contrib-compass": "^0.5.0",
28+
"grunt-contrib-concat": "^0.2.0",
29+
"grunt-contrib-copy": "^0.4.1",
30+
"grunt-contrib-jshint": "^0.7.2",
31+
"grunt-contrib-watch": "^0.5.3",
32+
"grunt-prettify": "~0.3.1",
33+
"grunt-readme": "~0.4.0",
34+
"grunt-release": "^0.6.0",
35+
"grunt-repos": "~0.1.2",
36+
"grunt-sync-pkg": "~0.1.1",
37+
"handlebars-helper-eachitems": "~0.1.2",
38+
"inflection": "^1.2.7",
39+
"lodash": "^1.3.1",
2440
"marked": "^0.3.2",
25-
"pygmentize": "^0.5.3"
41+
"pretty": "~0.1.1",
42+
"resolve-dep": "^0.1.3",
43+
"time-grunt": "^0.1.2",
44+
"underscore.string": "~2.3.3"
2645
}
2746
}

0 commit comments

Comments
 (0)