Merge branch 'frost' into adding_image_assets

files/__main__.py

@@ -58,6 +58,7 @@ app.config['MAIL_USERNAME'] = environ.get("MAIL_USERNAME", "").strip()
 app.config['MAIL_PASSWORD'] = environ.get("MAIL_PASSWORD", "").strip()
 app.config['DESCRIPTION'] = environ.get("DESCRIPTION", "DESCRIPTION GOES HERE").strip()
 app.config['SETTINGS'] = {}
+app.config['SQLALCHEMY_DATABASE_URI'] = app.config['DATABASE_URL']
 
 r=redis.Redis(host=environ.get("REDIS_URL", "redis://localhost"), decode_responses=True, ssl_cert_reqs=None)
 

files/assets/css/TheMotte.css

@@ -83,3 +83,157 @@ blockquote {
 #frontpage .post-title a:visited, .visited {
 	color: #7a7a7a !important;
 }
+
+.usernote-link {
+	color: var(--primary);
+	text-decoration: none;
+	background-color: transparent;
+	cursor: pointer;
+}
+
+.usernote-link:hover {
+	text-decoration: underline;
+}
+
+.modal__overlay {
+	position: fixed;
+	top: 0;
+	left: 0;
+	right: 0;
+	bottom: 0;
+	background: rgba(0,0,0,0.6);
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	z-index:1033 !important;
+}
+
+.modal__container {
+	background-color: #fff;
+	padding: 30px;
+	max-width: 500px;
+	max-height: 100vh;
+	border-radius: 4px;
+	overflow-y: auto;
+	box-sizing: border-box;
+}
+
+.modal__header {
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+}
+
+.modal__title {
+	margin-top: 0;
+	margin-bottom: 0;
+	font-weight: 600;
+	font-size: 1.25rem;
+	line-height: 1.25;
+	color: #00449e;
+	box-sizing: border-box;
+}
+
+.modal__close {
+	background: transparent;
+	border: 0;
+}
+
+.modal__header .modal__close:before { content: "\2715"; }
+
+.modal__content {
+	margin-top: 2rem;
+	margin-bottom: 2rem;
+	line-height: 1.5;
+	color: rgba(0,0,0,.8);
+}
+
+.modal__content > .content__wrapper {
+	display: flex;
+	flex-direction: column;
+	min-width: 400px;
+}
+
+.modal__content > .content__wrapper > .table_content,
+.modal__content > .content__wrapper > .table_content > .table_note,
+.modal__content > .content__wrapper > .table_headers {
+	display: flex;
+}
+.modal__content > .content__wrapper > .table_content > .table_note {
+	margin-top: 10px;
+}
+.modal__content > .content__wrapper > .table_headers > *,
+.modal__content > .content__wrapper > .table_content > .table_note > * {
+	flex-basis: 20%;
+}
+.modal__content > .content__wrapper > .table_headers > *:nth-child(2),
+.modal__content > .content__wrapper > .table_content > .table_note > *:nth-child(2) {
+	flex-basis: 35%;
+	flex-grow: 1;
+}
+.modal__content > .content__wrapper > .table_content .table_note_message {
+	padding: 5px;
+	box-sizing: border-box;
+}
+.modal__content > .content__wrapper > .table_content > .table_note .table_note_date,
+.modal__content > .content__wrapper > .table_content > .table_note > .table_note_delete > span {
+	color: var(--primary);
+	border: none !important;
+	text-decoration: none;
+	background-color: transparent;
+	cursor: pointer;
+}
+.modal__content > .content__wrapper > .table_content > .table_note .table_note_date:hover,
+.modal__content > .content__wrapper > .table_content > .table_note > .table_note_delete > span:hover {
+	text-decoration: underline;
+}
+
+.modal__content > form {
+	display: flex;
+	flex-direction: column;
+}
+
+.modal__content > .content__wrapper > .table_content {
+	flex-direction: column;
+}
+
+.modal__content textarea {
+	resize: vertical !important;
+	min-height: 50px;
+	margin-top:20px;
+}
+
+.modal__content select {
+	display: table-cell;
+	padding: 5px;
+	box-sizing: border-box;
+	margin-top:5px;
+	vertical-align: middle;
+}
+
+.modal__btn {
+	font-size: .875rem;
+	padding-left: 1rem;
+	padding-right: 1rem;
+	padding-top: .5rem;
+	padding-bottom: .5rem;
+	background-color: #e6e6e6;
+	color: rgba(0,0,0,.8);
+	border-radius: .25rem;
+	border-style: none;
+	border-width: 0;
+	cursor: pointer;
+	-webkit-appearance: button;
+	text-transform: none;
+	overflow: visible;
+	line-height: 1.15;
+	margin: 0;
+}
+
+.micromodal-slide {
+	display: none;
+}
+
+.micromodal-slide.is-open {
+	display: block;
+}

files/assets/css/main.css

@@ -4625,9 +4625,7 @@ img[pat][src^="/pp/"], img[pat][src$="/pic"] {
 	color: #f27d0c !important;
 	font-weight: 800;
 }
-.agendaposter {
-	text-transform: uppercase !important;
-}
+
 code {
 	text-transform: none !important;
 }