@tacc/core-styles 2.37.5 → 2.38.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tacc/core-styles",
-  "version": "2.37.5",
+  "version": "2.38.0",
   "license": "MIT",
   "author": "TACC COA CMD <coa-cmd@tacc.utexas.edu>",
   "contributors": [

package/src/lib/_imports/branding_logos.css

@@ -14,10 +14,8 @@
   align-items: center;
   justify-content: center;
 
-  /* This prevents header bar resize when branding is dynamically added */
-  /* CAVEAT: This is only for Portal and Docs which dynamically load content */
-  /* FAQ: Do not use `48.78px`, because Safari only accepts whole numbers */
-  height: 49px;
+  /* To prevent header bar resize when content is dynamically added */
+  height: 50px;
 
   background-color: var(--global-color-primary--xx-dark);
   color: var(--global-color-primary--xx-light);
@@ -63,9 +61,8 @@
 /* Logo Selectors  */
 
 .portal-logo {
-  float: left;
-  height: 40px;
-  margin: 0;
-  padding: 0;
-  border: none;
+  height: 100%;
+}
+img.portal-logo {
+  border-style: none; /* no effect if Bootstrap is loaded */
 }

package/src/lib/_imports/components/c-show-more/c-show-more--generated.hbs

@@ -0,0 +1,116 @@
+<script type="module">
+  import { generateMarkup } from '../raw/c-show-more/c-show-more.js';
+
+  generateMarkup(document.querySelectorAll(
+    'p.js-show-more--one-line:not(.js-show-more--link)'
+  ), {
+    startIndex: 0
+  });
+
+  generateMarkup(document.querySelectorAll(
+    'p.js-show-more--one-line.js-show-more--link'
+  ), {
+    shouldToggleResembleLink: true,
+    startIndex: 10
+  });
+
+  generateMarkup(document.querySelectorAll(
+    'p.js-show-more--many-lines:not(.js-show-more--link)'
+  ), {
+    lines: 3,
+    startIndex: 20
+  });
+
+  generateMarkup(document.querySelectorAll(
+    'p.js-show-more--many-lines.js-show-more--link'
+  ), {
+    lines: 3,
+    shouldToggleResembleLink: true,
+    startIndex: 30
+  });
+</script>
+
+<h3>Using Generated Markup</h3>
+<p>JavaScript will convert static markup into a full component structure.</p>
+
+<dl>
+  <dt>One Line Example</dt>
+  <dd>
+    <dl>
+      <dt>Default:</dt>
+      <dd>
+        <dl>
+          <dt>Input:</dt>
+          <dd>
+            <pre><code>&lt;p class="js-show-more--one-line"&gt;
+  This is a JavaScript-enhanced single line example that will be truncated with an ellipsis. The markup is simpler, and the JavaScript will convert it to the full component structure. Lorem ipsum dolor sit amet, consectetur adipiscing elit.
+&lt;/p&gt;</code></pre>
+          </dd>
+          <dt>Output:</dt>
+          <dd>
+            <p class="js-show-more--one-line">
+              This is a JavaScript-enhanced single line example that will be truncated with an ellipsis. The markup is simpler, and the JavaScript will convert it to the full component structure. Lorem ipsum dolor sit amet, consectetur adipiscing elit.
+            </p>
+          </dd>
+        </dl>
+      </dd>
+      <dt>With Link-Style Toggle:</dt>
+      <dd>
+        <dl>
+          <dt>Input:</dt>
+          <dd>
+            <pre><code>&lt;p class="js-show-more--one-line js-show-more--link"&gt;
+  This is a JavaScript-enhanced single line example that will be truncated with an ellipsis. The markup is simpler, and the JavaScript will convert it to the full component structure. Lorem ipsum dolor sit amet, consectetur adipiscing elit.
+&lt;/p&gt;</code></pre>
+          </dd>
+          <dt>Output:</dt>
+          <dd>
+            <p class="js-show-more--one-line js-show-more--link">
+              This is a JavaScript-enhanced single line example that will be truncated with an ellipsis. The markup is simpler, and the JavaScript will convert it to the full component structure. Lorem ipsum dolor sit amet, consectetur adipiscing elit.
+            </p>
+          </dd>
+        </dl>
+      </dd>
+    </dl>
+  </dd>
+
+  <dt>Many Lines Example</dt>
+  <dd>
+    <dl>
+      <dt>Default:</dt>
+      <dd>
+        <dl>
+          <dt>Input:</dt>
+          <dd>
+            <pre><code>&lt;p class="js-show-more--many-lines"&gt;
+  This is a JavaScript-enhanced multi-line example. The markup starts simple, then JavaScript builds the full component structure. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
+&lt;/p&gt;</code></pre>
+          </dd>
+          <dt>Output:</dt>
+          <dd>
+            <p class="js-show-more--many-lines">
+              This is a JavaScript-enhanced multi-line example. The markup starts simple, then JavaScript builds the full component structure. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
+            </p>
+          </dd>
+        </dl>
+      </dd>
+      <dt>With Link-Style Toggle:</dt>
+      <dd>
+        <dl>
+          <dt>Input:</dt>
+          <dd>
+            <pre><code>&lt;p class="js-show-more--many-lines js-show-more--link"&gt;
+  This is a JavaScript-enhanced multi-line example. The markup starts simple, then JavaScript builds the full component structure. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
+&lt;/p&gt;</code></pre>
+          </dd>
+          <dt>Output:</dt>
+          <dd>
+            <p class="js-show-more--many-lines js-show-more--link">
+              This is a JavaScript-enhanced multi-line example. The markup starts simple, then JavaScript builds the full component structure. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
+            </p>
+          </dd>
+        </dl>
+      </dd>
+    </dl>
+  </dd>
+</dl>

package/src/lib/_imports/components/c-show-more/c-show-more.hbs

@@ -0,0 +1,68 @@
+<h3>Using Generated Markup</h3>
+<p>JavaScript will convert static markup into a full component structure.</p>
+
+<dl>
+  <dt>One Line Example</dt>
+  <dd>
+    <dl>
+      <dt>Default:</dt>
+      <dd>
+        <p class="c-show-more c-show-more--one-line">
+          <input type="checkbox" class="c-show-more__state" id="show-more-1">
+          <span class="c-show-more__target">
+            This is a single line of text that will be truncated with an ellipsis when it gets too long for its container width. The full text will be revealed when you click "Show More".
+          </span>
+          <label class="c-show-more__toggle" for="show-more-1">
+            <span class="c-show-more__on-text">Show More</span>
+            <span class="c-show-more__off-text">Show Less</span>
+          </label>
+        </p>
+      </dd>
+      <dt>With Link-Style Toggle:</dt>
+      <dd>
+        <p class="c-show-more c-show-more--one-line">
+          <input type="checkbox" class="c-show-more__state" id="show-more-2">
+          <span class="c-show-more__target">
+            This is a single line of text that will be truncated with an ellipsis when it gets too long for its container width. The full text will be revealed when you click "Show More".
+          </span>
+          <label class="c-show-more__toggle" for="show-more-2">
+            <span class="x-link c-show-more__on-text">Show More</span>
+            <span class="x-link c-show-more__off-text">Show Less</span>
+          </label>
+        </p>
+      </dd>
+    </dl>
+  </dd>
+
+  <dt>Many Lines Example</dt>
+  <dd>
+    <dl>
+      <dt>Default:</dt>
+      <dd>
+        <p class="c-show-more c-show-more--many-lines">
+          <input type="checkbox" class="c-show-more__state" id="show-more-3">
+          <span class="c-show-more__target">
+            This is a JavaScript-enhanced multi-line example. The markup starts simple, then JavaScript builds the full component structure. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
+          </span>
+          <label class="c-show-more__toggle" for="show-more-3">
+            <span class="c-show-more__on-text">Show More</span>
+            <span class="c-show-more__off-text">Show Less</span>
+          </label>
+        </p>
+      </dd>
+      <dt>With Link-Style Toggle:</dt>
+      <dd>
+        <p class="c-show-more c-show-more--many-lines">
+          <input type="checkbox" class="c-show-more__state" id="show-more-4">
+          <span class="c-show-more__target">
+            This is a JavaScript-enhanced multi-line example. The markup starts simple, then JavaScript builds the full component structure. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
+          </span>
+          <label class="c-show-more__toggle" for="show-more-4">
+            <span class="x-link c-show-more__on-text">Show More</span>
+            <span class="x-link c-show-more__off-text">Show Less</span>
+          </label>
+        </p>
+      </dd>
+    </dl>
+  </dd>
+</dl>

package/src/lib/_imports/components/c-show-more/c-show-more.js

@@ -0,0 +1,72 @@
+export const defaults = {
+  elements: document.querySelectorAll(`
+    [class*="js-show-more"]
+  `),
+  options: {
+    lines: 0,
+    targetTag: 'span',
+    shouldToggleResembleLink: false,
+    startIndex: 0,
+  },
+};
+
+/**
+ * Convert elements with js-show-more--* classes into show-more components
+ */
+export function generateMarkup(
+  elements = defaults.elements,
+  options = defaults.options
+) {
+  options = { ...defaults.options, ...options };
+
+  [...elements].forEach((element, index) => {
+    if (element.querySelector('p, div, section, article, aside, nav, header, hgroup, footer, main')) {
+      console.warn(
+        'A "c-show-more" component expects only text and inline elements. Block elements may not truncate correctly. Consider restructuring content to avoid block elements.',
+        element
+      );
+    }
+
+    const wrapper = document.createElement(element.tagName);
+    wrapper.className = element.className;
+    wrapper.classList.add('c-show-more');
+    wrapper.classList.add(`c-show-more--${options.lines <= 1 ? 'one-line' : 'many-lines'}`);
+
+    const checkbox = document.createElement('input');
+    checkbox.type = 'checkbox';
+    checkbox.className = 'c-show-more__state';
+    checkbox.id = `show-more-${options.startIndex + index}`;
+
+    const target = document.createElement(options.targetTag);
+    target.className = 'c-show-more__target';
+    target.innerHTML = element.innerHTML;
+    if (options.lines) {
+      target.style.setProperty('--lines', options.lines);
+    }
+
+    const toggle = document.createElement('label');
+    toggle.className = 'c-show-more__toggle';
+    toggle.htmlFor = checkbox.id;
+
+    const onText = document.createElement('span');
+    onText.className =
+      `${options.shouldToggleResembleLink ? 'x-link ' : ''}`
+      + 'c-show-more__on-text';
+    onText.textContent = 'Show More';
+
+    const offText = document.createElement('span');
+    offText.className =
+      `${options.shouldToggleResembleLink ? 'x-link ' : ''}`
+      + 'c-show-more__off-text';
+    offText.textContent = 'Show Less';
+
+    toggle.appendChild(onText);
+    toggle.appendChild(offText);
+
+    wrapper.appendChild(checkbox);
+    wrapper.appendChild(target);
+    wrapper.appendChild(toggle);
+
+    element.replaceWith(wrapper);
+  });
+}

package/src/lib/_imports/components/c-show-more/config.yml

@@ -0,0 +1,9 @@
+status: wip
+context:
+  shouldSkipPattern: false
+  📝 shouldSkipPattern: because core-styles.….css does not import this
+variants:
+  - name: default
+    label: Static Markup
+  - name: generated
+    label: Generated Markup

package/src/lib/_imports/components/c-show-more/readme.md

@@ -0,0 +1,2 @@
+- Will show more text when the user clicks the toggle.
+- Will show less text when the user clicks the toggle again.

package/src/lib/_imports/components/c-show-more.css

@@ -13,6 +13,7 @@ Styleguide: Components.ShowMore
 */
 @import url("../tools/x-truncate.css");
 
+
 /* Truncation */
 
 /* Many Lines */
@@ -26,11 +27,14 @@ Styleguide: Components.ShowMore
 /* One Line */
 .c-show-more--one-line .c-show-more__target {
   @mixin truncate--one-line;
+
+  display: block;
 }
 .c-show-more--one-line .c-show-more__state:checked ~ .c-show-more__target {
   @mixin untruncate--one-line;
 }
 
+
 /* Show More / Show Less */
 
 /* State */
@@ -44,6 +48,7 @@ Styleguide: Components.ShowMore
   display: block;
 }
 
+
 /* Toggle */
 .c-show-more__toggle {
   cursor: pointer;

package/src/lib/_imports/trumps/_s-cms-nav/_s-cms-nav.hbs

@@ -7,26 +7,10 @@ from https://frontera-portal.tacc.utexas.edu/. It has:
 - extra markup (`a > span`)
 -->
 <ul class="s-cms-nav navbar-nav mr-auto">
-  <li class="nav-item active">
-    <a class="nav-link" href="/"><span>Frontera</span></a>
-  </li>
-
-  <li class="nav-item">
-    <a class="nav-link" href="/training/"><span>Training</span></a>
-  </li>
-
   <li class="nav-item">
     <a class="nav-link" href="/user-guide/"><span>User Guide</span></a>
   </li>
 
-  <li class="nav-item">
-    <a class="nav-link" href="/allocations/"><span>Allocations</span></a>
-  </li>
-
-  <li class="nav-item">
-    <a class="nav-link" href="/fellowship/"><span>Fellowships</span></a>
-  </li>
-
   <li class="nav-item">
     <a class="nav-link" href="/news/"><span>News</span></a>
   </li>

package/src/lib/_imports/trumps/s-header/config.yml

@@ -5,7 +5,9 @@ context:
     - ../../assets/core-styles.header.css
     - ../../assets/core-styles.theme.default.css
 variants:
+  - name: default
+    hidden: true
   - name: with-branding
     label: With Branding
-  - name: default
-    label: Without Branding
+  - name: different-logos
+    label: Different Logos

package/src/lib/_imports/trumps/s-header/s-header--different-logos.hbs

@@ -0,0 +1,7 @@
+<dl>
+  <dt>Wide Vector Logo</dt>
+  <dd>{{> @s-header isSVGLogo=true id="wide-vector"}}</dd>
+
+  <dt>Narrow Raster Logo</dt>
+  <dd>{{> @s-header isSVGLogo=false id="narrow-raster"}}</dd>
+</dl>

package/src/lib/_imports/trumps/s-header/s-header.hbs

@@ -1,14 +1,22 @@
 <nav id="s-header" class="s-header navbar navbar-expand-lg navbar-dark">
   <a class="navbar-brand" href="/">
-    <img src="http://cep.tacc.utexas.edu/static/site_cms/img/org_logos/portal.png" alt="Portal Logo"
-      class="nav-logo-double nav-logo-frontera-double" />
+    <img
+      {{#if isSVGLogo}}
+        src="https://cdn.jsdelivr.net/gh/TACC/Core-CMS-Custom@21da26d/digitalrocks_assets/NSF-DigitalRocks-Logo-White.svg"
+        alt="Vector Logo"
+      {{else}}
+        src="http://cep.tacc.utexas.edu/static/site_cms/img/org_logos/portal.png"
+        alt="Raster Logo"
+      {{/if}}
+      class="portal-logo"
+    />
   </a>
-  <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarsExpandTarget"
-    aria-controls="navbarsExpandTarget" aria-expanded="false" aria-label="Toggle navigation">
+  <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarExpandTarget-{{default id 0}}"
+    aria-controls="navbarExpandTarget-{{default id 0}}" aria-expanded="false" aria-label="Toggle navigation">
     <span class="navbar-toggler-icon"></span>
   </button>
 
-  <div class="collapse navbar-collapse" id="navbarsExpandTarget">
+  <div class="collapse navbar-collapse" id="navbarExpandTarget-{{default id 0}}">
     {{> @s-cms-nav}} {{> @s-portal-nav}}
   </div>
 </nav>

package/src/lib/_imports/trumps/s-header.css

@@ -18,12 +18,12 @@ Styleguide Trumps.Scopes.Header
 @import url("../tools/media-queries.css");
 @import url("./s-header.bootstrap.css");
 
-/* WARNING: NO-R/EM: Until Frontera CMS drops Bootstrap 3.7.1 (for old design)…
-            `em` nor `rem` was not allowed because results were not consistent.
-            UPDATE: As of PR #312, this has likely changed (untested). */
+/* WARNING: NO-R/EM: CMS uses 1rem = 10px, but Portal uses 1rem = 16px */
 
 .s-header {
+  --height: 50px;
   --header-major-border-width: 1px;
+
   font-size: var(--global-font-size--medium); /* NO-R/EM: Overwrite `bootstrap.3.3.7.css` */
   font-weight: var(--bold);
   letter-spacing: 0.025px; /* 14px * 0.025em equals design-requested 0.35px */
@@ -43,6 +43,19 @@ Styleguide Trumps.Scopes.Header
   border-bottom: var(--header-major-border-width) solid var(--header-major-border-color);
 }
 
+/* To prevent header bar resize whether:
+  - navbar is collapsed or expanded
+  - logo is wide or narrow
+  - logo is raster or vector
+*/
+.s-header .navbar-brand {
+  height: calc(
+    var(--height)
+    - var(--nav-padding-vert) * 2
+    - var(--header-major-border-width)
+  );
+}
+
 /* Affiliation */
 
 /* SEE: ../branding_logos.css */
@@ -50,17 +63,13 @@ Styleguide Trumps.Scopes.Header
 /* Logo */
 
 .s-header .navbar-brand {
-  display: grid;
-  align-content: center;
-
-  /* If branding is short enough, then align position of first CMS nav link with Portal "Dashboard" header */
-  /* WARNING: This is a manual value; if Portal interface changes, then this may need to change */
-  min-width: 176px;
-  margin-right: 16px; /* NO-R/EM: 1rem (from Bootstrap via `.navbar-brand`) */
-  padding: 0;
+  /* To align first CMS nav link with Portal "Dashboard" header */
+  /* CAVEAT: A wide logo will shift first CMS nav link rightward */
+  flex-shrink: 0;
+  flex-basis: 175px;
+  margin-right: 15px; /* NO-R/EM: 1rem (from Bootstrap via `.navbar-brand`) */
 
-  color: var(--header-text-color);
-  /* text-decoration: none; */ /* already provided by Bootstrap */
+  padding: unset;
 }
 
 /* Navigation */
@@ -71,7 +80,7 @@ Styleguide Trumps.Scopes.Header
     align-items: stretch;
 }
 
-.s-header.navbar {
+.s-header {
   /* Make horizontal padding match the horizontal content buffer in Portal */
   /* FAQ: The `calc()` keeps track of disparate source of space values */
   /* `16px` = `1rem` from Portal (via `#sidebar .nav-content`) */
@@ -82,17 +91,6 @@ Styleguide Trumps.Scopes.Header
   background-color: var(--header-bkgd-color);
   padding: var(--nav-padding-vert) var(--nav-padding-horz);
 }
-/* On wide viewport, prevent header resize from dynamic content */
-@media (--medium-and-above) {
-  .s-header.navbar {
-    --logo-height: 60px;
-
-    min-height: var(--logo-height);
-  }
-  .s-header > .navbar-brand {
-    min-height: calc( var(--logo-height) - var(--nav-padding-vert) * 2 );
-  }
-}
 
 /* Navigation: Links */