base/text->base/typography

canonical · Jun 17, 2024 · b2328b6 · b2328b6
1 parent 9cef121
commit b2328b6
Show file tree

Hide file tree

Showing 17 changed files with 51 additions and 51 deletions.
diff --git a/redirects.yaml b/redirects.yaml
@@ -54,14 +54,14 @@
 /docs/utilities/visualise-font-metrics: /docs/utilities/font-metrics
 /docs/utilities/no-margin: /docs/utilities/margin-collapse
 /docs/utilities/no-padding: /docs/utilities/margin-collapse
-/docs/examples/base/abbr: /docs/examples/base/text/abbr
-/docs/examples/base/blockquotes: /docs/examples/base/text/blockquotes
-/docs/examples/base/details: /docs/examples/base/text/details
-/docs/examples/base/font-weights: /docs/examples/base/text/font-weights
-/docs/examples/base/links: /docs/examples/base/text/links
-/docs/examples/base/pre: /docs/examples/base/text/pre
-/docs/examples/base/small: /docs/examples/base/text/small
-/docs/examples/base/strong: /docs/examples/base/text/strong
-/docs/examples/base/sub: /docs/examples/base/text/sub
-/docs/examples/base/sup: /docs/examples/base/text/sup
-/docs/examples/base/variable-font: /docs/examples/base/text/variable-font
+/docs/examples/base/abbr: /docs/examples/base/typography/abbr
+/docs/examples/base/blockquotes: /docs/examples/base/typography/blockquotes
+/docs/examples/base/details: /docs/examples/base/typography/details
+/docs/examples/base/font-weights: /docs/examples/base/typography/font-weights
+/docs/examples/base/links: /docs/examples/base/typography/links
+/docs/examples/base/pre: /docs/examples/base/typography/pre
+/docs/examples/base/small: /docs/examples/base/typography/small
+/docs/examples/base/strong: /docs/examples/base/typography/strong
+/docs/examples/base/sub: /docs/examples/base/typography/sub
+/docs/examples/base/sup: /docs/examples/base/typography/sup
+/docs/examples/base/variable-font: /docs/examples/base/typography/variable-font
diff --git a/templates/docs/base/code.md b/templates/docs/base/code.md
@@ -26,7 +26,7 @@ To create a pre-formatted block, use either `<pre>` (where preserving white spac
 
 **Pre-formatted block:**
 
-<div class="embedded-example"><a href="/docs/examples/base/text/pre/" class="js-example">
+<div class="embedded-example"><a href="/docs/examples/base/typography/pre/" class="js-example">
 View example of the base pre block
 </a></div>
 

diff --git a/templates/docs/base/typography.md b/templates/docs/base/typography.md
@@ -247,13 +247,13 @@ View example of the base definition list
 
 ## Blockquotes and citations
 
-<div class="embedded-example"><a href="/docs/examples/base/text/blockquotes/" class="js-example">
+<div class="embedded-example"><a href="/docs/examples/base/typography/blockquotes/" class="js-example">
 View example of the base blockquotes
 </a></div>
 
 ## Small text
 
-<div class="embedded-example"><a href="/docs/examples/base/text/small/" class="js-example">
+<div class="embedded-example"><a href="/docs/examples/base/typography/small/" class="js-example">
 View example of the small text
 </a></div>
 
@@ -314,33 +314,33 @@ Small caps style used to be implemented as extra small text variant with `.p-tex
 
 ## Strong text
 
-<div class="embedded-example"><a href="/docs/examples/base/text/strong/" class="js-example">
+<div class="embedded-example"><a href="/docs/examples/base/typography/strong/" class="js-example">
 View example of the strong text
 </a></div>
 
 ## Superscripted text
 
-<div class="embedded-example"><a href="/docs/examples/base/text/sup/" class="js-example">
+<div class="embedded-example"><a href="/docs/examples/base/typography/sup/" class="js-example">
 View example of the superscripted pattern
 </a></div>
 
 ## Subscripted text
 
-<div class="embedded-example"><a href="/docs/examples/base/text/sub/" class="js-example">
+<div class="embedded-example"><a href="/docs/examples/base/typography/sub/" class="js-example">
 View example of the subscripted pattern
 </a></div>
 
 ## Abbreviation
 
-<div class="embedded-example"><a href="/docs/examples/base/text/abbr/" class="js-example">
+<div class="embedded-example"><a href="/docs/examples/base/typography/abbr/" class="js-example">
 View example of the abbreviation pattern
 </a></div>
 
 ## Font weights
 
 If you are using the variable Ubuntu font, it comes in six weights; thin, light, regular, medium, bold and extra bold.
 
-<div class="embedded-example"><a href="/docs/examples/base/text/font-weights/" class="js-example">
+<div class="embedded-example"><a href="/docs/examples/base/typography/font-weights/" class="js-example">
 View example of the Ubuntu font weights.
 </a></div>
 

diff --git a/templates/docs/examples/base/text/combined.html b/templates/docs/examples/base/text/combined.html
diff --git a/templates/docs/examples/base/text/abbr.html → ...s/docs/examples/base/typography/abbr.html b/templates/docs/examples/base/text/abbr.html → ...s/docs/examples/base/typography/abbr.html
@@ -1,5 +1,5 @@
 {% extends "_layouts/examples.html" %}
-{% block title %}Abbreviation{% endblock %}
+{% block title %}Typography / Abbreviation{% endblock %}
 
 {% block standalone_css %}base{% endblock %}
 

diff --git a/.../docs/examples/base/text/blockquotes.html → ...examples/base/typography/blockquotes.html b/.../docs/examples/base/text/blockquotes.html → ...examples/base/typography/blockquotes.html
@@ -1,5 +1,5 @@
 {% extends "_layouts/examples.html" %}
-{% block title %}Blockquote{% endblock %}
+{% block title %}Typography / Blockquote{% endblock %}
 
 {% block standalone_css %}base{% endblock %}
 

diff --git a/templates/docs/examples/base/typography/combined.html b/templates/docs/examples/base/typography/combined.html
@@ -0,0 +1,20 @@
+{% extends "_layouts/examples.html" %}
+{% block title %}Typography / Combined{% endblock %}
+
+{% block standalone_css %}base{% endblock %}
+
+{% block content %}
+{% with is_combined = true %}
+<section>{% include 'docs/examples/base/typography/abbr.html' %}</section>
+<section>{% include 'docs/examples/base/typography/blockquotes.html' %}</section>
+<section>{% include 'docs/examples/base/typography/details.html' %}</section>
+<section>{% include 'docs/examples/base/typography/font-weights.html' %}</section>
+<section>{% include 'docs/examples/base/typography/links.html' %}</section>
+<section>{% include 'docs/examples/base/typography/pre.html' %}</section>
+<section>{% include 'docs/examples/base/typography/small.html' %}</section>
+<section>{% include 'docs/examples/base/typography/strong.html' %}</section>
+<section>{% include 'docs/examples/base/typography/sub.html' %}</section>
+<section>{% include 'docs/examples/base/typography/sup.html' %}</section>
+<section>{% include 'docs/examples/base/typography/variable-font.html' %}</section>
+{% endwith %}
+{% endblock %}
diff --git a/...ates/docs/examples/base/text/details.html → ...ocs/examples/base/typography/details.html b/...ates/docs/examples/base/text/details.html → ...ocs/examples/base/typography/details.html
@@ -1,5 +1,5 @@
 {% extends "_layouts/examples.html" %}
-{% block title %}Details{% endblock %}
+{% block title %}Typography / Details{% endblock %}
 
 {% block standalone_css %}base{% endblock %}
 

diff --git a/...docs/examples/base/text/font-weights.html → ...xamples/base/typography/font-weights.html b/...docs/examples/base/text/font-weights.html → ...xamples/base/typography/font-weights.html
@@ -1,5 +1,5 @@
 {% extends "_layouts/examples.html" %}
-{% block title %}Font weights{% endblock %}
+{% block title %}Typography / Font weights{% endblock %}
 
 {% block standalone_css %}base{% endblock %}
 

diff --git a/templates/docs/examples/base/text/links.html → .../docs/examples/base/typography/links.html b/templates/docs/examples/base/text/links.html → .../docs/examples/base/typography/links.html
@@ -1,5 +1,5 @@
 {% extends "_layouts/examples.html" %}
-{% block title %}Links{% endblock %}
+{% block title %}Typography / Links{% endblock %}
 
 {% block standalone_css %}base{% endblock %}
 

diff --git a/templates/docs/examples/base/text/pre.html → ...es/docs/examples/base/typography/pre.html b/templates/docs/examples/base/text/pre.html → ...es/docs/examples/base/typography/pre.html
@@ -1,5 +1,5 @@
 {% extends "_layouts/examples.html" %}
-{% block title %}Pre{% endblock %}
+{% block title %}Typography / Pre{% endblock %}
 
 {% block standalone_css %}base{% endblock %}
 

diff --git a/templates/docs/examples/base/text/small.html → .../docs/examples/base/typography/small.html b/templates/docs/examples/base/text/small.html → .../docs/examples/base/typography/small.html
@@ -1,5 +1,5 @@
 {% extends "_layouts/examples.html" %}
-{% block title %}Small text{% endblock %}
+{% block title %}Typography / Small text{% endblock %}
 
 {% block standalone_css %}base{% endblock %}
 

diff --git a/...lates/docs/examples/base/text/strong.html → ...docs/examples/base/typography/strong.html b/...lates/docs/examples/base/text/strong.html → ...docs/examples/base/typography/strong.html
@@ -1,5 +1,5 @@
 {% extends "_layouts/examples.html" %}
-{% block title %}Strong text{% endblock %}
+{% block title %}Typography / Strong text{% endblock %}
 
 {% block standalone_css %}base{% endblock %}
 

diff --git a/templates/docs/examples/base/text/sub.html → ...es/docs/examples/base/typography/sub.html b/templates/docs/examples/base/text/sub.html → ...es/docs/examples/base/typography/sub.html
@@ -1,5 +1,5 @@
 {% extends "_layouts/examples.html" %}
-{% block title %}Sub{% endblock %}
+{% block title %}Typography / Sub{% endblock %}
 
 {% block standalone_css %}base{% endblock %}
 

diff --git a/templates/docs/examples/base/text/sup.html → ...es/docs/examples/base/typography/sup.html b/templates/docs/examples/base/text/sup.html → ...es/docs/examples/base/typography/sup.html
@@ -1,5 +1,5 @@
 {% extends "_layouts/examples.html" %}
-{% block title %}Sup{% endblock %}
+{% block title %}Typography / Sup{% endblock %}
 
 {% block standalone_css %}base{% endblock %}
 

diff --git a/...ocs/examples/base/text/variable-font.html → ...amples/base/typography/variable-font.html b/...ocs/examples/base/text/variable-font.html → ...amples/base/typography/variable-font.html
@@ -1,5 +1,5 @@
 {% extends "_layouts/examples.html" %}
-{% block title %}Variable font{% endblock %}
+{% block title %}Typography / Variable font{% endblock %}
 
 {% block standalone_css %}base{% endblock %}
 

diff --git a/templates/docs/patterns/links/index.md b/templates/docs/patterns/links/index.md
@@ -10,7 +10,7 @@ Links are used to embed actions or pathways to more information, allowing users
 
 Default links are a color defined by the current theme.
 
-<div class="embedded-example"><a href="/docs/examples/base/text/links/" class="js-example">
+<div class="embedded-example"><a href="/docs/examples/base/typography/links/" class="js-example">
 View example of the default link pattern
 </a></div>