diff --git a/app.js b/app.js index b05be58..9311b83 100644 --- a/app.js +++ b/app.js @@ -15,6 +15,7 @@ let apos = require('apostrophe')({ 'two-column-widgets': {extend: 'apostrophe-widgets'}, 'two-column-1-2-widgets': {}, 'two-column-2-1-widgets': {}, + 'theme': {}, // Apostrophe module configuration diff --git a/lib/modules/apostrophe-assets/index.js b/lib/modules/apostrophe-assets/index.js index 611ac5c..f0b7391 100644 --- a/lib/modules/apostrophe-assets/index.js +++ b/lib/modules/apostrophe-assets/index.js @@ -13,8 +13,5 @@ module.exports = { scripts: [ {name: 'bootstrap'}, {name: 'site'} - ], - images: [ - {name: 'AvLogo.png'} ] }; diff --git a/lib/modules/apostrophe-assets/public/css/main.css b/lib/modules/apostrophe-assets/public/css/main.css index 5e4e78e..1dae7d4 100644 --- a/lib/modules/apostrophe-assets/public/css/main.css +++ b/lib/modules/apostrophe-assets/public/css/main.css @@ -1,9 +1,54 @@ +@font-face { + font-family: "Merriweather"; + src: url("/modules/theme/fonts/Merriweather-Regular.ttf") format("truetype"); +} +@font-face { + font-family: "MerriweatherSans"; + src: url("/modules/theme/fonts/MerriweatherSans-VariableFont_wght.ttf") format("truetype"); +} +@font-face { + font-family: "LibreFranklin"; + src: url("/modules/theme/fonts/LibreFranklin[wght].ttf") format("truetype"); +} +@font-face { + font-family: "PottaOne"; + src: url("/modules/theme/fonts/PottaOne-Regular.ttf") format("truetype"); +} p { - margin-top: 0.3rem; - margin-bottom: 0.7rem; + text-indent: 0; + margin: 0.3rem 0 0.7rem 0 !important; + padding: 0 !important; + font-family: "Merriweather", "serif"; + font-size: 1.1rem; line-height: 1.4rem; } +p.indent { + text-indent: 1rem; +} + +div[data-apos-widget=apostrophe-files] a, .apos-rich-text a { + margin: 0.3rem 0 0.7rem 0 !important; + font-family: "MerriweatherSans", "sans-serif"; + font-size: 1.4rem; + line-height: 1.6rem; + color: #1c1cc4; + text-shadow: 0 0 0.6rem #9ef371; + transition: text-shadow 0.5s, color 0.5s; +} +div[data-apos-widget=apostrophe-files] a:hover, .apos-rich-text a:hover { + color: #3d1cd0; + text-shadow: 0 0 0.6rem #7beeee; +} +div[data-apos-widget=apostrophe-files] a:active, .apos-rich-text a:active { + color: #7a29ec; +} + +.apos-rich-text a { + font-size: 1.2rem; + line-height: 1.5rem; +} + h5 { font-size: 1.2rem; font-weight: 900; @@ -16,11 +61,24 @@ h5 { } .apos-area-widget a { - display: block; + display: inline; padding-bottom: 0.8rem; } .apos-rich-text ul { + list-style-type: disc; + list-style-position: inside; + margin: 0.3rem 0 0.7rem 2rem; + text-indent: -1.5rem; + padding: 0; + font-family: "Merriweather", "serif"; + font-size: 1.1rem; + line-height: 1.4rem; +} + +.apos-rich-text ul ul { + margin-left: 2.5rem; + text-indent: -1.7rem; list-style-type: circle; list-style-position: inside; } @@ -45,12 +103,6 @@ h5 { color: Green; } -ul.bulletLevel2 { - text-indent: 1rem; - list-style-type: circle; - list-style-position: inside; -} - .apos-login-logo { margin-bottom: 0; } diff --git a/lib/modules/apostrophe-assets/public/css/main.css.map b/lib/modules/apostrophe-assets/public/css/main.css.map index 6b737d5..f1ef1b4 100644 --- a/lib/modules/apostrophe-assets/public/css/main.css.map +++ b/lib/modules/apostrophe-assets/public/css/main.css.map @@ -1 +1 @@ -{"version":3,"sourceRoot":"","sources":["main.sass"],"names":[],"mappings":"AACA;EACC;EACA;EACA;;;AAED;EACC;EACA;EACA;EACA;;;AAED;EACC;;;AAED;EACC;EACA;;;AAED;EACC;EACA;;;AAED;EACC;;;AAED;EACC;;;AAGD;EACC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAED;EACC;EACA;EACA;;;AAOD;EACC;;;AACD;EACC;EACA;;;AACD;EACC,kBAPU;;;AASV;EACC;;AACD;EACC;;AACD;EACC;;AACD;EACC;;AACD;EACC,kBAnBQ;;AAoBT;EACC;;;AACF;EACC,kBAvBS;;;AAwBV;EACC;IACC;IACA;IACA;;;AAKF;EACC;IACC;;;AAEF;EACC;IACC;;;AAEF;EACC;IACC;;;AAEF;EACC;IACC","file":"main.css"} \ No newline at end of file +{"version":3,"sourceRoot":"","sources":["main.sass"],"names":[],"mappings":"AAAA;EACC;EACA;;AACD;EACC;EACA;;AACD;EACC;EACA;;AACD;EACC;EACA;;AAED;EACC;EAGA;EACA;EACA;EACA;EACA;;;AACD;EACC;;;AAIA;EACC;EACA;EACA;EACA;EACA;EACA;EACA;;AACD;EACC;EACA;;AACD;EACC;;;AAGD;EACC;EACA;;;AAEF;EACC;EACA;EACA;EACA;;;AAED;EACC;;;AAED;EACC;EACA;;;AAED;EACC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AACD;EACC;EACA;EACA;EACA;;;AAED;EACC;;;AAED;EACC;;;AAGD;EACC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAQD;EACC;;;AACD;EACC;EACA;;;AACD;EACC,kBAPU;;;AASV;EACC;;AACD;EACC;;AACD;EACC;;AACD;EACC;;AACD;EACC,kBAnBQ;;AAoBT;EACC;;;AACF;EACC,kBAvBS;;;AAwBV;EACC;IACC;IACA;IACA;;;AAKF;EACC;IACC;;;AAEF;EACC;IACC;;;AAEF;EACC;IACC;;;AAEF;EACC;IACC","file":"main.css"} \ No newline at end of file diff --git a/lib/modules/apostrophe-assets/public/css/main.sass b/lib/modules/apostrophe-assets/public/css/main.sass index 0d71495..83c7a25 100644 --- a/lib/modules/apostrophe-assets/public/css/main.sass +++ b/lib/modules/apostrophe-assets/public/css/main.sass @@ -1,8 +1,48 @@ +@font-face + font-family: 'Merriweather' + src: url('/modules/theme/fonts/Merriweather-Regular.ttf') format("truetype") +@font-face + font-family: 'MerriweatherSans' + src: url('/modules/theme/fonts/MerriweatherSans-VariableFont_wght.ttf') format("truetype") +@font-face + font-family: "LibreFranklin" + src: url('/modules/theme/fonts/LibreFranklin[wght].ttf') format("truetype") +@font-face + font-family: "PottaOne" + src: url('/modules/theme/fonts/PottaOne-Regular.ttf') format('truetype') p - margin-top: 0.3rem - margin-bottom: 0.7rem + text-indent: 0 + // The important is necessary here because for some reason CKEditor outputs style="padding: 0; margin: 0" for every

tag. + // Remove !important if we can figure out how to remove the style CKEditor outputs. + margin: 0.3rem 0 0.7rem 0 !important + padding: 0 !important + font-family: "Merriweather", "serif" + font-size: 1.1rem line-height: 1.4rem +p.indent + text-indent: 1rem + +//Links using Apostrophe Files or Rich Text Widgets +div[data-apos-widget='apostrophe-files'], .apos-rich-text + a + margin: 0.3rem 0 0.7rem 0 !important + font-family: "MerriweatherSans", 'sans-serif' + font-size: 1.4rem + line-height: 1.6rem + color: #1c1cc4 + text-shadow: 0 0 0.6rem rgb(158, 243, 113) + transition: text-shadow 0.5s, color 0.5s + a:hover + color: #3d1cd0 + text-shadow: 0 0 0.6rem rgb(123, 238, 238) + a:active + color: #7a29ec +//Links embedded in a rich text widget. +.apos-rich-text + a + font-size: 1.2rem + line-height: 1.5rem h5 font-size: 1.2rem @@ -14,10 +54,21 @@ h5 display: none .apos-area-widget a - display: block + display: inline padding-bottom: 0.8rem .apos-rich-text ul + list-style-type: disc + list-style-position: inside + margin: 0.3rem 0 0.7rem 2rem + text-indent: -1.5rem + padding: 0 + font-family: "Merriweather", "serif" + font-size: 1.1rem + line-height: 1.4rem +.apos-rich-text ul ul + margin-left: 2.5rem + text-indent: -1.7rem list-style-type: circle list-style-position: inside @@ -39,10 +90,6 @@ h5 box-shadow: 0 0 20px 10px rgba(255, 255, 255, 0.61) color: Green -ul.bulletLevel2 - text-indent: 1rem - list-style-type: circle - list-style-position: inside // // Redefine some of the Apostrophe administrative UI. diff --git a/lib/modules/apostrophe-pages/views/pages/aves.html b/lib/modules/apostrophe-pages/views/pages/aves.html index 5350fbe..7b969f7 100644 --- a/lib/modules/apostrophe-pages/views/pages/aves.html +++ b/lib/modules/apostrophe-pages/views/pages/aves.html @@ -10,21 +10,25 @@ {% block main %}
{{ apos.area(data.page, "body", { - widgets: { - 'apostrophe-images': {size: 'one-half'}, - 'apostrophe-rich-text': { - toolbar: ['Styles', 'Bold', 'Italic', 'Link', 'Unlink', 'Anchor', 'Table', 'BulletedList', 'Blockquote', 'import'], - styles: [ - {name: 'Paragraph', element: 'p'}, - {name: 'Heading 2', element: 'h2'}, - {name: 'Heading 3', element: 'h3'}, - {name: 'Heading 4', element: 'h4'}, - {name: 'Heading 5', element: 'h5'} - ] - }, - 'apostrophe-files': {}, - 'two-column': {} - } + widgets: { + 'apostrophe-images': {size: 'original'}, + 'apostrophe-rich-text': { + toolbar: ['Styles', 'Bold', 'Italic', 'Link', 'Unlink', 'Indent', 'Outdent', 'Anchor', 'Table', 'BulletedList', 'Blockquote', 'Strike', 'Subscript', 'Superscript', 'Split'], + styles: [ + {name: 'Paragraph', element: 'p'}, + {name: 'Topic Paragraph', element: 'p', attributes: {class: "indent"} }, + {name: 'Heading 2', element: 'h2'}, + {name: 'Heading 3', element: 'h3'}, + {name: 'Heading 4', element: 'h4'}, + {name: 'Heading 5', element: 'h5'}, + {name: 'highlighted', element: 'div', attributes: {class: "highlighted"} } + ] + }, + 'apostrophe-files': {}, + 'two-column': {}, + 'two-column-1-2': {}, + 'two-column-2-1': {} + } }) }}
{% endblock %} diff --git a/lib/modules/apostrophe-pages/views/pages/avhs.html b/lib/modules/apostrophe-pages/views/pages/avhs.html index 1afe009..aa188b5 100644 --- a/lib/modules/apostrophe-pages/views/pages/avhs.html +++ b/lib/modules/apostrophe-pages/views/pages/avhs.html @@ -9,23 +9,27 @@ {% block main %}
- {{ apos.area(data.page, "body", { - widgets: { - 'apostrophe-images': {size: 'one-half'}, - 'apostrophe-rich-text': { - toolbar: ['Styles', 'Bold', 'Italic', 'Link', 'Unlink', 'Anchor', 'Table', 'BulletedList', 'Blockquote', 'import'], - styles: [ - {name: 'Paragraph', element: 'p'}, - {name: 'Heading 2', element: 'h2'}, - {name: 'Heading 3', element: 'h3'}, - {name: 'Heading 4', element: 'h4'}, - {name: 'Heading 5', element: 'h5'} - ] - }, - 'apostrophe-files': {}, - 'two-column': {} - } - }) }} + {{ apos.area(data.page, "body", { + widgets: { + 'apostrophe-images': {size: 'original'}, + 'apostrophe-rich-text': { + toolbar: ['Styles', 'Bold', 'Italic', 'Link', 'Unlink', 'Indent', 'Outdent', 'Anchor', 'Table', 'BulletedList', 'Blockquote', 'Strike', 'Subscript', 'Superscript', 'Split'], + styles: [ + {name: 'Paragraph', element: 'p'}, + {name: 'Topic Paragraph', element: 'p', attributes: {class: "indent"} }, + {name: 'Heading 2', element: 'h2'}, + {name: 'Heading 3', element: 'h3'}, + {name: 'Heading 4', element: 'h4'}, + {name: 'Heading 5', element: 'h5'}, + {name: 'highlighted', element: 'div', attributes: {class: "highlighted"} } + ] + }, + 'apostrophe-files': {}, + 'two-column': {}, + 'two-column-1-2': {}, + 'two-column-2-1': {} + } + }) }}
{% endblock %} diff --git a/lib/modules/apostrophe-pages/views/pages/district.html b/lib/modules/apostrophe-pages/views/pages/district.html index 60ef619..3dd290d 100644 --- a/lib/modules/apostrophe-pages/views/pages/district.html +++ b/lib/modules/apostrophe-pages/views/pages/district.html @@ -8,18 +8,19 @@ 'apostrophe-rich-text': { toolbar: ['Styles', 'Bold', 'Italic', 'Link', 'Unlink', 'Indent', 'Outdent', 'Anchor', 'Table', 'BulletedList', 'Blockquote', 'Strike', 'Subscript', 'Superscript', 'Split'], styles: [ - {name: 'Paragraph', element: 'p', attributes: {class: "p"} }, - {name: 'Heading 2', element: 'h2', attributes: {class: "h2"} }, - {name: 'Heading 3', element: 'h3', attributes: {class: "h3"} }, - {name: 'Heading 4', element: 'h4', attributes: {class: "h4"} }, - {name: 'Heading 5', element: 'h5', attributes: {class: "h5"} }, - {name: 'highlighted', element: 'div', attributes: {class: "highlighted"} }, - {name: 'bullet2', element: 'div', attributes: {class: "bulletLevel2"} } + {name: 'Paragraph', element: 'p'}, + {name: 'Topic Paragraph', element: 'p', attributes: {class: "indent"} }, + {name: 'Heading 2', element: 'h2'}, + {name: 'Heading 3', element: 'h3'}, + {name: 'Heading 4', element: 'h4'}, + {name: 'Heading 5', element: 'h5'}, + {name: 'highlighted', element: 'div', attributes: {class: "highlighted"} } ] }, 'apostrophe-files': {}, 'two-column': {}, - 'two-column-1-2': {} + 'two-column-1-2': {}, + 'two-column-2-1': {} } }) }} diff --git a/lib/modules/apostrophe-rich-text-widgets/index.js b/lib/modules/apostrophe-rich-text-widgets/index.js index 1496e38..e7833d9 100644 --- a/lib/modules/apostrophe-rich-text-widgets/index.js +++ b/lib/modules/apostrophe-rich-text-widgets/index.js @@ -11,10 +11,10 @@ module.exports = { 'sup', 'sub', 'span' ], allowedClasses: { - 'p': ['highlighted','apos-indent1', 'apos-indent2', 'bulletLevel2'], - 'ul': ['bulletLevel2'], - 'div': ['highlighted', "bulletLevel2"], - '*': ['highlighted', 'bulletLevel2', 'test', '*'] + 'p': ['highlighted', 'indent', 'bulletLevel2','apos-indent1', 'apos-indent2'], + 'ul': ['bulletLevel2','apos-indent1', 'apos-indent2'], + 'div': ['highlighted', "bulletLevel2",'apos-indent1', 'apos-indent2'], + '*': ['highlighted', 'bulletLevel2', 'test', '*','apos-indent1', 'apos-indent2'] }, allowedAttributes: { '*': ['style', 'class'], diff --git a/lib/modules/apostrophe-users/index.js b/lib/modules/apostrophe-users/index.js index bdfbb98..0f7fb17 100644 --- a/lib/modules/apostrophe-users/index.js +++ b/lib/modules/apostrophe-users/index.js @@ -12,19 +12,19 @@ module.exports = { }, { title: 'AVES', - permissions: [] + permissions: ["AVES"] }, { title: 'AVHS', - permissions: [] + permissions: ["AVHS"] }, { title: 'AVAS', - permissions: [] + permissions: ["AVAS"] }, { title: 'AVUSD', - permissions: [] + permissions: ['AVUSD'] }, { title: 'admin', diff --git a/lib/modules/theme/index.js b/lib/modules/theme/index.js new file mode 100644 index 0000000..fd0c5cb --- /dev/null +++ b/lib/modules/theme/index.js @@ -0,0 +1,5 @@ +// This configures the apostrophe-assets module to push a 'site.less' +// stylesheet by default, and to use jQuery 3.x + +module.exports = { +}; diff --git a/lib/modules/theme/public/fonts/LibreFranklin[wght].ttf b/lib/modules/theme/public/fonts/LibreFranklin[wght].ttf new file mode 100644 index 0000000..da36689 Binary files /dev/null and b/lib/modules/theme/public/fonts/LibreFranklin[wght].ttf differ diff --git a/lib/modules/theme/public/fonts/Merriweather-Regular.ttf b/lib/modules/theme/public/fonts/Merriweather-Regular.ttf new file mode 100644 index 0000000..2ee9a69 Binary files /dev/null and b/lib/modules/theme/public/fonts/Merriweather-Regular.ttf differ diff --git a/lib/modules/theme/public/fonts/MerriweatherSans-VariableFont_wght.ttf b/lib/modules/theme/public/fonts/MerriweatherSans-VariableFont_wght.ttf new file mode 100644 index 0000000..af4dce8 Binary files /dev/null and b/lib/modules/theme/public/fonts/MerriweatherSans-VariableFont_wght.ttf differ diff --git a/public/images/AvLogo.png b/lib/modules/theme/public/img/AvLogo.png similarity index 100% rename from public/images/AvLogo.png rename to lib/modules/theme/public/img/AvLogo.png diff --git a/lib/modules/two-column-1-2-widgets/views/widget.html b/lib/modules/two-column-1-2-widgets/views/widget.html index a018e78..c049b37 100644 --- a/lib/modules/two-column-1-2-widgets/views/widget.html +++ b/lib/modules/two-column-1-2-widgets/views/widget.html @@ -8,10 +8,12 @@ toolbar: ['Styles', 'Bold', 'Italic', 'Link', 'Unlink', 'Anchor', 'Table', 'BulletedList', 'Blockquote', 'Strike', 'Subscript', 'Superscript', 'Split'], styles: [ {name: 'Paragraph', element: 'p'}, + {name: 'Topic Paragraph', element: 'p', attributes: {class: "indent"} }, {name: 'Heading 2', element: 'h2'}, {name: 'Heading 3', element: 'h3'}, {name: 'Heading 4', element: 'h4'}, - {name: 'Heading 5', element: 'h5'} + {name: 'Heading 5', element: 'h5'}, + {name: 'highlighted', element: 'div', attributes: {class: "highlighted"} } ] }, 'apostrophe-files': {} diff --git a/lib/modules/two-column-2-1-widgets/views/widget.html b/lib/modules/two-column-2-1-widgets/views/widget.html index 94a8621..0f33398 100644 --- a/lib/modules/two-column-2-1-widgets/views/widget.html +++ b/lib/modules/two-column-2-1-widgets/views/widget.html @@ -8,10 +8,12 @@ toolbar: ['Styles', 'Bold', 'Italic', 'Link', 'Unlink', 'Anchor', 'Table', 'BulletedList', 'Blockquote', 'Strike', 'Subscript', 'Superscript', 'Split'], styles: [ {name: 'Paragraph', element: 'p'}, + {name: 'Topic Paragraph', element: 'p', attributes: {class: "indent"} }, {name: 'Heading 2', element: 'h2'}, {name: 'Heading 3', element: 'h3'}, {name: 'Heading 4', element: 'h4'}, - {name: 'Heading 5', element: 'h5'} + {name: 'Heading 5', element: 'h5'}, + {name: 'highlighted', element: 'div', attributes: {class: "highlighted"} } ] }, 'apostrophe-files': {} @@ -26,10 +28,12 @@ toolbar: ['Styles', 'Bold', 'Italic', 'Link', 'Unlink', 'Anchor', 'Table', 'BulletedList', 'Blockquote', 'Strike', 'Subscript', 'Superscript', 'Split'], styles: [ {name: 'Paragraph', element: 'p'}, + {name: 'Topic Paragraph', element: 'p', attributes: {class: "indent"} }, {name: 'Heading 2', element: 'h2'}, {name: 'Heading 3', element: 'h3'}, {name: 'Heading 4', element: 'h4'}, - {name: 'Heading 5', element: 'h5'} + {name: 'Heading 5', element: 'h5'}, + {name: 'highlighted', element: 'div', attributes: {class: "highlighted"} } ] }, 'apostrophe-files': {} diff --git a/lib/modules/two-column-widgets/views/widget.html b/lib/modules/two-column-widgets/views/widget.html index 534cc30..985b702 100644 --- a/lib/modules/two-column-widgets/views/widget.html +++ b/lib/modules/two-column-widgets/views/widget.html @@ -7,11 +7,13 @@ 'apostrophe-rich-text': { toolbar: ['Styles', 'Bold', 'Italic', 'Link', 'Unlink', 'Anchor', 'Table', 'BulletedList', 'Blockquote', 'Strike', 'Subscript', 'Superscript', 'Split'], styles: [ - {name: 'Paragraph', element: 'p'}, - {name: 'Heading 2', element: 'h2'}, - {name: 'Heading 3', element: 'h3'}, - {name: 'Heading 4', element: 'h4'}, - {name: 'Heading 5', element: 'h5'} + {name: 'Paragraph', element: 'p'}, + {name: 'Topic Paragraph', element: 'p', attributes: {class: "indent"} }, + {name: 'Heading 2', element: 'h2'}, + {name: 'Heading 3', element: 'h3'}, + {name: 'Heading 4', element: 'h4'}, + {name: 'Heading 5', element: 'h5'}, + {name: 'highlighted', element: 'div', attributes: {class: "highlighted"} } ] }, 'apostrophe-files': {} @@ -25,11 +27,13 @@ 'apostrophe-rich-text': { toolbar: ['Styles', 'Bold', 'Italic', 'Link', 'Unlink', 'Anchor', 'Table', 'BulletedList', 'Blockquote', 'Strike', 'Subscript', 'Superscript', 'Split'], styles: [ - {name: 'Paragraph', element: 'p'}, - {name: 'Heading 2', element: 'h2'}, - {name: 'Heading 3', element: 'h3'}, - {name: 'Heading 4', element: 'h4'}, - {name: 'Heading 5', element: 'h5'} + {name: 'Paragraph', element: 'p'}, + {name: 'Topic Paragraph', element: 'p', attributes: {class: "indent"} }, + {name: 'Heading 2', element: 'h2'}, + {name: 'Heading 3', element: 'h3'}, + {name: 'Heading 4', element: 'h4'}, + {name: 'Heading 5', element: 'h5'}, + {name: 'highlighted', element: 'div', attributes: {class: "highlighted"} } ] }, 'apostrophe-files': {} diff --git a/views/layout.html b/views/layout.html index 5572f84..397d108 100644 --- a/views/layout.html +++ b/views/layout.html @@ -13,19 +13,16 @@ {% endblock %} {% block extraHead %} -{# -This block outputs its contents in the HTML document's . - It is a good place to put extra #} - {% endblock %} +{# This block outputs its contents in the HTML document's . It is a good place to put extra #} +{% endblock %} {% block beforeMain %} {# We recommend you use the beforeMain block for global page components like headers or navigation. #}
{% block logoImage %} - Anderson Valley Logo: Four colored chevrons that look like people facing each other as viewed from above. + Anderson Valley Logo: Four colored chevrons that look like people facing each other as viewed from above. {% endblock %}

Anderson Valley Unified