Skip to content

Commit 3a52f01

Browse files
authored
Merge pull request #9128 from github/repo-sync
repo sync
2 parents 7a972ab + fab8510 commit 3a52f01

16 files changed

+4
-286
lines changed

components/landing/ArticleList.tsx

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,7 @@ export const ArticleList = ({
4545
{articles.map((link) => {
4646
return (
4747
<li key={link.href} className={cx(variant === 'compact' && 'border-top')}>
48-
<Link
49-
href={link.href}
50-
className="link-with-intro Bump-link--hover no-underline d-block py-3"
51-
>
48+
<Link href={link.href} className="Bump-link--hover no-underline d-block py-3">
5249
<h4 className="link-with-intro-title">
5350
<span dangerouslySetInnerHTML={{ __html: link.title }} />
5451
<span className="Bump-link-symbol"></span>

includes/liquid-tags/link-as-article-card.html

Lines changed: 0 additions & 14 deletions
This file was deleted.

includes/liquid-tags/link-in-list.html

Lines changed: 0 additions & 1 deletion
This file was deleted.

includes/liquid-tags/link-with-intro.html

Lines changed: 0 additions & 4 deletions
This file was deleted.

includes/liquid-tags/link.html

Lines changed: 0 additions & 1 deletion
This file was deleted.

includes/liquid-tags/topic-link-in-list.html

Lines changed: 0 additions & 1 deletion
This file was deleted.

lib/liquid-tags/README.md

Lines changed: 1 addition & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ See also [contributing/liquid-helpers.md](../../contributing/liquid-helpers.md)
55
This directory contains custom Liquid tags for outputting dynamic content. These custom tags exist for a few reasons:
66

77
- Content and styling should be separated. Writers should not be concerned with writing or maintaining stylistic markup.
8-
- Writers should be able to create links by specifying the minimum amount of identifying information (an article href) and leave it to the site to dynamically inject that page's metadata like `title`, `intro`, etc.
98
- Content should be localized to match the current language.
109
- Styling and markup should be DRY and reusable.
1110

@@ -19,49 +18,13 @@ Tags can be used in:
1918
Tags always expect a single argument, a language agnostic href:
2019

2120
```html
22-
{% link_with_intro /getting-started-with-github-desktop %}
21+
{% data variables.product.product_name %}
2322
```
2423

25-
where the reference must be in the parent file, `content/desktop/index.md`, as it points to `content/desktop/getting-started-with-github-desktop`.
26-
27-
The href can also be an absolute path:
28-
29-
```html
30-
{% link_with_intro /desktop/getting-started-with-github-desktop %}
31-
```
32-
33-
where the reference can be in any file.
34-
35-
**Note:** Every href, whether relative or absolute, must start with a slash (`/`). Do not include `content` in the href.
36-
37-
The tag above will output this HTML for English pages:
38-
39-
```html
40-
<a class="link-with-intro Bump-link--hover no-underline" href="/en/desktop/getting-started-with-github-desktop">
41-
<h4 class="link-with-intro-title">Getting started with GitHub Desktop<span class="Bump-link-symbol">→</span></h4>
42-
</a>
43-
<p class="link-with-intro-intro">Get GitHub Desktop set up to manage your project work. Authenticate to GitHub.com or GitHub Enterprise Server, keep the app up-to-date, and review your preferred settings.</p>
44-
```
45-
46-
and this HTML for Spanish pages:
47-
48-
```html
49-
<a class="link-with-intro Bump-link--hover no-underline" href="/es/desktop/getting-started-with-github-desktop">
50-
<h4 class="link-with-intro-title">Comenzar con GitHub Desktop<span class="Bump-link-symbol">→</span></h4></a>
51-
<p class="link-with-intro-intro">Configura GitHub Desktop para administrar tu proyecto de trabajo. Autentícate en GitHub.com o en el Servidor de GitHub Enterprise, mantén la app actualizada y revisa tu configuración preferida.</p>
52-
```
53-
54-
Note that link tags will only render links that are available in the current page version (i.e. GitHub.com vs Enterprise), so it's not necessary to add Liquid conditionals around them.
55-
5624
## Supported tags
5725

5826
| Markup | Renders |
5927
| -- | -- |
60-
| `{% link /href %}` | The linked page's title, with no special styling.
61-
| `{% link_with_intro /href %}` | The linked page's title and intro.
62-
| `{% homepage_link_with_intro /href %}` | The linked page's title and intro, with homepage-specific styling.
63-
| `{% link_in_list /href %}` | The linked page's title in a list item.
64-
| `{% topic_link_in_list /href %}` | The linked map topic's title in a list item (used in category TOCs).
6528
| `{% indented_data_reference foo.bar spaces=NUMBER %}` | A data reference with the specified number of spaces prepended to each line. Defaults to 2 spaces if no spaces included. For example: `{% indented_data_reference reusables.pages.wildcard-dns-warning spaces=3 %}`
6629

6730
## Creating tags

lib/liquid-tags/homepage-link-with-intro.js

Lines changed: 0 additions & 3 deletions
This file was deleted.

lib/liquid-tags/link-as-article-card.js

Lines changed: 0 additions & 16 deletions
This file was deleted.

lib/liquid-tags/link-in-list.js

Lines changed: 0 additions & 2 deletions
This file was deleted.

0 commit comments

Comments
 (0)