From 276d9b14b098f9e3826d786d75d94b99d532afcd Mon Sep 17 00:00:00 2001 From: "DESKTOP-C9V2M01\\Zeeri" Date: Thu, 18 Nov 2021 07:13:23 -0800 Subject: [PATCH] Added three types of alert/notice/update headings for messages at the top of pages. --- .../apostrophe-assets/public/css/main.css | 56 ++++++++++++++++++ .../apostrophe-assets/public/css/main.css.map | 2 +- .../apostrophe-assets/public/css/main.sass | 59 +++++++++++++++++++ .../apostrophe-rich-text-widgets/index.js | 6 +- .../views/widget.html | 4 +- .../two-column-1-2-widgets/views/widget.html | 8 ++- .../two-column-2-1-widgets/views/widget.html | 8 ++- .../two-column-widgets/views/widget.html | 8 ++- views/basic.html | 4 +- views/layout.html | 6 +- views/standardArea.html | 4 +- 11 files changed, 151 insertions(+), 14 deletions(-) diff --git a/lib/modules/apostrophe-assets/public/css/main.css b/lib/modules/apostrophe-assets/public/css/main.css index eee54f0..23fea64 100644 --- a/lib/modules/apostrophe-assets/public/css/main.css +++ b/lib/modules/apostrophe-assets/public/css/main.css @@ -275,6 +275,62 @@ blockquote p { padding-top: 0; } +.notice { + margin: 1.2rem 0; + padding: 0.3rem 0 0.3rem 0; + font-size: 1.3rem; + font-family: Montserrat-ExtraBold; + line-height: 1.4rem; + font-weight: 700; + color: #000; +} +.notice:before { + content: "Notice:"; + padding: 0.5rem; + letter-spacing: 0.2rem; + margin-right: 1rem; + color: #002170; + border: 0; +} +.notice a { + font-size: 1.2rem; + line-height: 1.3rem; + text-shadow: 0 0 0.6rem rgba(158, 243, 113, 0.3); +} + +.notice + .notice { + margin-top: 0; + padding-top: 0; +} + +.update { + margin: 1.2rem 0; + padding: 0.3rem 0 0.3rem 0; + font-size: 1.3rem; + font-family: Montserrat-ExtraBold; + line-height: 1.4rem; + font-weight: 700; + color: #000; +} +.update:before { + content: "Update:"; + padding: 0.5rem; + letter-spacing: 0.2rem; + margin-right: 1rem; + color: #155e01; + border: 0; +} +.update a { + font-size: 1.2rem; + line-height: 1.3rem; + text-shadow: 0 0 0.6rem rgba(158, 243, 113, 0.3); +} + +.update + .update { + margin-top: 0; + padding-top: 0; +} + .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 3308790..505f70c 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;;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;EAKA;EACA;EACA;EACA;EAEA;;AACD;EACC;EACA;EACA;;;AACF;EACC;EACA;;;AACD;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;EAKA;EACA;EACA;EACA;EAEA;;AACD;EACC;EACA;EACA;;;AACF;EACC;EACA;;;AAED;EAEC;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACC;EAKA;EACA;EACA;EACA;EAEA;;AACD;EACC;EACA;EACA;;;AACF;EACC;EACA;;;AAED;EAEC;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACC;EAKA;EACA;EACA;EACA;EAEA;;AACD;EACC;EACA;EACA;;;AACF;EACC;EACA;;;AAED;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 6f4973b..ead2463 100644 --- a/lib/modules/apostrophe-assets/public/css/main.sass +++ b/lib/modules/apostrophe-assets/public/css/main.sass @@ -215,6 +215,65 @@ blockquote .alert+.alert margin-top: 0 padding-top: 0 + +.notice + //background: #581d17 + margin: 1.2rem 0 + padding: 0.3rem 0 0.3rem 0 + font-size: 1.3rem + font-family: Montserrat-ExtraBold + line-height: 1.4rem + font-weight: 700 + color: #000 + &:before + content: "Notice:" + //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: #002170 + //border: 1px black solid + border: 0 + a + font-size: 1.2rem + line-height: 1.3rem + text-shadow: 0 0 0.6rem rgba(158, 243, 113, 0.3) +.notice+.notice + margin-top: 0 + padding-top: 0 + +.update + //background: #581d17 + margin: 1.2rem 0 + padding: 0.3rem 0 0.3rem 0 + font-size: 1.3rem + font-family: Montserrat-ExtraBold + line-height: 1.4rem + font-weight: 700 + color: #000 + &:before + content: "Update:" + //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: #155e01 + //border: 1px black solid + border: 0 + a + font-size: 1.2rem + line-height: 1.3rem + text-shadow: 0 0 0.6rem rgba(158, 243, 113, 0.3) +.update+.update + margin-top: 0 + padding-top: 0 + .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 b82674c..6d91ba9 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', 'alert', 'indent', 'bulletLevel2','apos-indent1', 'apos-indent2'], + 'p': ['highlighted', 'alert', 'notice', 'update', 'indent', 'bulletLevel2','apos-indent1', 'apos-indent2'], 'ul': ['bulletLevel2','apos-indent1', 'apos-indent2'], - 'div': ['highlighted', 'alert', "bulletLevel2",'apos-indent1', 'apos-indent2', 'date'], - '*': ['highlighted', 'alert', 'bulletLevel2', 'test', '*','apos-indent1', 'apos-indent2'] + 'div': ['highlighted', 'alert', 'notice', 'update', "bulletLevel2",'apos-indent1', 'apos-indent2', 'date'], + '*': ['highlighted', 'alert', 'notice', 'update', 'bulletLevel2', 'test', '*','apos-indent1', 'apos-indent2'] }, allowedAttributes: { '*': ['style', 'class'], diff --git a/lib/modules/centered-half-width-column-widgets/views/widget.html b/lib/modules/centered-half-width-column-widgets/views/widget.html index 3c3f04d..1ae2b81 100644 --- a/lib/modules/centered-half-width-column-widgets/views/widget.html +++ b/lib/modules/centered-half-width-column-widgets/views/widget.html @@ -15,7 +15,9 @@ {name: 'Heading 4', element: 'h4', attributes: {class: "h4"} }, {name: 'Date', element: 'div', attributes: {class: "date"} }, {name: 'Highlighted', element: 'div', attributes: {class: "highlighted"} }, - {name: 'Alert', element: 'div', attributes: {class: "alert"} } + {name: 'Alert', element: 'div', attributes: {class: "alert"} }, + {name: 'Notice', element: 'div', attributes: {class: "notice"} }, + {name: 'Update', element: 'div', attributes: {class: "update"} } ] }, 'apostrophe-files': {} 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 e0a5259..b24ad73 100644 --- a/lib/modules/two-column-1-2-widgets/views/widget.html +++ b/lib/modules/two-column-1-2-widgets/views/widget.html @@ -14,7 +14,9 @@ {name: 'Heading 4', element: 'h4', attributes: {class: "h4"} }, {name: 'Date', element: 'div', attributes: {class: "date"} }, {name: 'Highlighted', element: 'div', attributes: {class: "highlighted"} }, - {name: 'Alert', element: 'div', attributes: {class: "alert"} } + {name: 'Alert', element: 'div', attributes: {class: "alert"} }, + {name: 'Notice', element: 'div', attributes: {class: "notice"} }, + {name: 'Update', element: 'div', attributes: {class: "update"} } ] }, 'apostrophe-files': {} @@ -35,7 +37,9 @@ {name: 'Heading 4', element: 'h4', attributes: {class: "h4"} }, {name: 'Date', element: 'div', attributes: {class: "date"} }, {name: 'Highlighted', element: 'div', attributes: {class: "highlighted"} }, - {name: 'Alert', element: 'div', attributes: {class: "alert"} } + {name: 'Alert', element: 'div', attributes: {class: "alert"} }, + {name: 'Notice', element: 'div', attributes: {class: "notice"} }, + {name: 'Update', element: 'div', attributes: {class: "update"} } ] }, '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 3dab219..745d192 100644 --- a/lib/modules/two-column-2-1-widgets/views/widget.html +++ b/lib/modules/two-column-2-1-widgets/views/widget.html @@ -14,7 +14,9 @@ {name: 'Heading 4', element: 'h4', attributes: {class: "h4"} }, {name: 'Date', element: 'div', attributes: {class: "date"} }, {name: 'Highlighted', element: 'div', attributes: {class: "highlighted"} }, - {name: 'Alert', element: 'div', attributes: {class: "alert"} } + {name: 'Alert', element: 'div', attributes: {class: "alert"} }, + {name: 'Notice', element: 'div', attributes: {class: "notice"} }, + {name: 'Update', element: 'div', attributes: {class: "update"} } ] }, 'apostrophe-files': {} @@ -35,7 +37,9 @@ {name: 'Heading 4', element: 'h4', attributes: {class: "h4"} }, {name: 'Date', element: 'div', attributes: {class: "date"} }, {name: 'Highlighted', element: 'div', attributes: {class: "highlighted"} }, - {name: 'Alert', element: 'div', attributes: {class: "alert"} } + {name: 'Alert', element: 'div', attributes: {class: "alert"} }, + {name: 'Notice', element: 'div', attributes: {class: "notice"} }, + {name: 'Update', element: 'div', attributes: {class: "update"} } ] }, 'apostrophe-files': {} diff --git a/lib/modules/two-column-widgets/views/widget.html b/lib/modules/two-column-widgets/views/widget.html index f1057d6..ae2ae67 100644 --- a/lib/modules/two-column-widgets/views/widget.html +++ b/lib/modules/two-column-widgets/views/widget.html @@ -14,7 +14,9 @@ {name: 'Heading 4', element: 'h4', attributes: {class: "h4"} }, {name: 'Date', element: 'div', attributes: {class: "date"} }, {name: 'Highlighted', element: 'div', attributes: {class: "highlighted"} }, - {name: 'Alert', element: 'div', attributes: {class: "alert"} } + {name: 'Alert', element: 'div', attributes: {class: "alert"} }, + {name: 'Notice', element: 'div', attributes: {class: "notice"} }, + {name: 'Update', element: 'div', attributes: {class: "update"} } ] }, 'apostrophe-files': {} @@ -35,7 +37,9 @@ {name: 'Heading 4', element: 'h4', attributes: {class: "h4"} }, {name: 'Date', element: 'div', attributes: {class: "date"} }, {name: 'Highlighted', element: 'div', attributes: {class: "highlighted"} }, - {name: 'Alert', element: 'div', attributes: {class: "alert"} } + {name: 'Alert', element: 'div', attributes: {class: "alert"} }, + {name: 'Notice', element: 'div', attributes: {class: "notice"} }, + {name: 'Update', element: 'div', attributes: {class: "update"} } ] }, 'apostrophe-files': {} diff --git a/views/basic.html b/views/basic.html index 59faee7..f440db6 100644 --- a/views/basic.html +++ b/views/basic.html @@ -15,7 +15,9 @@ {name: 'Heading 4', element: 'h4', attributes: {class: "h4"} }, {name: 'Date', element: 'div', attributes: {class: "date"} }, {name: 'Highlighted', element: 'div', attributes: {class: "highlighted"} }, - {name: 'Alert', element: 'div', attributes: {class: "alert"} } + {name: 'Alert', element: 'div', attributes: {class: "alert"} }, + {name: 'Notice', element: 'div', attributes: {class: "notice"} }, + {name: 'Update', element: 'div', attributes: {class: "update"} } ] }, 'apostrophe-files': {}, diff --git a/views/layout.html b/views/layout.html index 23599fc..d3c81b7 100644 --- a/views/layout.html +++ b/views/layout.html @@ -54,10 +54,11 @@ Welcome Contact Information Covid Information + Covid Reporting Calendar Staff - Reports + Reports / Notices Title IX Open Positions @@ -71,7 +72,9 @@

Administration

Contracts, Agreements, and Salary Schedules + Forms Food Service + Wellness Committee
@@ -164,6 +167,7 @@ Bell Schedules Immunizations Attendance + Bus Schedule diff --git a/views/standardArea.html b/views/standardArea.html index 476ae8b..146bf98 100644 --- a/views/standardArea.html +++ b/views/standardArea.html @@ -13,7 +13,9 @@ {name: 'Heading 5', element: 'h5', attributes: {class: "h5"} }, {name: 'Date', element: 'div', attributes: {class: "date"} }, {name: 'Highlighted', element: 'div', attributes: {class: "highlighted"} }, - {name: 'Alert', element: 'div', attributes: {class: "alert"} } + {name: 'Alert', element: 'div', attributes: {class: "alert"} }, + {name: 'Notice', element: 'div', attributes: {class: "notice"} }, + {name: 'Update', element: 'div', attributes: {class: "update"} } ] }, 'apostrophe-files': {},