diff --git a/app/app/models/page.js b/app/app/models/page.js index 05929db3..a4e88fac 100644 --- a/app/app/models/page.js +++ b/app/app/models/page.js @@ -26,10 +26,9 @@ export default Model.extend({ body: attr('string'), rawBody: attr('string'), meta: attr(), - // meta: hasMany('page-meta'), tagName: Ember.computed('level', function () { - return "h" + this.get('level'); + return "h" + (this.get('level') + 1); }), tocIndent: Ember.computed('level', function () { @@ -42,4 +41,4 @@ export default Model.extend({ }), created: attr(), revised: attr() -}); \ No newline at end of file +}); diff --git a/app/app/styles/font.scss b/app/app/styles/font.scss index 6fe7be35..79ba89ac 100644 --- a/app/app/styles/font.scss +++ b/app/app/styles/font.scss @@ -33,6 +33,7 @@ $font-regular: 'open_sansregular'; $font-semibold: 'open_sanssemibold'; $font-light: 'open_sanslight'; + @font-face { font-family: "Material Icons"; font-style: normal; diff --git a/app/app/styles/view/document/wysiwyg.scss b/app/app/styles/view/document/wysiwyg.scss index 9d6ff419..e34b58d3 100644 --- a/app/app/styles/view/document/wysiwyg.scss +++ b/app/app/styles/view/document/wysiwyg.scss @@ -39,48 +39,48 @@ b { - font-family: "open_sanssemibold"; + font-family: $font-semibold; } - h1.doc-name { + h1 { font-size: 2em; - font-family: open_sansregular; + font-family: $font-semibold; } - h1 - { - font-size: 1.6em; - font-family: open_sanslight; - color:$color-off-black; - margin: 0 0 20px 0; - } + // h1 + // { + // font-size: 1.6em; + // font-family: open_sanslight; + // color:$color-off-black; + // margin: 0 0 20px 0; + // } h2 { - font-size: 1.5em; + font-size: 1.7em; margin: 30px 0 20px 0; - font-family: open_sanslight; + font-family: $font-regular; } h3 { - font-size: 1.4rem; + font-size: 1.5rem; margin: 30px 0 20px 0; - font-family: open_sanslight; + font-family: $font-regular; } h4 { font-size: 1.3rem; margin: 30px 0 20px 0; - font-family: open_sanslight; + font-family: $font-regular; } h5, h6, h7, h8, h9 { - font-size: 1.2rem; + font-size: 1.3rem; margin: 30px 0 20px 0; - font-family: open_sanslight; + font-family: $font-regular; } h2, h3, h4, h5, h6, h7, h8, h9 @@ -88,7 +88,7 @@ .page-title { color:$color-off-black; - font-family: open_sansregular; + font-family: $font-regular; } }