From 46c16001c3c8ea88d26a12fbdc6e20869e3aff38 Mon Sep 17 00:00:00 2001 From: Kevin Heis Date: Tue, 13 Apr 2021 11:38:04 -0700 Subject: [PATCH] Upgrade Primer with translation shim for trashcan icon (#18735) * Revert "Revert "Upgrade Primer CSS to 16 (#18713)"" This reverts commit c01d3e302e972f7c7b273898d22a76dc7c5047df. * Add a hack to handle trashcan icon in translated content --- content/actions/index.md | 2 +- .../removing-workflow-artifacts.md | 4 +- content/actions/reference/environments.md | 2 +- content/discussions/index.md | 2 +- ...d-people-with-access-to-your-repository.md | 4 +- ...eleting-branches-within-your-repository.md | 2 +- .../deleting-files-in-a-repository.md | 2 +- ...n-azure-subscription-to-your-enterprise.md | 6 +- .../changing-your-primary-email-address.md | 2 +- ...collaborator-from-a-personal-repository.md | 2 +- content/graphql/overview/breaking-changes.md | 2 +- .../managing-contributors-and-teams.md | 6 +- .../managing-events.md | 2 +- ...access-to-an-organization-project-board.md | 2 +- includes/all-articles-category.html | 2 +- includes/all-articles-product.html | 4 +- includes/article-cards.html | 10 +-- includes/article-version-switcher.html | 6 +- includes/article.html | 8 +-- includes/breadcrumbs.html | 2 +- includes/code-example-card.html | 10 +-- includes/contribution.html | 4 +- includes/deprecation-banner.html | 2 +- includes/discussions-community-card.html | 4 +- includes/error-404-deprecation-message.html | 2 +- includes/featured-article.html | 2 +- includes/featured-link.html | 6 +- includes/featured-links.html | 4 +- includes/footer.html | 62 +++++++++---------- includes/graphql-arguments.html | 2 +- includes/graphql-deprecation.html | 2 +- includes/graphql-preview.html | 2 +- includes/guide-card.html | 4 +- includes/header-notification.html | 8 +-- includes/header-version-switcher.html | 6 +- includes/header.html | 16 ++--- includes/helpfulness.html | 12 ++-- includes/landing.html | 4 +- includes/learning-track-nav.html | 12 ++-- .../liquid-tags/link-as-article-card.html | 10 +-- includes/release-notes-category-label.html | 2 +- includes/rest_operation.html | 8 +-- includes/sidebar.html | 4 +- includes/small-footer.html | 2 +- includes/support-section.html | 2 +- javascripts/search.js | 8 +-- layouts/dev-toc.html | 4 +- layouts/enterprise-server-releases.html | 2 +- layouts/product-landing.html | 20 +++--- layouts/product-sublanding.html | 48 +++++++------- layouts/release-notes.html | 28 ++++----- lib/graphql/static/prerendered-objects.json | 12 ++-- lib/liquid-tags/extended-markdown.js | 8 +-- lib/liquid-tags/octicon.js | 3 + package-lock.json | 26 +++++--- package.json | 4 +- stylesheets/article.scss | 8 +-- stylesheets/directory.scss | 2 +- stylesheets/explorer.scss | 2 +- stylesheets/gradient.scss | 4 +- stylesheets/nav.scss | 10 +-- stylesheets/new-mktg.scss | 15 +---- stylesheets/overrides.scss | 47 +++++--------- stylesheets/product-landing.scss | 2 +- stylesheets/product-sublanding.scss | 29 ++++++++- stylesheets/release-notes.scss | 18 +++--- stylesheets/scroll-button.scss | 4 +- stylesheets/search.scss | 18 +++--- stylesheets/shadows.scss | 14 ++--- stylesheets/sidebar.scss | 18 +++--- stylesheets/syntax-highlighting.scss | 36 +++++------ stylesheets/tables.scss | 6 +- stylesheets/type.scss | 6 +- tests/browser/browser.js | 4 +- tests/rendering/breadcrumbs.js | 4 +- tests/rendering/server.js | 8 +-- tests/unit/liquid-helpers.js | 6 +- 77 files changed, 347 insertions(+), 341 deletions(-) diff --git a/content/actions/index.md b/content/actions/index.md index d32dfec985..f289ebb7f7 100644 --- a/content/actions/index.md +++ b/content/actions/index.md @@ -64,7 +64,7 @@ versions: -
+
{% octicon "search" width="24" %}

Sorry, there is no result for

It looks like we don't have an example that fits your filter.
Try another filter or add your code example

diff --git a/content/actions/managing-workflow-runs/removing-workflow-artifacts.md b/content/actions/managing-workflow-runs/removing-workflow-artifacts.md index a433c07caa..91b744887d 100644 --- a/content/actions/managing-workflow-runs/removing-workflow-artifacts.md +++ b/content/actions/managing-workflow-runs/removing-workflow-artifacts.md @@ -22,13 +22,13 @@ versions: {% data reusables.repositories.permissions-statement-write %} -{% data reusables.github-actions.artifact-log-retention-statement %} +{% data reusables.github-actions.artifact-log-retention-statement %} {% data reusables.repositories.navigate-to-repo %} {% data reusables.repositories.actions-tab %} {% data reusables.repositories.navigate-to-workflow %} {% data reusables.repositories.view-run %} -1. Under **Artifacts**, click {% octicon "trashcan" aria-label="The trashcan icon" %} next to the artifact you want to remove. +1. Under **Artifacts**, click {% octicon "trash" aria-label="The trash icon" %} next to the artifact you want to remove. {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@3.0" or currentVersion == "github-ae@latest" %} ![Delete artifact drop-down menu](/assets/images/help/repository/actions-delete-artifact-updated.png) {% else %} diff --git a/content/actions/reference/environments.md b/content/actions/reference/environments.md index ba6b5fca8c..aa3570397f 100644 --- a/content/actions/reference/environments.md +++ b/content/actions/reference/environments.md @@ -83,7 +83,7 @@ Deleting an environment will delete all secrets and protection rules associated {% data reusables.repositories.navigate-to-repo %} {% data reusables.repositories.sidebar-settings %} {% data reusables.github-actions.sidebar-environment %} -1. Next the the environment that you want to delete, click {% octicon "trashcan" aria-label="The trashcan icon" %}. +1. Next the the environment that you want to delete, click {% octicon "trash" aria-label="The trash icon" %}. 2. Click **I understand, delete this environment**. {% if currentVersion == "free-pro-team@latest" or currentVersion == "github-ae@next" or currentVersion ver_gt "enterprise-server@3.1" %}You can also delete environments through the REST API. For more information, see "[Environments](/rest/reference/repos#environments)."{% endif %} diff --git a/content/discussions/index.md b/content/discussions/index.md index 9974eb20a2..e0092dcbc1 100644 --- a/content/discussions/index.md +++ b/content/discussions/index.md @@ -47,7 +47,7 @@ versions: {% if discussionsCommunityExamples.length > 6 %} {% endif %} -
+
{% octicon "search" width="24" %}

Sorry, there is no result for

It looks like we don't have an example that fits your filter.
Try another filter or add your code example

diff --git a/content/github/administering-a-repository/managing-teams-and-people-with-access-to-your-repository.md b/content/github/administering-a-repository/managing-teams-and-people-with-access-to-your-repository.md index 8bd8f523fd..063be8cd39 100644 --- a/content/github/administering-a-repository/managing-teams-and-people-with-access-to-your-repository.md +++ b/content/github/administering-a-repository/managing-teams-and-people-with-access-to-your-repository.md @@ -52,8 +52,8 @@ For more information about repository permission levels, see "[Permission levels {% data reusables.repositories.navigate-to-repo %} {% data reusables.repositories.sidebar-settings %} {% data reusables.repositories.navigate-to-manage-access %} -4. Under "Manage access", find the team or person whose access you'd like to remove, then click {% octicon "trashcan" aria-label="The trashcan icon" %}. - ![Trashcan icon for removing access](/assets/images/help/repository/manage-access-remove.png) +4. Under "Manage access", find the team or person whose access you'd like to remove, then click {% octicon "trash" aria-label="The trash icon" %}. + ![trash icon for removing access](/assets/images/help/repository/manage-access-remove.png) ### Further reading diff --git a/content/github/collaborating-with-issues-and-pull-requests/creating-and-deleting-branches-within-your-repository.md b/content/github/collaborating-with-issues-and-pull-requests/creating-and-deleting-branches-within-your-repository.md index c7618f3507..0ac7f8a01c 100644 --- a/content/github/collaborating-with-issues-and-pull-requests/creating-and-deleting-branches-within-your-repository.md +++ b/content/github/collaborating-with-issues-and-pull-requests/creating-and-deleting-branches-within-your-repository.md @@ -37,7 +37,7 @@ If the branch you want to delete is associated with an open pull request, you mu {% data reusables.repositories.navigate-to-repo %} {% data reusables.repositories.navigate-to-branches %} -1. Scroll to the branch that you want to delete, then click {% octicon "trashcan" aria-label="The trashcan icon to delete the branch" %}. +1. Scroll to the branch that you want to delete, then click {% octicon "trash" aria-label="The trash icon to delete the branch" %}. ![delete the branch](/assets/images/help/branches/branches-delete.png) {% if currentVersion == "free-pro-team@latest" or currentVersion == "github-ae@latest" or currentVersion ver_gt "enterprise-server@2.21" %} diff --git a/content/github/managing-files-in-a-repository/deleting-files-in-a-repository.md b/content/github/managing-files-in-a-repository/deleting-files-in-a-repository.md index 163a2a447b..501ad2aaac 100644 --- a/content/github/managing-files-in-a-repository/deleting-files-in-a-repository.md +++ b/content/github/managing-files-in-a-repository/deleting-files-in-a-repository.md @@ -25,7 +25,7 @@ If the file{% if currentVersion == "free-pro-team@latest" or currentVersion ver_ ### Deleting a file 1. Browse to the file in your repository that you want to delete. -2. At the top of the file, click {% octicon "trashcan" aria-label="The trashcan icon" %}. +2. At the top of the file, click {% octicon "trash" aria-label="The trash icon" %}. {% data reusables.files.write_commit_message %} {% data reusables.files.choose-commit-email %} {% data reusables.files.choose_commit_branch %} diff --git a/content/github/setting-up-and-managing-your-enterprise/connecting-an-azure-subscription-to-your-enterprise.md b/content/github/setting-up-and-managing-your-enterprise/connecting-an-azure-subscription-to-your-enterprise.md index 97191e7ef8..9fade74df6 100644 --- a/content/github/setting-up-and-managing-your-enterprise/connecting-an-azure-subscription-to-your-enterprise.md +++ b/content/github/setting-up-and-managing-your-enterprise/connecting-an-azure-subscription-to-your-enterprise.md @@ -9,7 +9,7 @@ versions: --- ### About Azure subscriptions and {% data variables.product.product_name %} -{% data reusables.enterprise-accounts.billing-microsoft-ea-overview %} For more information, see "[About billing for {% data variables.product.prodname_actions %}](/github/setting-up-and-managing-billing-and-payments-on-github/about-billing-for-github-actions) and "[About billing for {% data variables.product.prodname_registry %}](/github/setting-up-and-managing-billing-and-payments-on-github/about-billing-for-github-packages)." +{% data reusables.enterprise-accounts.billing-microsoft-ea-overview %} For more information, see "[About billing for {% data variables.product.prodname_actions %}](/github/setting-up-and-managing-billing-and-payments-on-github/about-billing-for-github-actions) and "[About billing for {% data variables.product.prodname_registry %}](/github/setting-up-and-managing-billing-and-payments-on-github/about-billing-for-github-packages)." After you connect an Azure subscription, you can also manage your spending limit. For information on managing and changing your account's spending limit, see "[Managing your spending limit for {% data variables.product.prodname_registry %}](/github/setting-up-and-managing-billing-and-payments-on-github/managing-your-spending-limit-for-github-packages)" and "[Managing your spending limit for {% data variables.product.prodname_actions %}](/github/setting-up-and-managing-billing-and-payments-on-github/managing-your-spending-limit-for-github-actions)." @@ -23,7 +23,7 @@ To connect your Azure subscription, you must have owner permissions to the subsc {% data reusables.enterprise-accounts.payment-information-tab %} 1. Under "Payment Information", click **Add Azure Subscription**. 1. To sign in to your Microsoft account, follow the prompts. -1. Review the "Permissions requested" prompt. If you agree with the terms, click **Accept**. +1. Review the "Permissions requested" prompt. If you agree with the terms, click **Accept**. 1. Under "Select a subscription", select the Azure Subscription ID that you want to connect to your enterprise. 1. Click **Connect**. @@ -35,5 +35,5 @@ After you disconnect your Azure subscription from your enterprise account, your {% data reusables.enterprise-accounts.settings-tab %} {% data reusables.enterprise-accounts.billing-tab %} {% data reusables.enterprise-accounts.payment-information-tab %} -1. Under "Azure subscription", to the right of the subscription ID you want to disconnect, click **{% octicon "trashcan" aria-label="The trashcan icon" %}**. +1. Under "Azure subscription", to the right of the subscription ID you want to disconnect, click **{% octicon "trash" aria-label="The trash icon" %}**. 1. Review the prompt, then click **Remove**. diff --git a/content/github/setting-up-and-managing-your-github-user-account/changing-your-primary-email-address.md b/content/github/setting-up-and-managing-your-github-user-account/changing-your-primary-email-address.md index c5e362db8d..81a53fe920 100644 --- a/content/github/setting-up-and-managing-your-github-user-account/changing-your-primary-email-address.md +++ b/content/github/setting-up-and-managing-your-github-user-account/changing-your-primary-email-address.md @@ -22,7 +22,7 @@ topics: ![Add another email address button](/assets/images/help/settings/add_another_email_address.png) 4. Under "Primary email address", use the drop-down menu to click the email address you'd like to set as your primary email address, and click **Save**. ![Set as primary button](/assets/images/help/settings/set_as_primary_email.png) -5. To remove the old email address from your account, next to the old email, click {% octicon "trashcan" aria-label="The trashcan symbol" %}. +5. To remove the old email address from your account, next to the old email, click {% octicon "trash" aria-label="The trash symbol" %}. {% if currentVersion == "free-pro-team@latest" %} 6. Verify your new primary email address. Without a verified email address, you won't be able to use all of {% data variables.product.product_name %}'s features. For more information, see "[Verifying your email address](/articles/verifying-your-email-address)." {% endif %} diff --git a/content/github/setting-up-and-managing-your-github-user-account/removing-a-collaborator-from-a-personal-repository.md b/content/github/setting-up-and-managing-your-github-user-account/removing-a-collaborator-from-a-personal-repository.md index a1aa21b439..553aa7d0c6 100644 --- a/content/github/setting-up-and-managing-your-github-user-account/removing-a-collaborator-from-a-personal-repository.md +++ b/content/github/setting-up-and-managing-your-github-user-account/removing-a-collaborator-from-a-personal-repository.md @@ -28,7 +28,7 @@ While forks of private repositories are deleted when a collaborator is removed, {% data reusables.repositories.sidebar-settings %} {% if currentVersion == "free-pro-team@latest" %} {% data reusables.repositories.navigate-to-manage-access %} -4. To the right of the collaborator you want to remove, click {% octicon "trashcan" aria-label="The trashcan icon" %}. +4. To the right of the collaborator you want to remove, click {% octicon "trash" aria-label="The trash icon" %}. ![Button to remove collaborator](/assets/images/help/repository/collaborator-remove.png) {% else %} 3. In the left sidebar, click **Collaborators & teams**. diff --git a/content/graphql/overview/breaking-changes.md b/content/graphql/overview/breaking-changes.md index 6cdf450bef..4b22e72a42 100644 --- a/content/graphql/overview/breaking-changes.md +++ b/content/graphql/overview/breaking-changes.md @@ -27,7 +27,7 @@ We'll announce upcoming breaking changes at least three months before making cha {% for change in date[1] %}
    -
  • {% if change.criticality == 'breaking' %}Breaking{% else %}Dangerous{% endif %} A change will be made to {{ change.location }}. +
  • {% if change.criticality == 'breaking' %}Breaking{% else %}Dangerous{% endif %} A change will be made to {{ change.location }}.

    Description: {{ change.description }}

    diff --git a/content/insights/installing-and-configuring-github-insights/managing-contributors-and-teams.md b/content/insights/installing-and-configuring-github-insights/managing-contributors-and-teams.md index 2de84d7acf..ddeaeca37c 100644 --- a/content/insights/installing-and-configuring-github-insights/managing-contributors-and-teams.md +++ b/content/insights/installing-and-configuring-github-insights/managing-contributors-and-teams.md @@ -80,7 +80,7 @@ You can merge contributors manually or automatically, based on contributors {% d ### Managing teams in {% data variables.product.prodname_insights %} -There are two types of teams in {% data variables.product.prodname_insights %}: teams imported from {% data variables.product.product_name %} and custom teams. +There are two types of teams in {% data variables.product.prodname_insights %}: teams imported from {% data variables.product.product_name %} and custom teams. When an organization is added to {% data variables.product.prodname_insights %}, all of the organization's teams are imported from {% data variables.product.product_name %}. You can search and filter by these teams in {% data variables.product.prodname_insights %}. You can manage the teams in {% data variables.product.product_name %}. @@ -110,8 +110,8 @@ You can create and manage custom teams in {% data variables.product.prodname_ins {% data reusables.github-insights.settings-tab %} {% data reusables.github-insights.teams-tab %} {% data reusables.github-insights.edit-team %} -3. To the right of the contributor you'd like to remove, click {% octicon "trashcan" aria-label="The trashcan icon" %}. - ![Trashcan button](/assets/images/help/insights/contributor-trashcan.png) +3. To the right of the contributor you'd like to remove, click {% octicon "trash" aria-label="The trash icon" %}. + ![trash button](/assets/images/help/insights/contributor-trashcan.png) #### Renaming a custom team diff --git a/content/insights/installing-and-configuring-github-insights/managing-events.md b/content/insights/installing-and-configuring-github-insights/managing-events.md index d170abc968..fc4ae321a2 100644 --- a/content/insights/installing-and-configuring-github-insights/managing-events.md +++ b/content/insights/installing-and-configuring-github-insights/managing-events.md @@ -32,6 +32,6 @@ After you create an event in {% data variables.product.prodname_insights %}, any {% data reusables.github-insights.settings-tab %} {% data reusables.github-insights.events-tab %} -3. To the right of the event you want to delete, click **{% octicon "trashcan" aria-label="The trashcan icon" %}**. +3. To the right of the event you want to delete, click **{% octicon "trash" aria-label="The trash icon" %}**. ![Trash can button](/assets/images/help/insights/trashcan-button.png) 4. Click **Confirm**. diff --git a/content/organizations/managing-access-to-your-organizations-project-boards/managing-team-access-to-an-organization-project-board.md b/content/organizations/managing-access-to-your-organizations-project-boards/managing-team-access-to-an-organization-project-board.md index 2d4ca65bea..8a29b69761 100644 --- a/content/organizations/managing-access-to-your-organizations-project-boards/managing-team-access-to-an-organization-project-board.md +++ b/content/organizations/managing-access-to-your-organizations-project-boards/managing-team-access-to-an-organization-project-board.md @@ -52,5 +52,5 @@ If a team's access to a project board is inherited from a parent team, you must {% data reusables.organizations.specific_team %} 4. Above the team's conversation, click {% octicon "project" aria-label="The Projects icon" %} **Projects**. ![The team repositories tab](/assets/images/help/organizations/team-project-board-button.png) -5. To change permissions levels, to the right of the project board you want to update, use the drop-down. To remove a project board, click **{% octicon "trashcan" aria-label="The trashcan icon" %}**. +5. To change permissions levels, to the right of the project board you want to update, use the drop-down. To remove a project board, click **{% octicon "trash" aria-label="The trash icon" %}**. ![Remove a project board from your team trash button](/assets/images/help/organizations/trash-button.png) diff --git a/includes/all-articles-category.html b/includes/all-articles-category.html index 0e1fdbd61b..d2e3cfa875 100644 --- a/includes/all-articles-category.html +++ b/includes/all-articles-category.html @@ -22,7 +22,7 @@ {% endfor %} {% assign numArticles = maptopic.childArticles | obj_size %} {% if numArticles > maxArticles %} - + {% endif %}
diff --git a/includes/all-articles-product.html b/includes/all-articles-product.html index 49074536ed..2de3262853 100644 --- a/includes/all-articles-product.html +++ b/includes/all-articles-product.html @@ -21,7 +21,7 @@ {% if numArticles > maxArticles %} - + {% endif %} {% endunless %} {% endfor %} @@ -34,7 +34,7 @@ {% endfor %} {% if numArticles > maxArticles %} - + {% endif %} {% endif %}
diff --git a/includes/article-cards.html b/includes/article-cards.html index bb64bb9152..de7c3eb5ef 100644 --- a/includes/article-cards.html +++ b/includes/article-cards.html @@ -5,7 +5,7 @@
- +
- + {% data ui.helpfulness.comment_label %} - + {% data ui.helpfulness.optional %} @@ -76,7 +76,7 @@ data-help-no > {% data ui.helpfulness.email_label %} - + {% data ui.helpfulness.optional %} @@ -97,11 +97,11 @@ data-help-yes data-help-no > -

- diff --git a/includes/landing.html b/includes/landing.html index d13038737b..f8b0f90f88 100644 --- a/includes/landing.html +++ b/includes/landing.html @@ -1,5 +1,5 @@ -
+
@@ -17,7 +17,7 @@
-

{% data ui.homepage.explore_by_product %}

+

{% data ui.homepage.explore_by_product %}

{% for product in activeProducts %} {% if product.versions contains currentVersion or currentVersion == 'homepage' %} diff --git a/includes/learning-track-nav.html b/includes/learning-track-nav.html index 674fafe85e..a929ec33b6 100644 --- a/includes/learning-track-nav.html +++ b/includes/learning-track-nav.html @@ -1,18 +1,18 @@ -
+
{% assign track = currentLearningTrack %} {% if track.prevGuide %} - {% data ui.learning_track_nav.prevGuide %} - {{track.prevGuide.title}} + {% data ui.learning_track_nav.prevGuide %} + {{track.prevGuide.title}} {% endif %} {% if track.nextGuide %} - {% data ui.learning_track_nav.nextGuide %} - {{track.nextGuide.title}} + {% data ui.learning_track_nav.nextGuide %} + {{track.nextGuide.title}} {% endif %} -
\ No newline at end of file +
diff --git a/includes/liquid-tags/link-as-article-card.html b/includes/liquid-tags/link-as-article-card.html index 37280f625b..23ba93ef90 100644 --- a/includes/liquid-tags/link-as-article-card.html +++ b/includes/liquid-tags/link-as-article-card.html @@ -1,14 +1,14 @@
-

{{ title }}

-
{{ type.value }}
-

{{ intro }}

+

{{ title }}

+
{{ type.value }}
+

{{ intro }}

{% if topics.length %}
{% for topic in topics %} - {{ topic }} + {{ topic }} {% endfor %}
{% endif %} -
\ No newline at end of file +
diff --git a/includes/release-notes-category-label.html b/includes/release-notes-category-label.html index 30bb814c25..cc3bfebee7 100644 --- a/includes/release-notes-category-label.html +++ b/includes/release-notes-category-label.html @@ -17,4 +17,4 @@ {% assign text = "INVALID SECTION" %} {% endcase %} -{{ text }} +{{ text }} diff --git a/includes/rest_operation.html b/includes/rest_operation.html index dc30f725ca..b9c5c0062d 100644 --- a/includes/rest_operation.html +++ b/includes/rest_operation.html @@ -5,7 +5,7 @@ {{operation.descriptionHTML}}
- 
{{operation.verb}} {{operation.requestPath}}
+ 
{{operation.verb}} {{operation.requestPath}}
{% if operation.parameters.size > 0 or operation.bodyParameters.size > 0 %}

@@ -21,7 +21,7 @@ - @@ -73,7 +73,7 @@ {% for childParamsGroup in bodyParam.childParamsGroups %}
-

Properties of the {{ childParamsGroup.parentName }} {{ childParamsGroup.parentType }}

 +

Properties of the {{ childParamsGroup.parentName }} {{ childParamsGroup.parentType }}

 {% for childParam in childParamsGroup.params %} @@ -135,7 +135,7 @@ {% endif %} {% for preview in operation.x-github.previews %} -
+
{{ preview.html }} {% if preview.required %}☝️ {% data ui.products.rest.reference.preview_header_is_required %}.{% endif %}
diff --git a/includes/sidebar.html b/includes/sidebar.html index de2fc8991e..74f1c94cc5 100644 --- a/includes/sidebar.html +++ b/includes/sidebar.html @@ -2,10 +2,10 @@