Merge branch 'task/core-GH-73-missing-commits-from-main-found-in-core…

…-GH-245' into task/GH-73-tacc-blockquote-plugin

texascale-org/static/texascale-org/css/src/_imports/components/bootstrap.blockquote.css → texascale-org/static/texascale-org/css/src/_imports/components/deprecated/bootstrap.blockquote.css

@@ -1,10 +1,14 @@
+/* WARNING: Deprecated. Do NOT add this to markup! */
+/* NOTE: Preserve for legacy support (unless you wanna update 50+ instances) */
+/* FAQ: 2019–20 used Bootstrap `blockquote`; 2021 used `s-blockquote` */
+/* SEE: ../../trumps/s-blockquote.css */
+
 /* BOOTSTRAP COMPONENTS: Quote */
 
 .blockquote {
   margin-top: 20px;
   margin-bottom: 20px;
-}
-.blockquote {
+
   color: #b75554;
   font-size: 18px;
   font-style: italic;

texascale-org/static/texascale-org/css/src/_imports/components/deprecated/c-offset-content.css

@@ -0,0 +1,42 @@
+/* WARNING: Deprecated. Do NOT add this to markup! */
+/* NOTE: Preserve for legacy support (unless you wanna update 50+ instances) */
+/* FAQ: 2019–20 used `c-offset-content`; 2021, renamed to `o-offset-content` */
+/* SEE: ../../objects/o-offset-content.css */
+/*
+(Deprecated) Offset Content
+
+Content that should be offset from the flow of text within which it is placed.
+
+Styleguide Components.Texascale.Deprecated.OffsetContent
+*/
+@import url("_imports/tools/media-queries.css");
+
+[class*="c-offset-content--"] {
+  --offset-distance: 8.5vw; /* NOTE: Value is from Texascale.org 2020 */
+	--buffer: 30px; /* double Bootstrap `.col` padding */
+
+  max-width: 50%;
+}
+
+@media only screen and (--medium-and-above) {
+	.c-offset-content--right {
+		float: right;
+		margin-left: var(--buffer);
+	}
+	.c-offset-content--right + .c-offset-content--right { clear: right; }
+
+	.c-offset-content--left {
+		float: left;
+		margin-right: var(--buffer);
+	}
+	.c-offset-content--left + .c-offset-content--left { clear: left; }
+}
+@media only screen and (--medium-and-above) and (--max-wide-and-below) {
+    /* Apply negative margin only when using offset value */
+	.c-offset-content--right {
+		margin-right: calc( var(--offset-distance) * -1);
+	}
+	.c-offset-content--left {
+		margin-left: calc( var(--offset-distance) * -1);
+	}
+}

texascale-org/static/texascale-org/css/src/_imports/objects/o-offset-content.css

@@ -0,0 +1,5 @@
+/* SEE: taccsite_cms/static/site_cms/css/src/_imports/objects/o-offset-content.css */
+
+[class*="o-offset-content--"] {
+	--offset-distance: 8.5vw;
+}

texascale-org/static/texascale-org/css/src/_imports/trumps/s-article-page.css

@@ -12,6 +12,7 @@ Markup:
 
 Styleguide Trumps.Scopes.Article
 */
+@import url("_imports/tools/media-queries.css");
 
 /* Prevent content after article from wrapping around floated content in article */
 .s-article-page .container,
@@ -23,9 +24,10 @@ Styleguide Trumps.Scopes.Article
 }
 
 /* Do this only for those viewports when content is actually offset */
-@media only screen and (min-width: 992px) and (max-width: 2400px) {
+@media only screen and (--medium-and-above) and (--max-wide-and-below) {
   /* If element is too wide, then the offset is negligible */
-  .s-article-page [class*="c-offset-content--"] {
+  .s-article-page [class*="c-offset-content--"], /* FAQ: Deprecated */
+  .s-article-page [class*="o-offset-content--"] {
     max-width: calc( var(--offset-distance) * 4 );
   }
 }

texascale-org/static/texascale-org/css/src/_imports/trumps/s-blockquote.css

@@ -0,0 +1,8 @@
+/* SEE: taccsite_cms/static/site_cms/css/src/_imports/trumps/s-blockquote.css */
+
+.s-blockquote blockquote {
+  color: #b75554;
+}
+.s-blockquote figcaption {
+  color: #636466;
+}

texascale-org/static/texascale-org/css/src/site.css

@@ -15,17 +15,19 @@
 @import url("_imports/elements/html-elements.css");
 
 /* OBJECTS */
-/* … */
+@import url("_imports/objects/o-offset-content.css");
 
 /* COMPONENTS */
 @import url("_imports/components/wip.byline.css");
 /* RFC: If only used on articles, then these components could be imported into `template.article.css` instead */
-@import url("_imports/components/tacc.c-offset-content.css");
 @import url("_imports/components/bootstrap.figure.css");
-@import url("_imports/components/bootstrap.blockquote.css");
+@import url("_imports/components/deprecated/bootstrap.blockquote.css");
+@import url("_imports/components/deprecated/c-offset-content.css");
 
 /* TRUMPS */
 @import url("_imports/trumps/s-drop-caps.css");
 @import url("_imports/trumps/s-gallery.css");
 @import url("_imports/trumps/u-border.css");
 @import url("_imports/trumps/u-swallow.css");
+/* RFC: If only used on articles, then these components could be imported into `template.article.css` instead */
+@import url("_imports/trumps/s-blockquote.css");