Merge pull request #4 from reedcodes/20231120-wpam-updates

reedcodes · web-flow · commit 31e0e256ae25 · 2023-11-20T01:00:46.000-05:00
refresh content
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -3,10 +3,10 @@
   "version": "2.0.0",
   "description": "Sample KSS",
   "devDependencies": {
-    "a11y-color-tokens": "^0.6.0",
+    "a11y-color-tokens": "^0.7.0",
     "kss": "^3.1.0",
     "npm-run-all": "^4.1.5",
-    "sass": "^1.55.0"
+    "sass": "^1.69.5"
   },
   "scripts": {
     "color-tokens": "a11y-color-tokens --outputDirPath='./src/color' --colorTokensPath='./config/color-tokens.js'",
diff --git a/src/card/card.json b/src/card/card.json
@@ -1,6 +1,6 @@
 {
-  "card_heading": "Scelerisque nam eros parturient",
-  "card_description": "Bibendum parturient laoreet a a purus augue hac vestibulum ac sociosqu felis integer.",
-  "card_link_text": "A ut parturient",
-  "card_link_url": "index.html"
+  "card_heading": "Posttextual conceptualism",
+  "card_description": "Lacan uses the term ‘posttextual conceptualism’ to denote the difference between society and sexual identity.",
+  "card_link_text": "Neodialectic conceptual theory",
+  "card_link_url": "https://example.com/"
 }
diff --git a/src/card/card.twig b/src/card/card.twig
@@ -1,16 +1,14 @@
 <div class="card">
-  {% if card_heading %}
-    {% include "@text/heading.twig" with {
-      heading_level: 3,
-      heading_text: card_heading
-    } %}
-  {% endif %}
+  {%- include "@text/heading.twig" with {
+    heading_level: 3,
+    heading_text: card_heading
+  } -%}
 
-  {% include "@text/paragraph.twig" with { paragraph_text: card_description } %}
+  {%- include "@text/paragraph.twig" with { paragraph_text: card_description } -%}
 
-  {% include "@link/link.twig" with {
+  {%- include "@link/link.twig" with {
     modifier_class: "cta-link",
     link_text: card_link_text,
     link_url: card_link_url
-  } %}
+  } -%}
 </div>
diff --git a/src/layout/_index.scss b/src/layout/_index.scss
@@ -94,7 +94,7 @@
 //
 // A search bar is an input field that can find content across the site.
 //
-// Markup: eg-search.twig
+// Markup: search.twig
 //
 // Weight: 3
 //
diff --git a/src/layout/card-grid.json b/src/layout/card-grid.json
@@ -1,22 +1,22 @@
 {
   "cards": [
     {
-      "card_heading": "Scelerisque nam eros",
-      "card_description": "Bibendum parturient laoreet a a purus augue hac vestibulum ac sociosqu felis integer.",
-      "card_link_text": "A ut parturient",
-      "card_link_url": "#"
+      "card_heading": "Subtextual theory",
+      "card_description": "Sartre promotes the use of subtextual theory to deconstruct class.",
+      "card_link_text": "Semiotic rationalism",
+      "card_link_url": "https://example.com/"
     },
     {
-      "card_heading": "Platea erat suspendisse",
-      "card_description": "Id cubilia scelerisque eu dictum enim mus suscipit a dignissim rutrum id sagittis lacinia ac etiam.",
-      "card_link_text": "Netus lacinia in aliquet",
-      "card_link_url": "#"
+      "card_heading": "Subcultural narrative",
+      "card_description": "Bataille suggests the use of subcultural narrative to attack outmoded perceptions of sexual identity.",
+      "card_link_text": "Semiotic rationalism",
+      "card_link_url": "https://example.com/"
     },
     {
-      "card_heading": "Leo imperdiet nascetur",
-      "card_description": "Dui scelerisque nullam adipiscing mi condimentum a laoreet mus tempor libero sagittis adipiscing.",
-      "card_link_text": "Potenti placerat nec",
-      "card_link_url": "#"
+      "card_heading": "Postcultural situationism",
+      "card_description": "A number of theories concerning poststructuralist situationism may be found.",
+      "card_link_text": "Semiotic rationalism",
+      "card_link_url": "https://example.com/"
     }
   ]
 }
diff --git a/src/layout/eg-search.twig b/src/layout/eg-search.twig
diff --git a/src/layout/footer.json b/src/layout/footer.json
@@ -1,3 +1,3 @@
 {
-  "site_title": "Cool University Website"
+  "site_title": "Dialectic Narrative"
 }
diff --git a/src/layout/footer.twig b/src/layout/footer.twig
@@ -1,5 +1,5 @@
 {%- set footer_aria_label = footer_aria_label | default( "global information" ) -%}
 
-<footer class="footer" aria-label="{{footer_aria_label}}">
-  <p class="footer-copyright">© {{"now"| date( "Y" )}} {{site_title}}</p>
+<footer class="footer" aria-label="{{- footer_aria_label -}}">
+  <p class="footer-copyright">© {{ "now" | date( "Y" ) }} {{ site_title -}}</p>
 </footer>
diff --git a/src/layout/header.json b/src/layout/header.json
@@ -1,4 +1,4 @@
 {
-  "site_title": "Cool University Website",
-  "site_url": "#"
+  "site_title": "Dialectic Narrative",
+  "site_url": "https://example.com/"
 }
diff --git a/src/layout/header.twig b/src/layout/header.twig
@@ -1,14 +1,9 @@
 {%- set header_aria_label = header_aria_label | default( "global site" ) -%}
 
-{%- set site_title_text -%}
-  <span class="site-title-logo">{%- include "@icons/grad-cap.svg" -%}</span>
-  <span class="site-title-text">{{site_title}}</span>
-{%- endset -%}
-
-<header class="header" aria-label="{{header_aria_label}}">
+<header class="header" aria-label="{{- header_aria_label -}}">
   <h1 class="site-title">
     {%- include "@link/link.twig" with {
-      link_text: site_title_text,
+      link_text: site_title,
       link_url: site_url
     } -%}
   </h1>
diff --git a/src/layout/nav.json b/src/layout/nav.json
@@ -1,16 +1,16 @@
 {
   "nav": [
     {
-      "title": "Parturient",
-      "link": "#"
+      "title": "Lacan",
+      "link": "https://example.com/"
     },
     {
-      "title": "Lacinia",
-      "link": "#"
+      "title": "DeBord",
+      "link": "https://example.com/"
     },
     {
-      "title": "Aliquet",
-      "link": "#"
+      "title": "Baudrillard",
+      "link": "https://example.com/"
     }
   ]
 }
diff --git a/src/layout/nav.twig b/src/layout/nav.twig
@@ -1,6 +1,6 @@
 {%- set nav_aria_label = nav_aria_label | default( "global main" ) -%}
 
-<nav class="nav" aria-label="{{nav_aria_label}}">
+<nav class="nav" aria-label="{{- nav_aria_label -}}">
   <ul class="nav-list" role="list">
     {%- for item in nav -%}
       <li class="nav-item">{%- include "@link/link.twig" with {
diff --git a/src/layout/search.json b/src/layout/search.json
@@ -0,0 +1,4 @@
+{
+  "search_name": "search-form",
+  "search_action": "#"
+}
diff --git a/src/layout/search.twig b/src/layout/search.twig
@@ -1,4 +1,4 @@
-<form class="search" name="{{search_name}}" {% if search_id %} id="{{search_id}}" {% endif %} role="search" method="{{search_method | default("get") }}" action="{{search_action}}">
+<form class="search" name="{{- search_name -}}" {% if search_id %} id="{{- search_id -}}" {% endif %} role="search" method="{{- search_method | default("get") -}}" action="{{- search_action -}}">
   {% include "@form/input.twig" with {
     input_type: "text",
     input_label: search_input_label | default("Search this site"),
diff --git a/src/link/_index.scss b/src/link/_index.scss
@@ -8,7 +8,7 @@
 // .cta-link:hover - hover state for CTA links
 // .cta-link:focus - focus state for CTA links
 //
-// Markup: eg-link.twig
+// Markup: link.twig
 //
 // Weight: 3
 //
@@ -18,12 +18,15 @@ a {
   color: var(--color-link, var(--color-primary));
   background-color: var(--color-link-bg, transparent);
 
+  &.pseudo-class-hover,
+  &.pseudo-class-focus,
   &:hover,
   &:focus {
     color: var(--color-link-on, var(--color-on-background));
     background-color: var(--color-link-bg-on, transparent);
   }
 
+  &.pseudo-class-focus,
   &:focus {
     outline-width: var(--outline-link-width, max( 2px, 0.08em ));
     outline-style: solid;
@@ -45,6 +48,7 @@ a {
   letter-spacing: 0.05em;
   text-decoration: none;
 
+  &.pseudo-class-focus,
   &:focus {
     outline: 0;
     box-shadow: 0 0 0 0.2em var(--color-link-on),
diff --git a/src/link/eg-link.twig b/src/link/eg-link.twig
diff --git a/src/link/link.json b/src/link/link.json
@@ -0,0 +1,4 @@
+{
+  "link_text": "Neodialectic conceptual theory",
+  "link_url": "https://example.com/"
+}
diff --git a/src/text/_index.scss b/src/text/_index.scss
@@ -10,7 +10,7 @@
 //
 // **Heading content** defines the header of a section (whether explicitly marked up using sectioning content elements, or implied by the heading content itself). ([from the HTML living standard](https://html.spec.whatwg.org/multipage/dom.html#heading-content))
 //
-// Markup: eg-heading.twig
+// Markup: heading.twig
 //
 // Weight: 1
 //
@@ -26,7 +26,7 @@
 //
 // A **paragraph** is typically a run of phrasing content that forms a block of text with one or more sentences that discuss a particular topic, as in typography, but can also be used for more general thematic grouping. ([from the HTML living standard](https://html.spec.whatwg.org/multipage/dom.html#paragraph))
 //
-// Markup: eg-paragraph.twig
+// Markup: paragraph.twig
 //
 // Weight: 2
 //
diff --git a/src/text/eg-heading.twig b/src/text/eg-heading.twig
diff --git a/src/text/eg-paragraph.twig b/src/text/eg-paragraph.twig
diff --git a/src/text/heading.json b/src/text/heading.json
@@ -0,0 +1,3 @@
+{
+  "heading_text": "Neodialectic conceptual theory"
+}
diff --git a/src/text/heading.twig b/src/text/heading.twig
@@ -1,3 +1,5 @@
 {%- set heading_level = heading_level | default(2) -%}
 
-<h{{heading_level}} {% if heading_id %}id="{{heading_id}}"{% endif %} class="text-heading {{modifier_class}}">{{heading_text}}</h{{heading_level}}>
+<h{{heading_level}} class="text-heading">
+  {{heading_text}}
+</h{{heading_level}}>
diff --git a/src/text/paragraph.json b/src/text/paragraph.json
@@ -0,0 +1,3 @@
+{
+  "paragraph_text": "Foucault’s critique of neodialectic conceptual theory states that art is capable of significant form."
+}

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`		`- "card_heading": "Scelerisque nam eros parturient",`
`3`		`- "card_description": "Bibendum parturient laoreet a a purus augue hac vestibulum ac sociosqu felis integer.",`
`4`		`- "card_link_text": "A ut parturient",`
`5`		`- "card_link_url": "index.html"`
	`2`	`+ "card_heading": "Posttextual conceptualism",`
	`3`	`+ "card_description": "Lacan uses the term ‘posttextual conceptualism’ to denote the difference between society and sexual identity.",`
	`4`	`+ "card_link_text": "Neodialectic conceptual theory",`
	`5`	`+ "card_link_url": "https://example.com/"`
`6`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,22 +1,22 @@`
`1`	`1`	`{`
`2`	`2`	`"cards": [`
`3`	`3`	`{`
`4`		`- "card_heading": "Scelerisque nam eros",`
`5`		`- "card_description": "Bibendum parturient laoreet a a purus augue hac vestibulum ac sociosqu felis integer.",`
`6`		`- "card_link_text": "A ut parturient",`
`7`		`- "card_link_url": "#"`
	`4`	`+ "card_heading": "Subtextual theory",`
	`5`	`+ "card_description": "Sartre promotes the use of subtextual theory to deconstruct class.",`
	`6`	`+ "card_link_text": "Semiotic rationalism",`
	`7`	`+ "card_link_url": "https://example.com/"`
`8`	`8`	`},`
`9`	`9`	`{`
`10`		`- "card_heading": "Platea erat suspendisse",`
`11`		`- "card_description": "Id cubilia scelerisque eu dictum enim mus suscipit a dignissim rutrum id sagittis lacinia ac etiam.",`
`12`		`- "card_link_text": "Netus lacinia in aliquet",`
`13`		`- "card_link_url": "#"`
	`10`	`+ "card_heading": "Subcultural narrative",`
	`11`	`+ "card_description": "Bataille suggests the use of subcultural narrative to attack outmoded perceptions of sexual identity.",`
	`12`	`+ "card_link_text": "Semiotic rationalism",`
	`13`	`+ "card_link_url": "https://example.com/"`
`14`	`14`	`},`
`15`	`15`	`{`
`16`		`- "card_heading": "Leo imperdiet nascetur",`
`17`		`- "card_description": "Dui scelerisque nullam adipiscing mi condimentum a laoreet mus tempor libero sagittis adipiscing.",`
`18`		`- "card_link_text": "Potenti placerat nec",`
`19`		`- "card_link_url": "#"`
	`16`	`+ "card_heading": "Postcultural situationism",`
	`17`	`+ "card_description": "A number of theories concerning poststructuralist situationism may be found.",`
	`18`	`+ "card_link_text": "Semiotic rationalism",`
	`19`	`+ "card_link_url": "https://example.com/"`
`20`	`20`	`}`
`21`	`21`	`]`
`22`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`{`
`2`		`- "site_title": "Cool University Website"`
	`2`	`+ "site_title": "Dialectic Narrative"`
`3`	`3`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`	`1`	`{`
`2`		`- "site_title": "Cool University Website",`
`3`		`- "site_url": "#"`
	`2`	`+ "site_title": "Dialectic Narrative",`
	`3`	`+ "site_url": "https://example.com/"`
`4`	`4`	`}`