Added an Alert text style; Updated rich text editor to reorganize buttons and add text alignment options.

2021-03-16 14:36:03 -07:00
parent 33cabd0a55
commit bf9d000994
31 changed files with 468 additions and 361 deletions
--- a/lib/modules/apostrophe-assets/index.js
+++ b/lib/modules/apostrophe-assets/index.js
@@ -4,6 +4,7 @@
 module.exports = {
 	jQuery: 3,
 	stylesheets: [
+		{name: 'common'},
 		{name: 'pre'},
 		{name: 'bootstrap'},
 		{name: 'main'},
--- a/lib/modules/apostrophe-assets/public/css/common.css
+++ b/lib/modules/apostrophe-assets/public/css/common.css
@@ -0,0 +1,23 @@
+.clearfix {
+  zoom: 1;
+}
+.clearfix:before {
+  content: "";
+  display: block;
+}
+.clearfix:after {
+  content: "";
+  display: table;
+  clear: both;
+}
+
+.noselect {
+  -webkit-touch-callout: none;
+  -webkit-user-select: none;
+  -khtml-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
+}
+
+/*# sourceMappingURL=common.css.map */
--- a/lib/modules/apostrophe-assets/public/css/common.css.map
+++ b/lib/modules/apostrophe-assets/public/css/common.css.map
@@ -0,0 +1 @@
+{"version":3,"sourceRoot":"","sources":["common.sass"],"names":[],"mappings":"AAAA;EACC;;AACA;EACC;EACA;;AAED;EACC;EACA;EACA;;;AACF;EACC;EACA;EACA;EACA;EACA;EACA","file":"common.css"}
--- a/lib/modules/apostrophe-assets/public/css/common.sass
+++ b/lib/modules/apostrophe-assets/public/css/common.sass
@@ -0,0 +1,17 @@
+.clearfix
+	zoom: 1
+	&:before
+		content: ''
+		display: block
+
+	&:after
+		content: ''
+		display: table
+		clear: both
+.noselect
+	-webkit-touch-callout: none /* iOS Safari */
+	-webkit-user-select: none /* Safari */
+	-khtml-user-select: none /* Konqueror HTML */
+	-moz-user-select: none /* Old versions of Firefox */
+	-ms-user-select: none /* Internet Explorer/Edge */
+	user-select: none /* Non-prefixed version, currently supported by Chrome, Edge, Opera and Firefox */
--- a/lib/modules/apostrophe-assets/public/css/main.css
+++ b/lib/modules/apostrophe-assets/public/css/main.css
@@ -1,3 +1,25 @@
+.clearfix {
+  zoom: 1;
+}
+.clearfix:before {
+  content: "";
+  display: block;
+}
+.clearfix:after {
+  content: "";
+  display: table;
+  clear: both;
+}
+
+.noselect {
+  -webkit-touch-callout: none;
+  -webkit-user-select: none;
+  -khtml-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
+}
+
@font-face {
  font-family: "Merriweather";
  src: url("/modules/theme/fonts/Merriweather-Regular.ttf") format("truetype");
@@ -23,6 +45,60 @@ p.indent {
  text-indent: 1rem;
 }

+.apos-rich-text td, .apos-rich-text th {
+  text-indent: 0;
+  margin: 0.3rem 0 0.7rem 0;
+  padding: 0.25rem 0;
+  font-family: "Merriweather", "serif";
+  font-size: 1.1rem;
+  line-height: 1.4rem;
+}
+.apos-rich-text td p, .apos-rich-text th p {
+  margin: 0 !important;
+  padding: 0 !important;
+}
+.apos-rich-text td + td, .apos-rich-text th + th {
+  padding-left: 1rem;
+}
+.apos-rich-text th {
+  font-family: "MerriweatherSans", "sans-serif";
+  font-weight: 700;
+}
+
+h2.h2, h3.h3, h4.h4 {
+  font-family: "MerriweatherSans", "sans-serif";
+  margin-bottom: 1rem;
+}
+
+h2.h2 + p, h3.h3 + p, h4.h4 + p {
+  margin-top: 0 !important;
+}
+
+p + h2.h2, p + h3.h3, p + h4.h4, ul + h2.h2, ul + h3.h3, ul + h4.h4, ol + h2.h2, ol + h3.h3, ol + h4.h4, table + h2.h2, table + h3.h3, table + h4.h4 {
+  margin-top: 1.7rem;
+}
+
+h2.h2 {
+  font-size: 2.2rem;
+  line-height: 2.8rem;
+  font-family: "MerriweatherSans", "sans-serif";
+  font-weight: 700;
+}
+
+h3.h3 {
+  font-size: 1.5rem;
+  line-height: 2rem;
+  font-family: "MerriweatherSans", "sans-serif";
+  font-weight: 700;
+}
+
+h4.h4 {
+  font-size: 1.2rem;
+  line-height: 1.5rem;
+  font-family: "MerriweatherSans", "sans-serif";
+  font-weight: 900;
+}
+
 div[data-apos-widget=apostrophe-files] a, .apos-rich-text a {
  margin: 0.3rem 0 0.7rem 0 !important;
  font-family: "MerriweatherSans", "sans-serif";
@@ -40,6 +116,17 @@ div[data-apos-widget=apostrophe-files] a:active, .apos-rich-text a:active {
  color: #7a29ec;
 }

+div[data-apos-widget=apostrophe-files] {
+  margin: 1rem 0 1.5rem 0.5rem;
+  padding: 0.5rem 0.5rem 0 0.5rem;
+  border: 1px solid #5b5b5b;
+}
+div[data-apos-widget=apostrophe-files] a {
+  display: block;
+  padding: 0;
+  font-size: 1.2rem;
+}
+
 .apos-rich-text a {
  font-size: 1.2rem;
  line-height: 1.5rem;
@@ -52,6 +139,12 @@ h5 {
  margin-bottom: 0.3rem;
 }

+.navbar sup {
+  font-weight: 700;
+  font-size: 0.7rem;
+  bottom: 0.25rem;
+}
+
 .apos-slideshow h4 {
  display: none;
 }
@@ -88,15 +181,27 @@ h5 {
 }

 .highlighted {
-  background: rgba(170, 122, 82, 0.3);
-  margin: 1rem 6rem;
-  padding: 1rem 1rem;
-  font-size: 1.8rem;
+  background: rgba(215, 187, 161, 0.3);
+  margin: 0 0 0 0;
+  padding: 0.2rem 0 0.2rem 1rem;
+  font-size: 1.1rem;
+  font-weight: 700;
+  color: #006400;
+}
+.highlighted a {
+  font-size: 1rem;
+  line-height: 1.2rem;
+  text-shadow: 0 0 0.6rem rgba(158, 243, 113, 0.3);
+}
+
+.date {
+  background: black;
+  color: white;
+  text-align: right;
+  padding: 1rem 1.5rem;
+  margin-bottom: 1rem;
+  margin-top: 2rem;
  font-weight: 700;
-  -webkit-box-shadow: 0 0 20px 10px rgba(255, 255, 255, 0.61);
-  -moz-box-shadow: 0 0 20px 10px rgba(255, 255, 255, 0.61);
-  box-shadow: 0 0 20px 10px rgba(255, 255, 255, 0.61);
-  color: Green;
 }

 .apos-login-logo {
--- 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":"AAAA;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"}
+{"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"}
--- a/lib/modules/apostrophe-assets/public/css/main.sass
+++ b/lib/modules/apostrophe-assets/public/css/main.sass
@@ -1,3 +1,5 @@
+@use './common'
+
@font-face
 	font-family: 'Merriweather'
 	src: url('/modules/theme/fonts/Merriweather-Regular.ttf') format("truetype")
@@ -20,6 +22,48 @@ p
 p.indent
 	text-indent: 1rem

+.apos-rich-text
+	td, th
+		text-indent: 0
+		margin: 0.3rem 0 0.7rem 0
+		padding: 0.25rem 0
+		font-family: "Merriweather", "serif"
+		font-size: 1.1rem
+		line-height: 1.4rem
+		p
+			margin: 0 !important
+			padding: 0 !important
+	td + td, th + th  // All table data elements following another table data element should have a bit of space between element contents.
+		padding-left: 1rem
+	th
+		font-family: "MerriweatherSans", "sans-serif"
+		font-weight: 700
+
+h2.h2, h3.h3, h4.h4
+	font-family: "MerriweatherSans", "sans-serif"
+	margin-bottom: 1rem
+// Remove the margin-top from the paragraphs that follow a heading.  Make !important because we have to override the styles set by CKEditor.
+h2.h2 + p, h3.h3 + p, h4.h4 + p
+	margin-top: 0 !important
+// Add more margin-top to headings when following content (p, unordered / ordered lists)
+p + h2.h2, p + h3.h3, p + h4.h4, ul + h2.h2, ul + h3.h3, ul + h4.h4, ol + h2.h2, ol + h3.h3, ol + h4.h4, table + h2.h2, table + h3.h3, table + h4.h4
+	margin-top: 1.7rem
+h2.h2
+	font-size: 2.2rem
+	line-height: 2.8rem
+	font-family: "MerriweatherSans", "sans-serif"
+	font-weight: 700
+h3.h3
+	font-size: 1.5rem
+	line-height: 2rem
+	font-family: "MerriweatherSans", "sans-serif"
+	font-weight: 700
+h4.h4
+	font-size: 1.2rem
+	line-height: 1.5rem
+	font-family: "MerriweatherSans", "sans-serif"
+	font-weight: 900
+
 //Links using Apostrophe Files or Rich Text Widgets
 div[data-apos-widget='apostrophe-files'], .apos-rich-text
 	a
@@ -35,6 +79,14 @@ div[data-apos-widget='apostrophe-files'], .apos-rich-text
 		text-shadow: 0 0 0.6rem rgb(123, 238, 238)
 	a:active
 		color: #7a29ec
+div[data-apos-widget='apostrophe-files']
+	margin: 1rem 0 1.5rem 0.5rem
+	padding: 0.5rem 0.5rem 0 0.5rem
+	border: 1px solid #5b5b5b
+	a
+		display: block
+		padding: 0
+		font-size: 1.2rem
 //Links embedded in a rich text widget.
 .apos-rich-text
 	a
@@ -47,6 +99,11 @@ h5
 	margin-top: 0.8rem
 	margin-bottom: 0.3rem

+.navbar sup
+	font-weight: 700
+	font-size: 0.7rem
+	bottom: 0.25rem
+
 .apos-slideshow h4
 	display: none

@@ -77,16 +134,25 @@ h5

 //.apos-rich-text > div  //This was a work around to the rich text widget 'class' property not working in the style.
 .highlighted
-	background: rgba(170, 122, 82, 0.3)
-	margin: 1rem 6rem
-	padding: 1rem 1rem
-	font-size: 1.8rem
+	background: rgba(215, 187, 161, 0.3)
+	margin: 0 0 0 0
+	padding: 0.2rem 0 0.2rem 1rem
+	font-size: 1.1rem
 	font-weight: 700
-	-webkit-box-shadow: 0 0 20px 10px rgba(255, 255, 255, 0.61)
-	-moz-box-shadow: 0 0 20px 10px rgba(255, 255, 255, 0.61)
-	box-shadow: 0 0 20px 10px rgba(255, 255, 255, 0.61)
-	color: Green
+	color: #006400
+	a
+		font-size: 1rem
+		line-height: 1.2rem
+		text-shadow: 0 0 0.6rem rgba(158, 243, 113, 0.3)

+.date
+	background: black
+	color: white
+	text-align: right
+	padding: 1rem 1.5rem
+	margin-bottom: 1rem
+	margin-top: 2rem
+	font-weight: 700

 //
 // Redefine some of the Apostrophe administrative UI.
--- a/lib/modules/apostrophe-assets/public/css/menu.css
+++ b/lib/modules/apostrophe-assets/public/css/menu.css
@@ -1,64 +1,3 @@
-html, body, div, span, applet, object, iframe,
-h1, h2, h3, h4, h5, h6, p, blockquote, pre,
-a, abbr, acronym, address, big, cite, code,
-del, dfn, em, img, ins, kbd, q, s, samp,
-small, strike, strong, sub, sup, tt, var,
-b, u, i, center,
-dl, dt, dd, ol, ul, li,
-fieldset, form, label, legend,
-table, caption, tbody, tfoot, thead, tr, th, td,
-article, aside, canvas, details, embed,
-figure, figcaption, footer, header, hgroup,
-menu, nav, output, ruby, section, summary,
-time, mark, audio, video {
-  margin: 0;
-  padding: 0;
-  border: 0;
-  vertical-align: baseline;
-}
-
-/* HTML5 display-role reset for older browsers */
-article, aside, details, figcaption, figure,
-footer, header, hgroup, menu, nav, section {
-  display: block;
-}
-
-body {
-  line-height: 1;
-}
-
-ol, ul {
-  list-style: none;
-}
-
-blockquote, q {
-  quotes: none;
-}
-
-blockquote:before, blockquote:after, q:before, q:after {
-  content: none;
-}
-
-table {
-  border-collapse: collapse;
-  border-spacing: 0;
-}
-
-i {
-  font-style: italic;
-}
-
-b {
-  font-weight: bold;
-}
-
-* {
-  -moz-box-sizing: border-box;
-  -webkit-box-sizing: border-box;
-  box-sizing: border-box;
-  margin: 0;
-}
-
 .clearfix {
  zoom: 1;
 }
--- a/lib/modules/apostrophe-assets/public/css/menu.css.map
+++ b/lib/modules/apostrophe-assets/public/css/menu.css.map
@@ -1 +1 @@
-{"version":3,"sourceRoot":"","sources":["pre.sass","menu.sass"],"names":[],"mappings":"AACA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;EAaC;EACA;EACA;EAGA;;;AAED;AACA;AAAA;EAEC;;;AAED;EACC;;;AAED;EACC;;;AAED;EACC;;;AAED;EACC;;;AAED;EACC;EACA;;;AAED;EACC;;;AAED;EACC;;;AAED;EACC;EACA;EACA;EACA;;;AAED;EACC;;AACA;EACC;EACA;;AAED;EACC;EACA;EACA;;;AACF;EACC;EACA;EACA;EACA;EACA;EACA;;;ACpED;EACC;EACA;EACA;EACA;EACA;EACA;;AACA;EACC;EACA;EACA;EACA;;AACA;EACC;;AACD;EACC;EACA;;AACD;EACC;;AAGD;EACC;EACA;EACA;;AACD;EAEC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACC;EACA;;AACD;EACC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACC;EACA;EAEA;EACA;EACA;EACA;EACA;EAEA;EACA;;AACF;EACC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEF;EACC;EACA;EACA;EACA;EAEA;EACA;;AACD;EACC;EACA;EACA;EACA;EACA;;AACD;EACC;;AACD;EAEC;EACA;EACA;EACA;EACA;EACA;;AACD;EACC;EACA;;;AAiBH;EACC;IACC;;EAEC;IACC;;EACD;IACC;;EACD;IACC","file":"menu.css"}
+{"version":3,"sourceRoot":"","sources":["common.sass","menu.sass"],"names":[],"mappings":"AAAA;EACC;;AACA;EACC;EACA;;AAED;EACC;EACA;EACA;;;AACF;EACC;EACA;EACA;EACA;EACA;EACA;;;ACdD;EACC;EACA;EACA;EACA;EACA;EACA;;AACA;EACC;EACA;EACA;EACA;;AACA;EACC;;AACD;EACC;EACA;;AACD;EACC;;AAGD;EACC;EACA;EACA;;AACD;EAEC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACC;EACA;;AACD;EACC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACC;EACA;EAEA;EACA;EACA;EACA;EACA;EAEA;EACA;;AACF;EACC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEF;EACC;EACA;EACA;EACA;EAEA;EACA;;AACD;EACC;EACA;EACA;EACA;EACA;;AACD;EACC;;AACD;EAEC;EACA;EACA;EACA;EACA;EACA;;AACD;EACC;EACA;;;AAiBH;EACC;IACC;;EAEC;IACC;;EACD;IACC;;EACD;IACC","file":"menu.css"}
--- a/lib/modules/apostrophe-assets/public/css/menu.sass
+++ b/lib/modules/apostrophe-assets/public/css/menu.sass
@@ -1,4 +1,4 @@
-@use './pre'
+@use './common'

 .navbar
 	overflow: visible
--- a/lib/modules/apostrophe-assets/public/css/pre.css
+++ b/lib/modules/apostrophe-assets/public/css/pre.css
@@ -59,26 +59,4 @@ b {
  margin: 0;
 }

-.clearfix {
-  zoom: 1;
-}
-.clearfix:before {
-  content: "";
-  display: block;
-}
-.clearfix:after {
-  content: "";
-  display: table;
-  clear: both;
-}
-
-.noselect {
-  -webkit-touch-callout: none;
-  -webkit-user-select: none;
-  -khtml-user-select: none;
-  -moz-user-select: none;
-  -ms-user-select: none;
-  user-select: none;
-}
-
 /*# sourceMappingURL=pre.css.map */
--- a/lib/modules/apostrophe-assets/public/css/pre.css.map
+++ b/lib/modules/apostrophe-assets/public/css/pre.css.map
@@ -1 +1 @@
-{"version":3,"sourceRoot":"","sources":["pre.sass"],"names":[],"mappings":"AACA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;EAaC;EACA;EACA;EAGA;;;AAED;AACA;AAAA;EAEC;;;AAED;EACC;;;AAED;EACC;;;AAED;EACC;;;AAED;EACC;;;AAED;EACC;EACA;;;AAED;EACC;;;AAED;EACC;;;AAED;EACC;EACA;EACA;EACA;;;AAED;EACC;;AACA;EACC;EACA;;AAED;EACC;EACA;EACA;;;AACF;EACC;EACA;EACA;EACA;EACA;EACA","file":"pre.css"}
+{"version":3,"sourceRoot":"","sources":["pre.sass"],"names":[],"mappings":"AACA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;EAaC;EACA;EACA;EAGA;;;AAED;AACA;AAAA;EAEC;;;AAED;EACC;;;AAED;EACC;;;AAED;EACC;;;AAED;EACC;;;AAED;EACC;EACA;;;AAED;EACC;;;AAED;EACC;;;AAED;EACC;EACA;EACA;EACA","file":"pre.css"}
--- a/lib/modules/apostrophe-assets/public/css/pre.sass
+++ b/lib/modules/apostrophe-assets/public/css/pre.sass
@@ -51,21 +51,3 @@ b
 	-webkit-box-sizing: border-box
 	box-sizing: border-box
 	margin: 0
-
-.clearfix
-	zoom: 1
-	&:before
-		content: ''
-		display: block
-
-	&:after
-		content: ''
-		display: table
-		clear: both
-.noselect
-	-webkit-touch-callout: none /* iOS Safari */
-	-webkit-user-select: none /* Safari */
-	-khtml-user-select: none /* Konqueror HTML */
-	-moz-user-select: none /* Old versions of Firefox */
-	-ms-user-select: none /* Internet Explorer/Edge */
-	user-select: none /* Non-prefixed version, currently supported by Chrome, Edge, Opera and Firefox */
				`@@ -0,0 +1 @@`
				`{"version":3,"sourceRoot":"","sources":["common.sass"],"names":[],"mappings":"AAAA;EACC;;AACA;EACC;EACA;;AAED;EACC;EACA;EACA;;;AACF;EACC;EACA;EACA;EACA;EACA;EACA","file":"common.css"}`