diff --git a/lib/modules/apostrophe-assets/public/css/main.css b/lib/modules/apostrophe-assets/public/css/main.css index c451e9e..04ce9b9 100644 --- a/lib/modules/apostrophe-assets/public/css/main.css +++ b/lib/modules/apostrophe-assets/public/css/main.css @@ -1,3 +1,4 @@ +@charset "UTF-8"; .clearfix { zoom: 1; } @@ -32,6 +33,14 @@ font-family: "LibreFranklin"; src: url("/modules/theme/fonts/LibreFranklin[wght].ttf") format("truetype"); } +@font-face { + font-family: "Montserrat-ExtraBold"; + src: url("/modules/theme/fonts/Montserrat-ExtraBold.ttf") format("truetype"); +} +@font-face { + font-family: "AlexBrush"; + src: url("/modules/theme/fonts/AlexBrush-Regular.ttf") format("truetype"); +} p { text-indent: 0; margin: 0.3rem 0 0.7rem 0 !important; @@ -172,6 +181,50 @@ h5 { list-style-position: inside; } +.apos-rich-text ol { + list-style-type: decimal; + 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 ol ol { + margin-left: 2.5rem; + text-indent: -1.7rem; + list-style-type: lower-alpha; + list-style-position: inside; +} + +blockquote { + font-family: AlexBrush, Serif; + font-size: 1.2rem; + line-height: 1.3rem; + margin: 0.2rem 0; +} +blockquote:before { + content: "“"; +} +blockquote:after { + content: "”"; +} +blockquote:after, blockquote:before { + font-size: 4rem; + line-height: 0; + position: relative; + top: 0.5rem; + color: #666666; +} +blockquote p { + font-family: AlexBrush, Serif; + font-size: 2rem; + line-height: 2rem; + display: inline; +} + .apos-indent1 { margin-left: 1rem; } @@ -194,6 +247,30 @@ h5 { text-shadow: 0 0 0.6rem rgba(158, 243, 113, 0.3); } +.alert { + margin: 0; + padding: 0.4rem 0 0.4rem 1rem; + font-size: 1.3rem; + font-family: "Montserrat-ExtraBold", "sans-serif"; + line-height: 1.4rem; + font-weight: 700; + color: #000; +} +.alert:before { + content: "Alert:"; + border-radius: 0.5rem/1rem; + padding: 0.5rem; + letter-spacing: 0.2rem; + margin-right: 1rem; + color: #98025c; + border: 1px black solid; +} +.alert a { + font-size: 1.2rem; + line-height: 1.3rem; + text-shadow: 0 0 0.6rem rgba(158, 243, 113, 0.3); +} + .date { background: black; color: white; diff --git a/lib/modules/apostrophe-assets/public/css/main.css.map b/lib/modules/apostrophe-assets/public/css/main.css.map index 3fbb3b4..c44b199 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":["common.sass","main.sass"],"names":[],"mappings":"AAAA;EACC;;AACA;EACC;EACA;;AAED;EACC;EACA;EACA;;;AACF;EACC;EACA;EACA;EACA;EACA;EACA;;;ACdD;EACC;EACA;;AACD;EACC;EACA;;AACD;EACC;EACA;;AAED;EACC;EAGA;EACA;EACA;EACA;EACA;;;AACD;EACC;;;AAGA;EACC;EACA;EACA;EACA;EACA;EACA;;AACA;EACC;EACA;;AACF;EACC;;AACD;EACC;EACA;;;AAEF;EACC;EACA;;;AAED;EACC;;;AAED;EACC;;;AACD;EACC;EACA;EACA;EACA;;;AACD;EACC;EACA;EACA;EACA;;;AACD;EACC;EACA;EACA;EACA;;;AAIA;EACC;EACA;EACA;EACA;EACA;EACA;EACA;;AACD;EACC;EACA;;AACD;EACC;;;AACF;EACC;EACA;EACA;;AACA;EACC;EACA;EACA;;;AAGD;EACC;EACA;;;AAEF;EACC;EACA;EACA;EACA;;;AAED;EACC;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;;AACA;EACC;EACA;EACA;;;AAEF;EACC;EACA;EACA;EACA;EACA;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":["common.sass","main.sass"],"names":[],"mappings":";AAAA;EACC;;AACA;EACC;EACA;;AAED;EACC;EACA;EACA;;;AACF;EACC;EACA;EACA;EACA;EACA;EACA;;;ACdD;EACC;EACA;;AACD;EACC;EACA;;AACD;EACC;EACA;;AACD;EACC;EACA;;AACD;EACC;EACA;;AAED;EACC;EAGA;EACA;EACA;EACA;EACA;;;AACD;EACC;;;AAGA;EACC;EACA;EACA;EACA;EACA;EACA;;AACA;EACC;EACA;;AACF;EACC;;AACD;EACC;EACA;;;AAEF;EACC;EACA;;;AAED;EACC;;;AAED;EACC;;;AACD;EACC;EACA;EACA;EACA;;;AACD;EACC;EACA;EACA;EACA;;;AACD;EACC;EACA;EACA;EACA;;;AAIA;EACC;EACA;EACA;EACA;EACA;EACA;EACA;;AACD;EACC;EACA;;AACD;EACC;;;AACF;EACC;EACA;EACA;;AACA;EACC;EACA;EACA;;;AAGD;EACC;EACA;;;AAEF;EACC;EACA;EACA;EACA;;;AAED;EACC;EACA;EACA;;;AAED;EACC;;;AAED;EACC;EACA;;;AAED;EACC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AACD;EACC;EACA;EACA;EACA;;;AAED;EACC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AACD;EACC;EACA;EACA;EACA;;;AAED;EACC;EACA;EACA;EACA;;AACA;EACC;;AACD;EACC;;AACD;EACC;EACA;EACA;EACA;EACA;;AACD;EACC;EACA;EACA;EACA;;;AAEF;EACC;;;AAED;EACC;;;AAGD;EACC;EACA;EACA;EACA;EACA;EACA;;AACA;EACC;EACA;EACA;;;AAEF;EAEC;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACC;EAIA;EACA;EACA;EACA;EACA;EACA;;AACD;EACC;EACA;EACA;;;AAEF;EACC;EACA;EACA;EACA;EACA;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 diff --git a/lib/modules/apostrophe-assets/public/css/main.sass b/lib/modules/apostrophe-assets/public/css/main.sass index f21b7f6..b6a8f28 100644 --- a/lib/modules/apostrophe-assets/public/css/main.sass +++ b/lib/modules/apostrophe-assets/public/css/main.sass @@ -9,6 +9,12 @@ @font-face font-family: "LibreFranklin" src: url('/modules/theme/fonts/LibreFranklin[wght].ttf') format("truetype") +@font-face + font-family: "Montserrat-ExtraBold" + src: url('/modules/theme/fonts/Montserrat-ExtraBold.ttf') format("truetype") +@font-face + font-family: "AlexBrush" + src: url('/modules/theme/fonts/AlexBrush-Regular.ttf') format("truetype") p text-indent: 0 @@ -126,6 +132,42 @@ h5 list-style-type: circle list-style-position: inside +.apos-rich-text ol + list-style-type: decimal + 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 ol ol + margin-left: 2.5rem + text-indent: -1.7rem + list-style-type: lower-alpha + list-style-position: inside + +blockquote + font-family: AlexBrush, Serif + font-size: 1.2rem + line-height: 1.3rem + margin: .2rem 0 + &:before + content: '\201C' + &:after + content: '\201D' + &:after, &:before + font-size: 4rem + line-height: 0 + position: relative + top: 0.5rem + color: lighten(#000, 40%) + p + font-family: AlexBrush, Serif + font-size: 2rem + line-height: 2rem + display: inline + .apos-indent1 margin-left: 1rem @@ -145,6 +187,31 @@ h5 line-height: 1.2rem text-shadow: 0 0 0.6rem rgba(158, 243, 113, 0.3) +.alert + //background: #581d17 + margin: 0 + padding: 0.4rem 0 0.4rem 1rem + font-size: 1.3rem + font-family: "Montserrat-ExtraBold", "sans-serif" + line-height: 1.4rem + font-weight: 700 + color: #000 + &:before + content: "Alert:" + //color: #FFF + //background: #98025c + //background-image: linear-gradient(45deg, #3023AE 0%, #98025C 100%) + border-radius: .5rem/1rem + padding: 0.5rem + letter-spacing: 0.2rem + margin-right: 1rem + color: #98025c + border: 1px black solid + a + font-size: 1.2rem + line-height: 1.3rem + text-shadow: 0 0 0.6rem rgba(158, 243, 113, 0.3) + .date background: black color: white diff --git a/lib/modules/apostrophe-rich-text-widgets/index.js b/lib/modules/apostrophe-rich-text-widgets/index.js index 52ecf47..b82674c 100644 --- a/lib/modules/apostrophe-rich-text-widgets/index.js +++ b/lib/modules/apostrophe-rich-text-widgets/index.js @@ -16,10 +16,10 @@ module.exports = { 'sup', 'sub', 'span' ], allowedClasses: { - 'p': ['highlighted', 'indent', 'bulletLevel2','apos-indent1', 'apos-indent2'], + 'p': ['highlighted', 'alert', 'indent', 'bulletLevel2','apos-indent1', 'apos-indent2'], 'ul': ['bulletLevel2','apos-indent1', 'apos-indent2'], - 'div': ['highlighted', "bulletLevel2",'apos-indent1', 'apos-indent2', 'date'], - '*': ['highlighted', 'bulletLevel2', 'test', '*','apos-indent1', 'apos-indent2'] + 'div': ['highlighted', 'alert', "bulletLevel2",'apos-indent1', 'apos-indent2', 'date'], + '*': ['highlighted', 'alert', 'bulletLevel2', 'test', '*','apos-indent1', 'apos-indent2'] }, allowedAttributes: { '*': ['style', 'class'], diff --git a/lib/modules/theme/public/fonts/AlexBrush-Regular.ttf b/lib/modules/theme/public/fonts/AlexBrush-Regular.ttf new file mode 100644 index 0000000..f82156c Binary files /dev/null and b/lib/modules/theme/public/fonts/AlexBrush-Regular.ttf differ diff --git a/lib/modules/theme/public/fonts/Montserrat-ExtraBold.ttf b/lib/modules/theme/public/fonts/Montserrat-ExtraBold.ttf new file mode 100644 index 0000000..80ea806 Binary files /dev/null and b/lib/modules/theme/public/fonts/Montserrat-ExtraBold.ttf differ