diff --git a/assets/images/help/branches/branch-selection-dropdown-global-nav-update.png b/assets/images/help/branches/branch-selection-dropdown-global-nav-update.png new file mode 100644 index 0000000000..2a20f5813e Binary files /dev/null and b/assets/images/help/branches/branch-selection-dropdown-global-nav-update.png differ diff --git a/assets/images/help/branches/branches-overview-link-global-nav-update.png b/assets/images/help/branches/branches-overview-link-global-nav-update.png new file mode 100644 index 0000000000..93a9fde1f7 Binary files /dev/null and b/assets/images/help/branches/branches-overview-link-global-nav-update.png differ diff --git a/assets/images/help/discussions/org-settings-global-nav-update.png b/assets/images/help/discussions/org-settings-global-nav-update.png new file mode 100644 index 0000000000..6e41100e15 Binary files /dev/null and b/assets/images/help/discussions/org-settings-global-nav-update.png differ diff --git a/assets/images/help/discussions/public-repo-settings-global-nav-update.png b/assets/images/help/discussions/public-repo-settings-global-nav-update.png new file mode 100644 index 0000000000..058b2a9c74 Binary files /dev/null and b/assets/images/help/discussions/public-repo-settings-global-nav-update.png differ diff --git a/assets/images/help/discussions/repository-discussions-tab-global-nav-update.png b/assets/images/help/discussions/repository-discussions-tab-global-nav-update.png new file mode 100644 index 0000000000..643844d1d5 Binary files /dev/null and b/assets/images/help/discussions/repository-discussions-tab-global-nav-update.png differ diff --git a/assets/images/help/organizations/account-context-switcher-global-nav-update.png b/assets/images/help/organizations/account-context-switcher-global-nav-update.png new file mode 100644 index 0000000000..c0b4e1db03 Binary files /dev/null and b/assets/images/help/organizations/account-context-switcher-global-nav-update.png differ diff --git a/assets/images/help/organizations/pin-repositories-org-link.png b/assets/images/help/organizations/pin-repositories-org-link.png new file mode 100644 index 0000000000..d4d09fbb3a Binary files /dev/null and b/assets/images/help/organizations/pin-repositories-org-link.png differ diff --git a/assets/images/help/profile/profile-button-avatar-menu-global-nav-update.png b/assets/images/help/profile/profile-button-avatar-menu-global-nav-update.png new file mode 100644 index 0000000000..76558f6a23 Binary files /dev/null and b/assets/images/help/profile/profile-button-avatar-menu-global-nav-update.png differ diff --git a/assets/images/help/profile/profile-button-avatar-menu.png b/assets/images/help/profile/profile-button-avatar-menu.png new file mode 100644 index 0000000000..23227d500a Binary files /dev/null and b/assets/images/help/profile/profile-button-avatar-menu.png differ diff --git a/assets/images/help/profile/set-status-on-profile-global-nav-update.png b/assets/images/help/profile/set-status-on-profile-global-nav-update.png new file mode 100644 index 0000000000..b3f8376dc4 Binary files /dev/null and b/assets/images/help/profile/set-status-on-profile-global-nav-update.png differ diff --git a/assets/images/help/profile/your-organizations-global-nav-update.png b/assets/images/help/profile/your-organizations-global-nav-update.png new file mode 100644 index 0000000000..f4fc94c5fc Binary files /dev/null and b/assets/images/help/profile/your-organizations-global-nav-update.png differ diff --git a/assets/images/help/projects-v2/projects-profile-menu.png b/assets/images/help/projects-v2/projects-profile-menu.png index 222a570aae..e957c5307e 100644 Binary files a/assets/images/help/projects-v2/projects-profile-menu.png and b/assets/images/help/projects-v2/projects-profile-menu.png differ diff --git a/assets/images/help/repository/actions-tab-global-nav-update.png b/assets/images/help/repository/actions-tab-global-nav-update.png new file mode 100644 index 0000000000..1768c1fe34 Binary files /dev/null and b/assets/images/help/repository/actions-tab-global-nav-update.png differ diff --git a/assets/images/help/repository/add-file-buttons.png b/assets/images/help/repository/add-file-buttons.png new file mode 100644 index 0000000000..6d21844ad7 Binary files /dev/null and b/assets/images/help/repository/add-file-buttons.png differ diff --git a/assets/images/help/repository/remotes-url-global-nav-update.png b/assets/images/help/repository/remotes-url-global-nav-update.png new file mode 100644 index 0000000000..5768c4aefa Binary files /dev/null and b/assets/images/help/repository/remotes-url-global-nav-update.png differ diff --git a/assets/images/help/repository/repo-create-global-nav-update.png b/assets/images/help/repository/repo-create-global-nav-update.png new file mode 100644 index 0000000000..c209eb4503 Binary files /dev/null and b/assets/images/help/repository/repo-create-global-nav-update.png differ diff --git a/assets/images/help/repository/repo-settings-issues-pull-requests-global-nav-update.png b/assets/images/help/repository/repo-settings-issues-pull-requests-global-nav-update.png new file mode 100644 index 0000000000..9fe8eab45a Binary files /dev/null and b/assets/images/help/repository/repo-settings-issues-pull-requests-global-nav-update.png differ diff --git a/assets/images/help/repository/repo-tabs-issues-global-nav-update.png b/assets/images/help/repository/repo-tabs-issues-global-nav-update.png new file mode 100644 index 0000000000..b795f8a98d Binary files /dev/null and b/assets/images/help/repository/repo-tabs-issues-global-nav-update.png differ diff --git a/assets/images/help/repository/repo-tabs-pull-requests-global-nav-update.png b/assets/images/help/repository/repo-tabs-pull-requests-global-nav-update.png new file mode 100644 index 0000000000..c42cac186f Binary files /dev/null and b/assets/images/help/repository/repo-tabs-pull-requests-global-nav-update.png differ diff --git a/assets/images/help/repository/upload-files-button.png b/assets/images/help/repository/upload-files-button.png index 53680709b4..12aaa1f8ce 100644 Binary files a/assets/images/help/repository/upload-files-button.png and b/assets/images/help/repository/upload-files-button.png differ diff --git a/assets/images/help/settings/userbar-account-settings-global-nav-update.png b/assets/images/help/settings/userbar-account-settings-global-nav-update.png new file mode 100644 index 0000000000..d570f9fa3b Binary files /dev/null and b/assets/images/help/settings/userbar-account-settings-global-nav-update.png differ diff --git a/assets/images/help/sponsors/access-sponsors-dashboard-global-nav-update.png b/assets/images/help/sponsors/access-sponsors-dashboard-global-nav-update.png new file mode 100644 index 0000000000..5407e6d24c Binary files /dev/null and b/assets/images/help/sponsors/access-sponsors-dashboard-global-nav-update.png differ diff --git a/assets/images/help/teams/members-tab-global-nav-update.png b/assets/images/help/teams/members-tab-global-nav-update.png new file mode 100644 index 0000000000..daf04ad5d0 Binary files /dev/null and b/assets/images/help/teams/members-tab-global-nav-update.png differ diff --git a/assets/images/help/teams/team-settings-global-nav-update.png b/assets/images/help/teams/team-settings-global-nav-update.png new file mode 100644 index 0000000000..12e4b27b09 Binary files /dev/null and b/assets/images/help/teams/team-settings-global-nav-update.png differ diff --git a/assets/images/help/teams/teams-tab-global-nav-update.png b/assets/images/help/teams/teams-tab-global-nav-update.png new file mode 100644 index 0000000000..5e8654c33c Binary files /dev/null and b/assets/images/help/teams/teams-tab-global-nav-update.png differ diff --git a/assets/images/help/writing/display-markdown-as-source-global-nav-update.png b/assets/images/help/writing/display-markdown-as-source-global-nav-update.png new file mode 100644 index 0000000000..2cba749982 Binary files /dev/null and b/assets/images/help/writing/display-markdown-as-source-global-nav-update.png differ diff --git a/content/account-and-profile/setting-up-and-managing-your-github-profile/customizing-your-profile/personalizing-your-profile.md b/content/account-and-profile/setting-up-and-managing-your-github-profile/customizing-your-profile/personalizing-your-profile.md index b1bbc5259f..b266b55095 100644 --- a/content/account-and-profile/setting-up-and-managing-your-github-profile/customizing-your-profile/personalizing-your-profile.md +++ b/content/account-and-profile/setting-up-and-managing-your-github-profile/customizing-your-profile/personalizing-your-profile.md @@ -49,7 +49,7 @@ If you use Gravatar, and your Gravatar image is associated with the email you us {% data reusables.user-settings.access_settings %} 1. Under "Profile Picture", select {% octicon "pencil" aria-hidden="true" %} **Edit**, then click **Upload a photo...**. - ![Screenshot of the "Public profile" section of a user account's settings. A button, labeled with a pencil icon and "Edit", is highlighted with an orange outline.](/assets/images/help/profile/edit-profile-photo.png) + ![Screenshot of the "Public profile" section of a user account's settings. A button, labeled with a pencil icon and "Edit", is outlined in dark orange.](/assets/images/help/profile/edit-profile-photo.png) 1. Select an image, then click **Upload**. 1. Crop your picture. 1. Click **Set new profile picture**. @@ -61,7 +61,7 @@ If you use Gravatar, and your Gravatar image is associated with the email you us {% ifversion not ghae %}If your email address is associated with a [Gravatar](https://en.gravatar.com/), you cannot revert to your identicon. Click **Revert to Gravatar** instead.{% endif %} - ![Screenshot of the "Public profile" section of a user account's settings. A button, labeled with a pencil icon and "Edit", is highlighted with an orange outline.](/assets/images/help/profile/edit-profile-photo.png) + ![Screenshot of the "Public profile" section of a user account's settings. A button, labeled with a pencil icon and "Edit", is outlined in dark orange.](/assets/images/help/profile/edit-profile-photo.png) ## Changing your profile name @@ -155,10 +155,10 @@ You can add up to four links to social accounts on your profile. These are visib ## Setting a status You can set a status to display information about your current availability on {% data variables.product.product_name %}. Your status will show: -- on your {% data variables.product.product_name %} profile page. -- when people hover over your username or avatar on {% data variables.product.product_name %}. -- on a team page for a team where you're a team member. For more information, see "[AUTOTITLE](/organizations/organizing-members-into-teams/about-teams#team-pages)." -- on the organization dashboard in an organization where you're a member. For more information, see "[AUTOTITLE](/organizations/collaborating-with-groups-in-organizations/about-your-organization-dashboard)." +- On your {% data variables.product.product_name %} profile page +- When people hover over your username or avatar on {% data variables.product.product_name %} +- On a team page for a team where you're a team member. For more information, see "[AUTOTITLE](/organizations/organizing-members-into-teams/about-teams#team-pages)." +- On the organization dashboard in an organization where you're a member. For more information, see "[AUTOTITLE](/organizations/collaborating-with-groups-in-organizations/about-your-organization-dashboard)." When you set your status, you can also let people know that you have limited availability on {% data variables.product.product_name %}. @@ -166,9 +166,17 @@ If you select the "Busy" option, when people @mention your username, assign you ![Screenshot of a draft comment. "@octocat" is written in the text field, and "The Octocat (busy)" is suggested.](/assets/images/help/profile/username-with-limited-availability-text.png) -1. In the top right corner of {% ifversion fpt or ghec %}{% data variables.product.prodname_dotcom_the_website %}{% else %}{% data variables.product.product_name %}{% endif %}, click your profile photo, then click **Set status** or, if you already have a status set, click your current status. +1. In the top right corner of {% ifversion fpt or ghec %}{% data variables.product.prodname_dotcom_the_website %}{% else %}{% data variables.product.product_name %}{% endif %}, select your profile photo, then click {% octicon "smiley" aria-hidden="true" %} **Set status** or, if you already have a status set, click your current status. + +{% ifversion global-nav-update %} + + ![Screenshot of the dropdown menu under @octocat's profile picture. A smiley icon and "Set status" are outlined in dark orange.](/assets/images/help/profile/set-status-on-profile-global-nav-update.png) + +{% else %} ![Screenshot of the dropdown menu under @octocat's profile picture. A smiley icon and "Set status" are outlined in dark orange.](/assets/images/help/profile/set-status-on-profile.png) + +{% endif %} 1. In the "What's happening" field, type a status message. 1. Optionally, to set an emoji status, click {% octicon "smiley" aria-label="Choose an emoji" %}, then click an emoji from the list. 1. Optionally, if you'd like to share that you have limited availability, select "Busy." diff --git a/content/account-and-profile/setting-up-and-managing-your-github-profile/managing-contribution-settings-on-your-profile/sending-enterprise-contributions-to-your-githubcom-profile.md b/content/account-and-profile/setting-up-and-managing-your-github-profile/managing-contribution-settings-on-your-profile/sending-enterprise-contributions-to-your-githubcom-profile.md index 257df67c7e..804e4afcf5 100644 --- a/content/account-and-profile/setting-up-and-managing-your-github-profile/managing-contribution-settings-on-your-profile/sending-enterprise-contributions-to-your-githubcom-profile.md +++ b/content/account-and-profile/setting-up-and-managing-your-github-profile/managing-contribution-settings-on-your-profile/sending-enterprise-contributions-to-your-githubcom-profile.md @@ -45,7 +45,16 @@ Before you can connect your {% ifversion fpt or ghec %}{% data variables.product 1. Sign in to {% data variables.product.prodname_ghe_server %} and {% data variables.product.prodname_dotcom_the_website %}. 1. On {% data variables.product.prodname_ghe_server %}, in the upper-right corner of any page, click your profile photo, then click **Settings**. - ![Screenshot of {% data variables.product.prodname_dotcom %}'s account menu showing options for users to view and edit their profile, content, and settings. The menu item "Settings" is outlined in dark orange.](/assets/images/help/settings/userbar-account-settings.png) + +{% ifversion global-nav-update %} + + ![Screenshot of a user's account menu on {% data variables.product.prodname_dotcom %}. The menu item "Settings" is outlined in dark orange.](/assets/images/help/settings/userbar-account-settings-global-nav-update.png) + +{% else %} + + ![Screenshot of a user's account menu on {% data variables.product.prodname_dotcom %}. The menu item "Settings" is outlined in dark orange.](/assets/images/help/settings/userbar-account-settings.png) + +{% endif %} {% data reusables.github-connect.github-connect-tab-user-settings %} {% data reusables.github-connect.connect-dotcom-and-enterprise %} 1. Review the resources that {% data variables.product.prodname_ghe_server %} will access from your {% data variables.product.prodname_dotcom_the_website %} account, then click **Authorize**. @@ -55,7 +64,7 @@ Before you can connect your {% ifversion fpt or ghec %}{% data variables.product 1. Sign in to {% data variables.product.prodname_ghe_managed %} and {% data variables.product.prodname_dotcom_the_website %}. 1. On {% data variables.product.prodname_ghe_managed %}, in the upper-right corner of any page, click your profile photo, then click **Settings**. - ![Screenshot of {% data variables.product.prodname_dotcom %}'s account menu showing options for users to view and edit their profile, content, and settings. The menu item "Settings" is outlined in dark orange.](/assets/images/help/settings/userbar-account-settings.png) + ![Screenshot of a user's account menu on {% data variables.product.prodname_dotcom %}. The menu item "Settings" is outlined in dark orange.](/assets/images/help/settings/userbar-account-settings.png) {% data reusables.github-connect.github-connect-tab-user-settings %} {% data reusables.github-connect.connect-dotcom-and-enterprise %} {% data reusables.github-connect.authorize-connection %} diff --git a/content/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-user-account-settings/about-your-personal-dashboard.md b/content/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-user-account-settings/about-your-personal-dashboard.md index a638d99ce1..d06744db8b 100644 --- a/content/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-user-account-settings/about-your-personal-dashboard.md +++ b/content/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-user-account-settings/about-your-personal-dashboard.md @@ -19,10 +19,6 @@ topics: shortTitle: Your personal dashboard --- -{% ifversion global-nav-update %} -{% data reusables.navigation.global-nav-beta-note %} -{% endif %} - ## Accessing your personal dashboard Your personal dashboard is the first page you'll see when you sign in on {% data variables.product.product_name %}. diff --git a/content/contributing/writing-for-github-docs/using-markdown-and-liquid-in-github-docs.md b/content/contributing/writing-for-github-docs/using-markdown-and-liquid-in-github-docs.md index 654b4d6c6b..dc0904ac17 100644 --- a/content/contributing/writing-for-github-docs/using-markdown-and-liquid-in-github-docs.md +++ b/content/contributing/writing-for-github-docs/using-markdown-and-liquid-in-github-docs.md @@ -31,7 +31,7 @@ This example shows the correct way to align list items with multiple paragraphs ```markdown 1. Under your repository name, click **Actions**. - ![Screenshot of the tabs for the "github/docs" repository. The "Actions" tab is highlighted with an orange outline.](/assets/images/help/repository/actions-tab.png) + ![Screenshot of the tabs for the "github/docs" repository. The "Actions" tab is highlighted with an orange outline.](/assets/images/help/repository/actions-tab-global-nav-update.png) This is another paragraph in the list. @@ -44,7 +44,7 @@ This content is displayed on the {% data variables.product.prodname_docs %} site 1. Under your repository name, click **Actions**. - ![Screenshot of the tabs for the "github/docs" repository. The "Actions" tab is highlighted with an orange outline.](/assets/images/help/repository/actions-tab.png) + ![Screenshot of the tabs for the "github/docs" repository. The "Actions" tab is highlighted with an orange outline.](/assets/images/help/repository/actions-tab-global-nav-update.png) This is another paragraph in the list. 1. This is the next item. diff --git a/content/discussions/guides/finding-your-discussions.md b/content/discussions/guides/finding-your-discussions.md index 987243ba15..9386e1429a 100644 --- a/content/discussions/guides/finding-your-discussions.md +++ b/content/discussions/guides/finding-your-discussions.md @@ -8,10 +8,6 @@ redirect_from: - /discussions/guides/finding-discussions-across-multiple-repositories --- -{% ifversion global-nav-update %} -{% data reusables.navigation.global-nav-beta-note %} -{% endif %} - ## Finding discussions {% ifversion global-nav-update %} diff --git a/content/discussions/quickstart.md b/content/discussions/quickstart.md index e44aed468b..28299ba6ad 100644 --- a/content/discussions/quickstart.md +++ b/content/discussions/quickstart.md @@ -24,8 +24,16 @@ When you first enable {% data variables.product.prodname_discussions %}, you wil 1. Under your repository name, click {% octicon "gear" aria-label="The gear icon" %} **Settings**. +{% ifversion global-nav-update %} + + ![Screenshot of the tabs in a {% data variables.product.company_short %} repository. The "Settings" option is outlined in dark orange.](/assets/images/help/discussions/public-repo-settings-global-nav-update.png) + +{% else %} + ![Screenshot of the tabs in a {% data variables.product.company_short %} repository. The "Settings" option is outlined in dark orange.](/assets/images/help/discussions/public-repo-settings.png) +{% endif %} + 1. Scroll down to the "Features" section and click **Set up discussions**. ![Screenshot of the "Discussions" option in the repository's settings. A green button, labeled "Set up discussions", is outlined in dark orange.](/assets/images/help/discussions/setup-discussions-button.png) diff --git a/content/get-started/quickstart/hello-world.md b/content/get-started/quickstart/hello-world.md index edef034ae5..91c63c8d6e 100644 --- a/content/get-started/quickstart/hello-world.md +++ b/content/get-started/quickstart/hello-world.md @@ -70,8 +70,17 @@ Here at {% data variables.product.product_name %}, our developers, writers, and 1. Click the **Code** tab of your `hello-world` repository. 1. Above the file list, click the dropdown menu that says **main**. + +{% ifversion global-nav-update %} + + ![Screenshot of the repository page. A dropdown menu, labeled with a branch icon and "main", is highlighted with an orange outline.](/assets/images/help/branches/branch-selection-dropdown-global-nav-update.png) + +{% else %} + ![Screenshot of the repository page. A dropdown menu, labeled with a branch icon and "main", is highlighted with an orange outline.](/assets/images/help/branches/branch-selection-dropdown.png) +{% endif %} + 1. Type a branch name, `readme-edits`, into the text box. 1. Click **Create branch: readme-edits from main**. diff --git a/content/get-started/using-git/getting-changes-from-a-remote-repository.md b/content/get-started/using-git/getting-changes-from-a-remote-repository.md index 17e8ff7d15..94f379dd27 100644 --- a/content/get-started/using-git/getting-changes-from-a-remote-repository.md +++ b/content/get-started/using-git/getting-changes-from-a-remote-repository.md @@ -29,7 +29,15 @@ $ git clone https://{% data variables.command_line.codeblock %}/USERNAME/REPOSIT You can choose from [several different URLs](/get-started/getting-started-with-git/about-remote-repositories) when cloning a repository. While logged in to {% data variables.product.prodname_dotcom %}, these URLs are available on the main page of the repository when you click **{% octicon "code" aria-hidden="true" %} Code**. -![Screenshot of the main page of a repository. A green button, labeled "Code," is outlined in dark orange and expanded to show the HTTPS URL for the repository.](/assets/images/help/repository/remotes-url.png) +{% ifversion global-nav-update %} + + ![Screenshot of the main page of a repository. A green button, labeled "Code," is outlined in dark orange and expanded to show the HTTPS URL for the repository.](/assets/images/help/repository/remotes-url-global-nav-update.png) + +{% else %} + + ![Screenshot of the main page of a repository. A green button, labeled "Code," is outlined in dark orange and expanded to show the HTTPS URL for the repository.](/assets/images/help/repository/remotes-url.png) + +{% endif %} When you run `git clone`, the following actions occur: - A new folder called `repo` is made diff --git a/content/get-started/using-github-docs/about-versions-of-github-docs.md b/content/get-started/using-github-docs/about-versions-of-github-docs.md index eea7be9174..c22cf35624 100644 --- a/content/get-started/using-github-docs/about-versions-of-github-docs.md +++ b/content/get-started/using-github-docs/about-versions-of-github-docs.md @@ -37,9 +37,12 @@ You may use more than one {% data variables.product.company_short %} plan. For e If you access {% data variables.product.prodname_dotcom %} at https://github.com, you're either using the features of a Free, Pro, or Team plan, or you're using {% data variables.product.prodname_ghe_cloud %}. +{% ifversion global-nav-update %}{% else %} In a wide browser window, there is no text that immediately follows the {% data variables.product.company_short %} logo on the left side of the header. -![Screenshot of the header of any page on {% data variables.product.prodname_dotcom %}. The {% data variables.product.prodname_dotcom %} logo is highlighted with an orange outline.](/assets/images/help/docs/header-dotcom.png) + ![Screenshot of the header of any page on {% data variables.product.prodname_dotcom %}. The {% data variables.product.prodname_dotcom %} logo is highlighted with an orange outline.](/assets/images/help/docs/header-dotcom.png) + +{% endif %} On {% data variables.product.prodname_dotcom_the_website %}, each account has its own plan. Each personal account has an associated plan that provides access to certain features, and each organization has a different associated plan. If your personal account is a member of an organization on {% data variables.product.prodname_dotcom_the_website %}, you may have access to different features when you use resources owned by that organization than when you use resources owned by your personal account. For more information, see "[AUTOTITLE](/get-started/learning-about-github/types-of-github-accounts)." diff --git a/content/get-started/working-with-subversion-on-github/support-for-subversion-clients.md b/content/get-started/working-with-subversion-on-github/support-for-subversion-clients.md index 14ce243aca..66f71eee11 100644 --- a/content/get-started/working-with-subversion-on-github/support-for-subversion-clients.md +++ b/content/get-started/working-with-subversion-on-github/support-for-subversion-clients.md @@ -76,7 +76,15 @@ $ svn commit -m 'Added more_awesome topic branch' You can confirm that the new branch exists in the repository's branch dropdown: -![Screenshot of the repository page. A dropdown menu, labeled with a branch icon and "main", is highlighted with an orange outline.](/assets/images/help/branches/branch-selection-dropdown.png) +{% ifversion global-nav-update %} + + ![Screenshot of the repository page. A dropdown menu, labeled with a branch icon and "main", is highlighted with an orange outline.](/assets/images/help/branches/branch-selection-dropdown-global-nav-update.png) + +{% else %} + + ![Screenshot of the repository page. A dropdown menu, labeled with a branch icon and "main", is highlighted with an orange outline.](/assets/images/help/branches/branch-selection-dropdown.png) + +{% endif %} You can also confirm the new branch via the command line: diff --git a/content/issues/planning-and-tracking-with-projects/creating-projects/migrating-from-projects-classic.md b/content/issues/planning-and-tracking-with-projects/creating-projects/migrating-from-projects-classic.md index 1021004749..e51600a2cf 100644 --- a/content/issues/planning-and-tracking-with-projects/creating-projects/migrating-from-projects-classic.md +++ b/content/issues/planning-and-tracking-with-projects/creating-projects/migrating-from-projects-classic.md @@ -40,7 +40,7 @@ You can migrate your project boards to the new {% data variables.product.prodnam ## Migrating a user project board {% data reusables.projects.enable-migration %} -1. In the top right corner of {% data variables.product.prodname_dotcom_the_website %}, click your profile photo, then click **Your projects**. +1. In the upper-right corner of {% data variables.product.prodname_dotcom_the_website %}, select your profile photo, then click **Your projects**. ![Screenshot showing the profile photo menu. The "Your projects" link is highlighted with an orange outline.](/assets/images/help/projects-v2/projects-profile-menu.png) diff --git a/content/issues/tracking-your-work-with-issues/viewing-all-of-your-issues-and-pull-requests.md b/content/issues/tracking-your-work-with-issues/viewing-all-of-your-issues-and-pull-requests.md index 6dc42fbd99..aeba896712 100644 --- a/content/issues/tracking-your-work-with-issues/viewing-all-of-your-issues-and-pull-requests.md +++ b/content/issues/tracking-your-work-with-issues/viewing-all-of-your-issues-and-pull-requests.md @@ -18,10 +18,6 @@ shortTitle: View all your issues & PRs type: how_to --- -{% ifversion global-nav-update %} -{% data reusables.navigation.global-nav-beta-note %} -{% endif %} - Your issue and pull request dashboards are available at the top of any page. On each dashboard, you can filter the list to find issues or pull requests you created, that are assigned to you, or in which you're mentioned. You can also find pull requests that you've been asked to review. {% ifversion global-nav-update %} diff --git a/content/organizations/collaborating-with-groups-in-organizations/about-your-organizations-news-feed.md b/content/organizations/collaborating-with-groups-in-organizations/about-your-organizations-news-feed.md index a0b5cd2b2e..7de2eb7666 100644 --- a/content/organizations/collaborating-with-groups-in-organizations/about-your-organizations-news-feed.md +++ b/content/organizations/collaborating-with-groups-in-organizations/about-your-organizations-news-feed.md @@ -34,4 +34,12 @@ An organization's news feed shows other people's activity on repositories owned 1. Open your {% data reusables.user-settings.personal_dashboard %}. 1. In the upper-left corner of the page, select the dropdown menu that switches account context, then select an organization. - ![Screenshot of a user's dashboard page. In the top-left corner, a dropdown menu, labeled with @octocat and a downwards arrow, is outlined in dark orange.](/assets/images/help/organizations/account-context-switcher.png) +{% ifversion global-nav-update %} + + ![Screenshot of a user's dashboard page. In the top-left corner, a dropdown menu, labeled with "octocat" and a downwards arrow, is outlined in dark orange.](/assets/images/help/organizations/account-context-switcher-global-nav-update.png) + +{% else %} + + ![Screenshot of a user's dashboard page. In the top-left corner, a dropdown menu, labeled with "octocat" and a downwards arrow, is outlined in dark orange.](/assets/images/help/organizations/account-context-switcher.png) + +{% endif %} diff --git a/content/organizations/collaborating-with-groups-in-organizations/customizing-your-organizations-profile.md b/content/organizations/collaborating-with-groups-in-organizations/customizing-your-organizations-profile.md index a5c261aa2a..a143a6ab60 100644 --- a/content/organizations/collaborating-with-groups-in-organizations/customizing-your-organizations-profile.md +++ b/content/organizations/collaborating-with-groups-in-organizations/customizing-your-organizations-profile.md @@ -77,7 +77,7 @@ You can pin repositories that you want to feature, such as those that are freque - If you haven't yet pinned any repositories, in the right sidebar, click **pin repositories**. - ![Screenshot of an organization's profile page. In the right sidebar, a link, labeled "pin repositories," is outlined in dark orange.](/assets/images/help/organizations/pin-repositories-link.png) + ![Screenshot of an organization's profile page. In the right sidebar, a link, labeled "pin repositories," is outlined in dark orange.](/assets/images/help/organizations/pin-repositories-org-link.png) 1. In the "Edit pinned repositories" dialog box, select a combination of up to six public, {% ifversion not fpt %}private, or internal{% else %}or private{% endif %} repositories to display. 1. Click **Save pins**. diff --git a/content/organizations/organizing-members-into-teams/requesting-to-add-a-child-team.md b/content/organizations/organizing-members-into-teams/requesting-to-add-a-child-team.md index c4782a0971..e4f19dbc7a 100644 --- a/content/organizations/organizing-members-into-teams/requesting-to-add-a-child-team.md +++ b/content/organizations/organizing-members-into-teams/requesting-to-add-a-child-team.md @@ -27,7 +27,15 @@ If you're an organization owner or you have team maintainer permissions in both 1. In the list of teams, click the name of the team where you'd like to add the child team. 1. At the top of the team page, click {% octicon "people" aria-hidden="true" %} **Teams**. +{% ifversion global-nav-update %} + + ![Screenshot of the header of a team's page. A tab, labeled with a people icon and "Teams", is outlined in dark orange.](/assets/images/help/teams/teams-tab-global-nav-update.png) + +{% else %} + ![Screenshot of the header of a team's page. A tab, labeled with a people icon and "Teams", is outlined in dark orange.](/assets/images/help/teams/team-teams-tab.png) + +{% endif %} 1. Click **Add a team**. 1. Type the name of the team you'd like to add as a child team, and click the team in the results. {% data reusables.repositories.changed-repository-access-permissions %} diff --git a/content/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-and-deleting-branches-within-your-repository.md b/content/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-and-deleting-branches-within-your-repository.md index fc8c19c24c..b415024cb3 100644 --- a/content/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-and-deleting-branches-within-your-repository.md +++ b/content/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-and-deleting-branches-within-your-repository.md @@ -52,7 +52,15 @@ You can create a branch in different ways on {% data variables.product.product_n {% else %} 1. Select the branch selector dropdown menu. +{% ifversion global-nav-update %} + + ![Screenshot of the repository page. A dropdown menu, labeled with a branch icon and "main", is highlighted with an orange outline.](/assets/images/help/branches/branch-selection-dropdown-global-nav-update.png) + +{% else %} + ![Screenshot of the repository page. A dropdown menu, labeled with a branch icon and "main", is highlighted with an orange outline.](/assets/images/help/branches/branch-selection-dropdown.png) + +{% endif %} {% endif %} 1. Optionally, if you want to create the new branch from a branch other than the default branch of the repository, click another branch, then select the branch dropdown menu again. 1. In the "Find or create a branch..." text field, type a unique name for your new branch, then click **Create branch**. diff --git a/content/pull-requests/collaborating-with-pull-requests/working-with-forks/allowing-changes-to-a-pull-request-branch-created-from-a-fork.md b/content/pull-requests/collaborating-with-pull-requests/working-with-forks/allowing-changes-to-a-pull-request-branch-created-from-a-fork.md index 8861efffad..6d25c4785b 100644 --- a/content/pull-requests/collaborating-with-pull-requests/working-with-forks/allowing-changes-to-a-pull-request-branch-created-from-a-fork.md +++ b/content/pull-requests/collaborating-with-pull-requests/working-with-forks/allowing-changes-to-a-pull-request-branch-created-from-a-fork.md @@ -26,8 +26,15 @@ You can set commit permissions when you first create a pull request from a fork. 1. On {% data variables.product.product_name %}, navigate to the main page of the upstream repository of your pull request. 1. Under the upstream repository name, click {% octicon "git-pull-request" aria-hidden="true" %} **Pull requests**. +{% ifversion global-nav-update %} + + ![Screenshot of the main page of a repository. In the horizontal navigation bar, a tab, labeled "Pull requests," is outlined in dark orange.](/assets/images/help/repository/repo-tabs-pull-requests-global-nav-update.png) + +{% else %} ![Screenshot of the main page of a repository. In the horizontal navigation bar, a tab, labeled "Pull requests," is outlined in dark orange.](/assets/images/help/repository/repo-tabs-pull-requests.png) + +{% endif %} 1. In the list of pull requests, navigate to the pull request that you'd like to allow commits on. {% data reusables.repositories.allow-maintainers-user-forks %} diff --git a/content/search-github/getting-started-with-searching-on-github/enabling-githubcom-repository-search-from-your-private-enterprise-environment.md b/content/search-github/getting-started-with-searching-on-github/enabling-githubcom-repository-search-from-your-private-enterprise-environment.md index b247a88f5f..37eac9a553 100644 --- a/content/search-github/getting-started-with-searching-on-github/enabling-githubcom-repository-search-from-your-private-enterprise-environment.md +++ b/content/search-github/getting-started-with-searching-on-github/enabling-githubcom-repository-search-from-your-private-enterprise-environment.md @@ -28,6 +28,15 @@ An enterprise owner for {% data variables.product.product_name %} must enable {% 1. Sign into {% data variables.product.product_name %} and {% data variables.product.prodname_dotcom_the_website %}. 1. On {% data variables.product.product_name %}, in the upper-right corner of any page, click your profile photo, then click **Settings**. -![Screenshot of {% data variables.product.prodname_dotcom %}'s account menu showing options for users to view and edit their profile, content, and settings. The menu item "Settings" is outlined in dark orange.](/assets/images/help/settings/userbar-account-settings.png) + +{% ifversion global-nav-update %} + + ![Screenshot of a user's account menu on {% data variables.product.prodname_dotcom %}. The menu item "Settings" is outlined in dark orange.](/assets/images/help/settings/userbar-account-settings-global-nav-update.png) + +{% else %} + + ![Screenshot of a user's account menu on {% data variables.product.prodname_dotcom %}. The menu item "Settings" is outlined in dark orange.](/assets/images/help/settings/userbar-account-settings.png) + +{% endif %} {% data reusables.github-connect.github-connect-tab-user-settings %} {% data reusables.github-connect.connect-dotcom-and-enterprise %} diff --git a/content/search-github/searching-on-github/searching-github-marketplace.md b/content/search-github/searching-on-github/searching-github-marketplace.md index e3270a762a..5995d1d027 100644 --- a/content/search-github/searching-on-github/searching-github-marketplace.md +++ b/content/search-github/searching-on-github/searching-github-marketplace.md @@ -31,8 +31,8 @@ Anytime you search across all of {% data variables.product.prodname_dotcom_the_w 1. Navigate to https://github.com/search. 1. Type any keywords and press **Enter**. -1. In the left sidebar, click **Marketplace**. - ![Screenshot of the search results for 'linter'. The "Marketplace" option in the left-side menu is outlined in dark orange.](/assets/images/help/search/marketplace-left-side-navigation.png) +1. To see all available filters for your search, in the "Filter by" sidebar, click **More**. +1. To see results from {% data variables.product.prodname_marketplace %}, click **Marketplace**. ## Further reading diff --git a/contributing/content-markup-reference.md b/contributing/content-markup-reference.md index 1e5db7905e..f3750a8f54 100644 --- a/contributing/content-markup-reference.md +++ b/contributing/content-markup-reference.md @@ -40,7 +40,7 @@ For example, this is the correct way to write list items with multiple paragraph ```markdown 1. Under your repository name, click **Actions**. - ![Screenshot of the tabs for the "github/docs" repository. The "Actions" tab is highlighted with an orange outline.](/assets/images/help/repository/actions-tab.png) + ![Screenshot of the tabs for the "github/docs" repository. The "Actions" tab is highlighted with an orange outline.](/assets/images/help/repository/actions-tab-global-nav-update.png) This is another paragraph in the list. 1. This is the next item. diff --git a/data/features/global-nav-update.yml b/data/features/global-nav-update.yml index 53294ea7ee..7fe8f9e3fb 100644 --- a/data/features/global-nav-update.yml +++ b/data/features/global-nav-update.yml @@ -4,5 +4,4 @@ versions: fpt: '*' ghec: '*' - ghes: '>3.10' - ghae: '>3.10' + ghes: '>3.11' diff --git a/data/reusables/discussions/discussions-tab.md b/data/reusables/discussions/discussions-tab.md index e5c957bfbd..10a1184067 100644 --- a/data/reusables/discussions/discussions-tab.md +++ b/data/reusables/discussions/discussions-tab.md @@ -1,3 +1,11 @@ 1. Under your repository or organization name, click {% octicon "comment-discussion" aria-hidden="true" %} **Discussions**. +{% ifversion global-nav-update %} + + ![Screenshot of the tabs in a {% data variables.product.company_short %} repository. The "Discussions" option is outlined in dark orange.](/assets/images/help/discussions/repository-discussions-tab-global-nav-update.png) + +{% else %} + ![Screenshot of the tabs in a {% data variables.product.company_short %} repository. The "Discussions" option is outlined in dark orange.](/assets/images/help/discussions/repository-discussions-tab.png) + +{% endif %} diff --git a/data/reusables/discussions/enabling-or-disabling-github-discussions-for-your-organization.md b/data/reusables/discussions/enabling-or-disabling-github-discussions-for-your-organization.md index 99b6d84145..308981c836 100644 --- a/data/reusables/discussions/enabling-or-disabling-github-discussions-for-your-organization.md +++ b/data/reusables/discussions/enabling-or-disabling-github-discussions-for-your-organization.md @@ -2,8 +2,16 @@ 1. Under your organization name, click {% octicon "gear" aria-label="The gear icon" %} **Settings**. +{% ifversion global-nav-update %} + + ![Screenshot of the tabs in an organization's profile. The "Settings" tab is outlined in dark orange.](/assets/images/help/discussions/org-settings-global-nav-update.png) + +{% else %} + ![Screenshot of the tabs in an organization's profile. The "Settings" tab is outlined in dark orange.](/assets/images/help/discussions/org-settings.png) +{% endif %} + 1. Under "Discussions", select **Enable discussions for this organization**. 1. Use the dropdown menu to select a repository to use as the source repository for your organization discussions. 1. Click **Save**. diff --git a/data/reusables/discussions/enabling-or-disabling-github-discussions-for-your-repository.md b/data/reusables/discussions/enabling-or-disabling-github-discussions-for-your-repository.md index 953db05e4c..7c527a7e69 100644 --- a/data/reusables/discussions/enabling-or-disabling-github-discussions-for-your-repository.md +++ b/data/reusables/discussions/enabling-or-disabling-github-discussions-for-your-repository.md @@ -4,6 +4,14 @@ You can enable or disable {% data variables.product.prodname_discussions %} for 1. Under your repository name, click {% octicon "gear" aria-label="The gear icon" %} **Settings**. +{% ifversion global-nav-update %} + + ![Screenshot of the tabs in a {% data variables.product.company_short %} repository. The "Settings" option is outlined in dark orange.](/assets/images/help/discussions/public-repo-settings-global-nav-update.png) + +{% else %} + ![Screenshot of the tabs in a {% data variables.product.company_short %} repository. The "Settings" option is outlined in dark orange.](/assets/images/help/discussions/public-repo-settings.png) +{% endif %} + 1. Scroll down to the "Features" section and select **Discussions**. diff --git a/data/reusables/files/add-file.md b/data/reusables/files/add-file.md index 1fc0076be2..97c41600c3 100644 --- a/data/reusables/files/add-file.md +++ b/data/reusables/files/add-file.md @@ -3,7 +3,7 @@ Alternatively, you can click {% octicon "plus" aria-label="The plus sign icon" %} in the file tree view on the left. - ![Screenshot of the main page of the repository. Above the list of a files, a button, labeled "Add file," is outlined in dark orange. In the file tree view of the repository, a button, with the plus sign icon, is also outlined in dark orange. ](/assets/images/help/repository/add-files-buttons.png) + ![Screenshot of the main page of a repository. Above the list of files, a button, labeled "Add file," is outlined in dark orange. In the file tree view of the repository, a button with a plus sign icon is also outlined in dark orange.](/assets/images/help/repository/add-file-buttons.png) {% else %} 1. Above the list of files, using the **Add file** drop-down, click **Create new file**. {% endif %} diff --git a/data/reusables/navigation/global-nav-beta-note.md b/data/reusables/navigation/global-nav-beta-note.md deleted file mode 100644 index 740d3ccb6b..0000000000 --- a/data/reusables/navigation/global-nav-beta-note.md +++ /dev/null @@ -1,5 +0,0 @@ -{% note %} - -This article refers to the new global navigation, which is currently in public beta and subject to change. For more information on the new global navigation and reverting to the old global navigation, see the [{% data variables.product.prodname_dotcom %} Changelog](https://github.blog/changelog/2023-06-15-redesigned-navigation-enabled-for-all-users-beta/). - -{% endnote %} diff --git a/data/reusables/organizations/org_settings.md b/data/reusables/organizations/org_settings.md index 56b742230d..575ff8f523 100644 --- a/data/reusables/organizations/org_settings.md +++ b/data/reusables/organizations/org_settings.md @@ -1,3 +1,11 @@ 1. Under your organization name, click {% octicon "gear" aria-hidden="true" %} **Settings**. If you cannot see the "Settings" tab, select the **{% octicon "kebab-horizontal" aria-label="More" %}** dropdown menu, then click **Settings**. - ![Screenshot of the horizontal navigation bar for an organization. The "Settings" tab is outlined in dark orange.](/assets/images/help/organizations/organization-settings-tab.png) +{% ifversion global-nav-update %} + + ![Screenshot of the tabs in an organization's profile. The "Settings" tab is outlined in dark orange.](/assets/images/help/discussions/org-settings-global-nav-update.png) + +{% else %} + + ![Screenshot of the tabs in an organization's profile. The "Settings" tab is outlined in dark orange.](/assets/images/help/discussions/org-settings.png) + +{% endif %} diff --git a/data/reusables/organizations/team_members_tab.md b/data/reusables/organizations/team_members_tab.md index ba6a30b12a..1f0af24446 100644 --- a/data/reusables/organizations/team_members_tab.md +++ b/data/reusables/organizations/team_members_tab.md @@ -1,3 +1,11 @@ 1. At the top of the team page, click {% octicon "organization" aria-hidden="true" %} **Members**. +{% ifversion global-nav-update %} + + ![Screenshot of the header of a team's page. A tab, labeled with an organization icon and "Members", is outlined in dark orange.](/assets/images/help/teams/members-tab-global-nav-update.png) + +{% else %} + ![Screenshot of the header of a team's page. A tab, labeled with an organization icon and "Members", is outlined in dark orange.](/assets/images/help/teams/members-tab.png) + +{% endif %} diff --git a/data/reusables/organizations/team_settings.md b/data/reusables/organizations/team_settings.md index debac46703..982e3af390 100644 --- a/data/reusables/organizations/team_settings.md +++ b/data/reusables/organizations/team_settings.md @@ -1,3 +1,11 @@ 1. At the top of the team page, click {% octicon "gear" aria-hidden="true" %} **Settings**. +{% ifversion global-nav-update %} + + ![Screenshot of the header of a team's page. A tab, labeled with a gear icon and "Settings", is outlined in dark orange.](/assets/images/help/teams/team-settings-global-nav-update.png) + +{% else %} + ![Screenshot of the header of a team's page. A tab, labeled with a gear icon and "Settings", is outlined in dark orange.](/assets/images/help/teams/team-settings-button.png) + +{% endif %} diff --git a/data/reusables/package_registry/package-settings-from-user-level.md b/data/reusables/package_registry/package-settings-from-user-level.md index a77323ba8b..aa47c7b2ec 100644 --- a/data/reusables/package_registry/package-settings-from-user-level.md +++ b/data/reusables/package_registry/package-settings-from-user-level.md @@ -1,5 +1,13 @@ 1. On {% data variables.product.prodname_dotcom %}, navigate to the main page of your personal account. 1. In the top right corner of {% ifversion fpt or ghec %}{% data variables.product.prodname_dotcom_the_website %}{% else %}{% data variables.product.product_name %}{% endif %}, click your profile photo, then click **Your profile**. - ![Screenshot of the dropdown menu under @octocat's profile picture. "Your profile" is outlined in dark orange.](/assets/images/help/profile/top-right-avatar.png) +{% ifversion global-nav-update %} + + ![Screenshot of the dropdown menu under @octocat's profile picture. "Your profile" is outlined in dark orange.](/assets/images/help/profile/profile-button-avatar-menu-global-nav-update.png) + +{% else %} + + ![Screenshot of the dropdown menu under @octocat's profile picture. "Your profile" is outlined in dark orange.](/assets/images/help/profile/profile-button-avatar-menu.png) + +{% endif %} 1. On your profile page, in the header, click the {% octicon "package" aria-hidden="true" %} **Packages** tab. diff --git a/data/reusables/profile/access_org.md b/data/reusables/profile/access_org.md index e2385b11b6..d7dff08b07 100644 --- a/data/reusables/profile/access_org.md +++ b/data/reusables/profile/access_org.md @@ -1,3 +1,11 @@ -1. In the top right corner of {% ifversion fpt or ghec %}{% data variables.product.prodname_dotcom_the_website %}{% else %}{% data variables.product.product_name %}{% endif %}, click your profile photo, then click{% ifversion fpt or ghec %} {% octicon "organization" aria-hidden="true" %}{% endif %} **Your organizations**. +1. In the upper-right corner of {% ifversion fpt or ghec %}{% data variables.product.prodname_dotcom_the_website %}{% else %}{% data variables.product.product_name %}{% endif %}, select your profile photo, then click{% ifversion fpt or ghec %} {% octicon "organization" aria-hidden="true" %}{% endif %} **Your organizations**. + +{% ifversion global-nav-update %} + + ![Screenshot of the dropdown menu under @octocat's profile picture. "Your organizations" is outlined in dark orange.](/assets/images/help/profile/your-organizations-global-nav-update.png) + +{% else %} ![Screenshot of the dropdown menu under @octocat's profile picture. "Your organizations" is outlined in dark orange.](/assets/images/help/profile/your-organizations.png) + +{% endif %} diff --git a/data/reusables/profile/access_profile.md b/data/reusables/profile/access_profile.md index f0b6f1498c..6bab9cfda2 100644 --- a/data/reusables/profile/access_profile.md +++ b/data/reusables/profile/access_profile.md @@ -1,4 +1,12 @@ {% ifversion fpt or ghec %}1. In the top right corner of {% ifversion fpt or ghec %}{% data variables.product.prodname_dotcom_the_website %}{% else %}{% data variables.product.product_name %}{% endif %}, click your profile photo, then click **Your profile**. - ![Screenshot of the dropdown menu under @octocat's profile picture. "Your profile" is outlined in dark orange.](/assets/images/help/profile/top-right-avatar.png){% else %} +{% ifversion global-nav-update %} + + ![Screenshot of the dropdown menu under @octocat's profile picture. "Your profile" is outlined in dark orange.](/assets/images/help/profile/profile-button-avatar-menu-global-nav-update.png) + +{% else %} + + ![Screenshot of the dropdown menu under @octocat's profile picture. "Your profile" is outlined in dark orange.](/assets/images/help/profile/profile-button-avatar-menu.png) + +{% endif %} 1. In the top right corner of {% ifversion fpt or ghec %}{% data variables.product.prodname_dotcom_the_website %}{% else %}{% data variables.product.product_name %}{% endif %}, click your profile photo, then click **Your profile**.{% endif %} diff --git a/data/reusables/repositories/actions-tab.md b/data/reusables/repositories/actions-tab.md index a9a6659f11..271f54f872 100644 --- a/data/reusables/repositories/actions-tab.md +++ b/data/reusables/repositories/actions-tab.md @@ -1,3 +1,11 @@ 1. Under your repository name, click {% octicon "play" aria-hidden="true" %} **Actions**. +{% ifversion global-nav-update %} + + ![Screenshot of the tabs for the "github/docs" repository. The "Actions" tab is highlighted with an orange outline.](/assets/images/help/repository/actions-tab-global-nav-update.png) + +{% else %} + ![Screenshot of the tabs for the "github/docs" repository. The "Actions" tab is highlighted with an orange outline.](/assets/images/help/repository/actions-tab.png) + +{% endif %} diff --git a/data/reusables/repositories/create_new.md b/data/reusables/repositories/create_new.md index 5c43f83092..431585da8f 100644 --- a/data/reusables/repositories/create_new.md +++ b/data/reusables/repositories/create_new.md @@ -1,3 +1,11 @@ -1. In the upper-right corner of any page, use the {% octicon "plus" aria-label="Plus symbol" %} drop-down menu, and select **New repository**. +1. In the upper-right corner of any page, select {% octicon "plus" aria-label="Create something new" %}, then click **New repository**. + +{% ifversion global-nav-update %} + + ![Screenshot of a {% data variables.product.prodname_dotcom %} dropdown menu showing options to create new items. The menu item "New repository" is outlined in dark orange.](/assets/images/help/repository/repo-create-global-nav-update.png) + +{% else %} ![Screenshot of a {% data variables.product.prodname_dotcom %} dropdown menu showing options to create new items. The menu item "New repository" is outlined in dark orange.](/assets/images/help/repository/repo-create.png) + +{% endif %} diff --git a/data/reusables/repositories/disabling-markdown-rendering.md b/data/reusables/repositories/disabling-markdown-rendering.md index f7b6dbf1cb..db8f6a516e 100644 --- a/data/reusables/repositories/disabling-markdown-rendering.md +++ b/data/reusables/repositories/disabling-markdown-rendering.md @@ -1,5 +1,13 @@ -When viewing a Markdown file, you can click {% octicon "code" aria-label="The code icon" %} at the top of the file to disable Markdown rendering and view the file's source instead. +When viewing a Markdown file, you can click {% ifversion code-search-code-view %}**Code**{% else %}{% octicon "code" aria-label="The code icon" %}{% endif %} at the top of the file to disable Markdown rendering and view the file's source instead. -![Screenshot of a Markdown file in a {% data variables.product.prodname_dotcom %} repository showing options for interacting with the file. The button to display the source blob is outlined in dark orange.](/assets/images/help/writing/display-markdown-as-source.png) +{% ifversion code-search-code-view %} + + ![Screenshot of a Markdown file in a {% data variables.product.prodname_dotcom %} repository showing options for interacting with the file. A button, labeled "Code", is outlined in dark orange.](/assets/images/help/writing/display-markdown-as-source-global-nav-update.png) + +{% else %} + + ![Screenshot of a Markdown file in a {% data variables.product.prodname_dotcom %} repository showing options for interacting with the file. The button to display the source blob is outlined in dark orange.](/assets/images/help/writing/display-markdown-as-source.png) + +{% endif %} Disabling Markdown rendering enables you to use source view features, such as line linking, which is not possible when viewing rendered Markdown files. diff --git a/data/reusables/repositories/navigate-to-branches.md b/data/reusables/repositories/navigate-to-branches.md index 6a134ea4e9..127085c1b0 100644 --- a/data/reusables/repositories/navigate-to-branches.md +++ b/data/reusables/repositories/navigate-to-branches.md @@ -5,5 +5,13 @@ {% else %} 1. Above the list of files, click {% octicon "git-branch" aria-hidden="true" %} **Branches**. +{% ifversion global-nav-update %} + + ![Screenshot of the repository page. A link, labeled "55 branches", is highlighted with an orange outline.](/assets/images/help/branches/branches-overview-link-global-nav-update.png) + +{% else %} + ![Screenshot of the repository page. A link, labeled "55 branches", is highlighted with an orange outline.](/assets/images/help/branches/branches-overview-link.png) + +{% endif %} {% endif %} diff --git a/data/reusables/repositories/sidebar-issue-pr.md b/data/reusables/repositories/sidebar-issue-pr.md index a7c49cfea3..bcedfaf57d 100644 --- a/data/reusables/repositories/sidebar-issue-pr.md +++ b/data/reusables/repositories/sidebar-issue-pr.md @@ -1,3 +1,11 @@ 1. Under your repository name, click {% octicon "issue-opened" aria-hidden="true" %} **Issues** or {% octicon "git-pull-request" aria-hidden="true" %} **Pull requests**. +{% ifversion global-nav-update %} + + ![Screenshot of the main page of a repository. In the horizontal navigation bar, two tabs, labeled "Issues" and "Pull requests," are each outlined in dark orange.](/assets/images/help/repository/repo-settings-issues-pull-requests-global-nav-update.png) + +{% else %} + ![Screenshot of the main page of a repository. In the horizontal navigation bar, two tabs, labeled "Issues" and "Pull requests," are each outlined in dark orange.](/assets/images/help/repository/repo-settings-issues-pull-requests.png) + +{% endif %} diff --git a/data/reusables/repositories/sidebar-issues.md b/data/reusables/repositories/sidebar-issues.md index 3c692adc7a..997a7487aa 100644 --- a/data/reusables/repositories/sidebar-issues.md +++ b/data/reusables/repositories/sidebar-issues.md @@ -1,3 +1,11 @@ 1. Under your repository name, click {% octicon "issue-opened" aria-hidden="true" %} **Issues**. +{% ifversion global-nav-update %} + + ![Screenshot of the main page of a repository. In the horizontal navigation bar, a tab, labeled "Issues," is outlined in dark orange.](/assets/images/help/repository/repo-tabs-issues-global-nav-update.png) + +{% else %} + ![Screenshot of the main page of a repository. In the horizontal navigation bar, a tab, labeled "Issues," is outlined in dark orange.](/assets/images/help/repository/repo-tabs-issues.png) + +{% endif %} diff --git a/data/reusables/repositories/sidebar-pr.md b/data/reusables/repositories/sidebar-pr.md index 261b026634..2f970b48ad 100644 --- a/data/reusables/repositories/sidebar-pr.md +++ b/data/reusables/repositories/sidebar-pr.md @@ -1,3 +1,10 @@ 1. Under your repository name, click {% octicon "git-pull-request" aria-hidden="true" %} **Pull requests**. +{% ifversion global-nav-update %} + + ![Screenshot of the main page of a repository. In the horizontal navigation bar, a tab, labeled "Pull requests," is outlined in dark orange.](assets/images/help/repository/repo-tabs-pull-requests-global-nav-update.png) + +{% else %} ![Screenshot of the main page of a repository. In the horizontal navigation bar, a tab, labeled "Pull requests," is outlined in dark orange.](/assets/images/help/repository/repo-tabs-pull-requests.png) + +{% endif %} diff --git a/data/reusables/sponsors/navigate-to-sponsors-dashboard.md b/data/reusables/sponsors/navigate-to-sponsors-dashboard.md index 0599dcb904..29d8945b03 100644 --- a/data/reusables/sponsors/navigate-to-sponsors-dashboard.md +++ b/data/reusables/sponsors/navigate-to-sponsors-dashboard.md @@ -1,4 +1,12 @@ 1. In the upper-right corner of any page, click your profile photo, then click **Your sponsors**. - ![Screenshot of the profile options dropdown menu. One option, labeled "Your sponsors," is outlined in dark orange.](/assets/images/help/sponsors/access-github-sponsors-dashboard.png) +{% ifversion global-nav-update %} + + ![Screenshot of the profile options dropdown menu. One option, labeled "Your sponsors," is outlined in dark orange.](/assets/images/help/sponsors/access-sponsors-dashboard-global-nav-update.png) + +{% else %} + + ![Screenshot of the profile options dropdown menu. One option, labeled "Your sponsors," is outlined in dark orange.](/assets/images/help/sponsors/access-github-sponsors-dashboard.png) + +{% endif %} 1. If a list of your sponsored and eligible accounts is shown, to the right of the account you want to manage, click **Dashboard**. diff --git a/data/reusables/user-settings/access_settings.md b/data/reusables/user-settings/access_settings.md index 54562b67cc..1d5a4c8924 100644 --- a/data/reusables/user-settings/access_settings.md +++ b/data/reusables/user-settings/access_settings.md @@ -1,3 +1,11 @@ 1. In the upper-right corner of any page, click your profile photo, then click **Settings**. - ![Screenshot of {% data variables.product.prodname_dotcom %}'s account menu showing options for users to view and edit their profile, content, and settings. The menu item "Settings" is outlined in dark orange.](/assets/images/help/settings/userbar-account-settings.png) +{% ifversion global-nav-update %} + + ![Screenshot of a user's account menu on {% data variables.product.prodname_dotcom %}. The menu item "Settings" is outlined in dark orange.](/assets/images/help/settings/userbar-account-settings-global-nav-update.png) + +{% else %} + + ![Screenshot of a user's account menu on {% data variables.product.prodname_dotcom %}. The menu item "Settings" is outlined in dark orange.](/assets/images/help/settings/userbar-account-settings.png) + +{% endif %} diff --git a/data/reusables/user-settings/personal_dashboard.md b/data/reusables/user-settings/personal_dashboard.md index 5736fe674c..8ea461ac47 100644 --- a/data/reusables/user-settings/personal_dashboard.md +++ b/data/reusables/user-settings/personal_dashboard.md @@ -1 +1 @@ -{% ifversion fpt or ghec %}[personal dashboard](https://github.com/dashboard){% else %}personal dashboard (`https://[hostname]/dashboard`){% endif %} +{% ifversion fpt or ghec %}[personal dashboard](https://github.com/dashboard){% else %}personal dashboard (`https://HOSTNAME/dashboard`){% endif %}