diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 2fa7a86b9fc3..b5f0ccbfec79 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -25,3 +25,11 @@ Thanks again! - [ ] I have reviewed my changes in staging. (look for the **deploy-to-heroku** link in your pull request, then click **View deployment**) - [ ] For content changes, I have reviewed the [localization checklist](https://github.com/github/docs/blob/main/contributing/localization-checklist.md) - [ ] For content changes, I have reviewed the [Content style guide for GitHub Docs](https://github.com/github/docs/blob/main/contributing/content-style-guide.md). + +### Writer impact (This section is for GitHub staff members only): + +- [ ] This pull request impacts the contribution experience + - [ ] I have added the 'writer impact' label + - [ ] I have added a description and/or a video demo of the changes below (eg. a "before and after video") + + diff --git a/content/admin/enterprise-management/upgrading-github-enterprise-server.md b/content/admin/enterprise-management/upgrading-github-enterprise-server.md index a839c0341094..8ca6149d98aa 100644 --- a/content/admin/enterprise-management/upgrading-github-enterprise-server.md +++ b/content/admin/enterprise-management/upgrading-github-enterprise-server.md @@ -89,7 +89,12 @@ There are two types of snapshots: {% note %} -**Note**: Installing a hotpatch using the {% data variables.enterprise.management_console %} is not available in clustered environments. To install a hotpatch in a clustered environment, see "[Upgrading a cluster](/enterprise/{{ currentVersion }}/admin/clustering/upgrading-a-cluster#upgrading-with-a-hotpatch)." +**{% if currentVersion ver_gt "enterprise-server@2.22" %}Notes{% else %}Note{% endif %}**: + +{% if currentVersion ver_gt "enterprise-server@2.22" %} +- If {% data variables.product.product_location %} is running a release candidate build, you can't upgrade with a hotpatch. + +- {% endif %}Installing a hotpatch using the {% data variables.enterprise.management_console %} is not available in clustered environments. To install a hotpatch in a clustered environment, see "[Upgrading a cluster](/enterprise/{{ currentVersion }}/admin/clustering/upgrading-a-cluster#upgrading-with-a-hotpatch)." {% endnote %} diff --git a/content/admin/user-management/migrating-to-internal-repositories.md b/content/admin/user-management/migrating-to-internal-repositories.md index c3abc3d40b72..24b7a43c7ca0 100644 --- a/content/admin/user-management/migrating-to-internal-repositories.md +++ b/content/admin/user-management/migrating-to-internal-repositories.md @@ -34,6 +34,12 @@ If you don't have private mode enabled, the migration script will have no effect ### Running the migration 1. Connect to the administrative shell. For more information, see "[Accessing the administrative shell (SSH)](/enterprise/admin/installation/accessing-the-administrative-shell-ssh)." +{% if currentVersion ver_gt "enterprise-server@2.22" or currentVersion == "github-ae@latest" %} +2. Run the migration command. + ```shell + github-env bin/safe-ruby lib/github/transitions/20191210220630_convert_public_ghes_repos_to_internal.rb --verbose -w | tee -a /tmp/convert_public_ghes_repos_to_internal.log + ``` +{% else %} 2. Navigate to the `/data/github/current` directory. ```shell cd /data/github/current @@ -42,6 +48,7 @@ If you don't have private mode enabled, the migration script will have no effect ```shell sudo bin/safe-ruby lib/github/transitions/20191210220630_convert_public_ghes_repos_to_internal.rb --verbose -w | tee -a /tmp/convert_public_ghes_repos_to_internal.log ``` +{% endif %} Log output will appear in the terminal and `/tmp/convert_public_ghes_repos_to_internal.log`. diff --git a/content/communities/documenting-your-project-with-wikis/about-wikis.md b/content/communities/documenting-your-project-with-wikis/about-wikis.md index 2fe6a489b7f7..f814ef736aab 100644 --- a/content/communities/documenting-your-project-with-wikis/about-wikis.md +++ b/content/communities/documenting-your-project-with-wikis/about-wikis.md @@ -22,6 +22,12 @@ With wikis, you can write content just like everywhere else on {% data variables You can edit wikis directly on {% data variables.product.product_name %}, or you can edit wiki files locally. By default, only people with write access to your repository can make changes to wikis, although you can allow everyone on {% data variables.product.product_location %} to contribute to a wiki in {% if currentVersion == "github-ae@latest" %}an internal{% else %}a public{% endif %} repository. For more information, see "[Changing access permissions for wikis](/communities/documenting-your-project-with-wikis/changing-access-permissions-for-wikis)". +{% note %} + +**Note:** Search engines will not index the contents of wikis. To have your content indexed by search engines, you can use [{% data variables.product.prodname_pages %}](/pages) in a public repository. + +{% endnote %} + ### Further reading - "[Adding or editing wiki pages](/communities/documenting-your-project-with-wikis/adding-or-editing-wiki-pages)" diff --git a/content/developers/overview/secret-scanning.md b/content/developers/overview/secret-scanning.md index d7d1e02bf326..2f3c818575f9 100644 --- a/content/developers/overview/secret-scanning.md +++ b/content/developers/overview/secret-scanning.md @@ -88,6 +88,12 @@ We strongly recommend you implement signature validation in your secret alert se You can retrieve the {% data variables.product.prodname_dotcom %} secret scanning public key from https://api.github.com/meta/public_keys/secret_scanning and validate the message using the `ECDSA-NIST-P256V1-SHA256` algorithm. +{% note %} + +**Note**: When you send a request to the public key endpoint above, you may hit rate limits. To avoid hitting rate limits, you can use a personal access token as suggested below, or use a conditional request. For more information, see "[Getting started with the REST API](/rest/guides/getting-started-with-the-rest-api#conditional-requests)." + +{% endnote %} + Assuming you receive the following message, the code snippets below demonstrate how you could perform signature validation. The code also assumes you've set an environment variable called `GITHUB_PRODUCTION_TOKEN` with a generated PAT (https://github.com/settings/tokens). The token does not need any permissions set. @@ -358,4 +364,3 @@ A few important points: **Note:** Our request timeout is set to be higher (that is, 30 seconds) for partners who provide data about false positives. If you require a timeout higher than 30 seconds, email us at secret-scanning@github.com. {% endnote %} - diff --git a/content/github/managing-your-work-on-github/about-automation-for-issues-and-pull-requests-with-query-parameters.md b/content/github/managing-your-work-on-github/about-automation-for-issues-and-pull-requests-with-query-parameters.md index 010c9aea63bc..e3d517ddcd40 100644 --- a/content/github/managing-your-work-on-github/about-automation-for-issues-and-pull-requests-with-query-parameters.md +++ b/content/github/managing-your-work-on-github/about-automation-for-issues-and-pull-requests-with-query-parameters.md @@ -21,7 +21,7 @@ Query parameters are optional parts of a URL you can customize to share a specif You must have the proper permissions for any action to use the equivalent query parameter. For example, you must have permission to add a label to an issue to use the `labels` query parameter. -If you create an invalid URL using query parameters, or if you don’t have the proper permissions, the URL will return a 404 error page. +If you create an invalid URL using query parameters, or if you don’t have the proper permissions, the URL will return a `404 Not Found` error page. If you create a URL that exceeds the server limit, the URL will return a `414 URI Too Long` error page. ### Supported query parameters diff --git a/data/reusables/gated-features/auto-merge.md b/data/reusables/gated-features/auto-merge.md index 4f05ac43bd64..7ce0001dbe8e 100644 --- a/data/reusables/gated-features/auto-merge.md +++ b/data/reusables/gated-features/auto-merge.md @@ -1 +1 @@ -{% if currentVersion == "github-ae@latest" %}Auto-merge for pull requests is available in internal and private repositories with {% data variables.product.prodname_ghe_managed %}, {% else %}Auto-merge for pull requests is available {% endif %} in public repositories with {% data variables.product.prodname_free_user %} and {% data variables.product.prodname_free_team %} for organizations, and in public and private repositories with {% data variables.product.prodname_pro %}, {% data variables.product.prodname_team %}, {% data variables.product.prodname_ghe_cloud %}, and {% data variables.product.prodname_ghe_server %}. {% if currentVersion == "free-pro-team@latest" %}{% data reusables.gated-features.more-info %}{% endif %} +{% if currentVersion == "github-ae@latest" %}Auto-merge for pull requests is available in internal and private repositories with {% data variables.product.prodname_ghe_managed %}, {% else %}Auto-merge for pull requests is available {% endif %} in public repositories with {% data variables.product.prodname_free_user %} and {% data variables.product.prodname_free_team %} for organizations, and in public and private repositories with {% data variables.product.prodname_pro %}, {% data variables.product.prodname_team %}, {% if enterpriseServerVersions contains "enterprise-server@3.1" %}{% data variables.product.prodname_ghe_cloud %}, and {% data variables.product.prodname_ghe_server %}{% else %}and {% data variables.product.prodname_ghe_cloud %}{% endif %}. {% if currentVersion == "free-pro-team@latest" %}{% data reusables.gated-features.more-info %}{% endif %} diff --git a/data/reusables/repositories/actions-scheduled-workflow-example.md b/data/reusables/repositories/actions-scheduled-workflow-example.md index 40d253284b94..3dae8f356e62 100644 --- a/data/reusables/repositories/actions-scheduled-workflow-example.md +++ b/data/reusables/repositories/actions-scheduled-workflow-example.md @@ -6,6 +6,6 @@ This example triggers the workflow every day at 5:30 and 17:30 UTC: on: schedule: # * is a special character in YAML so you have to quote this string - - cron: '*/30 5,17 * * *' + - cron: '30 5,17 * * *' ``` diff --git a/includes/header.html b/includes/header.html index 56f3709c5cca..d27e2802dccb 100644 --- a/includes/header.html +++ b/includes/header.html @@ -22,7 +22,7 @@

{% data ui.homepage.explore_by_product %}

- +
@@ -35,7 +35,7 @@

{% data ui.h {% for product in activeProducts %} + {% if product.id == currentProduct %}color-text-link text-underline active{% elsif product.id == currentProduct.id %}color-text-link text-underline active{% else %}Link--primary no-underline{% endif %}"> {{ product.name }} {% if product.external %} diff --git a/stylesheets/article.scss b/stylesheets/article.scss index 8533e1cb8950..f7fdf6349a67 100644 --- a/stylesheets/article.scss +++ b/stylesheets/article.scss @@ -10,8 +10,8 @@ grid-template-rows: auto 1fr; grid-template-columns: minmax(500px, 720px) minmax(220px, 1fr); grid-template-areas: - 'top right-sidebar' - 'bottom right-sidebar'; + "top right-sidebar" + "bottom right-sidebar"; column-gap: $spacer-6; } @@ -45,7 +45,6 @@ /* Deprecation banner ------------------------------------------------------------------------------*/ .deprecation-banner { - & + .alert { margin-top: 5px; } @@ -58,24 +57,21 @@ margin-bottom: 0; } - + #bootcamp { - margin-top: 20px; - } - b, strong { font-weight: bold; } p { - margin: 0; + margin: 0; } } /* Code style overrides ------------------------------------------------------------------------------*/ -.markdown-body .highlight pre, .markdown-body pre { +.markdown-body .highlight pre, +.markdown-body pre { margin-top: 10px; } @@ -93,12 +89,13 @@ } } -.breadcrumbs a:not(:last-child)::after, .breadcrumbs span:not(:last-child)::after { - content: '/'; +.breadcrumbs a:not(:last-child)::after, +.breadcrumbs span:not(:last-child)::after { + content: "/"; color: var(--color-auto-gray-4); padding-right: $spacer-1; padding-left: $spacer-2; - display:inline-block; + display: inline-block; } /* Numbered procedures (step 1, step 2, ...) @@ -181,7 +178,8 @@ img[src*="https://github.githubassets.com/images/icons/emoji"] { .warning, .danger { // remove extra space under lists inside of notes - ul, ol { + ul, + ol { margin-bottom: 0; } } diff --git a/stylesheets/dev-toc.scss b/stylesheets/dev-toc.scss index 6c16a24b865e..b40f48cbbb33 100644 --- a/stylesheets/dev-toc.scss +++ b/stylesheets/dev-toc.scss @@ -11,4 +11,4 @@ ul.versions-list > li { details ul.products-list li { margin: 3px 0 0 30px; -} \ No newline at end of file +} diff --git a/stylesheets/directory.scss b/stylesheets/directory.scss deleted file mode 100644 index 67c9d0afbf90..000000000000 --- a/stylesheets/directory.scss +++ /dev/null @@ -1,50 +0,0 @@ -/* Styles for directory pages (any page that organizes categories and articles) -------------------------------------------------------------------------------*/ - -// Hoverable boxes on product pages -// Markup can be different and we need both selectors below -.directory-link-box:hover .Box, -.directory-link-box.Box:hover { - border: 1px solid var(--color-auto-blue-5); -} - -// Expandable grid is used on article listing pages -// e.g. enterprise/2.15/admin/installation -.directory-dropdown-grid { - display: grid; - grid-template-columns: 100%; - grid-column-gap: 48px; - grid-row-gap: 24px; - - @include breakpoint(lg) { - grid-template-columns: calc(50% - 24px) calc(50% - 24px); - } - - // Disable the grid row expanding from expanding a closed dropdown on desktop - @include breakpoint(lg) { - .dropdown-withArrow { - max-height: 74px; - - &[open] { - max-height: initial; - } - } - } -} - -// Product ToC list -.directory-toc { - h2 { - margin-top: $spacer-6; - - &:first-of-type { - margin-top: 0; - } - } - - h3 { - margin-top: 0; - padding-bottom: initial; - border-bottom: 0; - } -} diff --git a/stylesheets/gradient.scss b/stylesheets/gradient.scss index a6e61d2f8b4d..b6062ad72b78 100644 --- a/stylesheets/gradient.scss +++ b/stylesheets/gradient.scss @@ -1,6 +1,11 @@ $gradients: ( - "-purple-pink": linear-gradient(135deg, var(--color-auto-purple-5) 0%, var(--color-auto-pink-5) 100%), -/*"-aquamarine-mauve": linear-gradient(130deg, #3bf0e4 -6.8%, #bca1f7 70%), + "-purple-pink": + linear-gradient( + 135deg, + var(--color-auto-purple-5) 0%, + var(--color-auto-pink-5) 100% + ), + /*"-aquamarine-mauve": linear-gradient(130deg, #3bf0e4 -6.8%, #bca1f7 70%), "-purple-coral": linear-gradient(87.54deg, #9867f0 -6.8%, #ed4e50 84.14%), "-purple-coral-dark": linear-gradient(92deg, #bca1f7 15%, #e577b4 45%, #ff7170 85%), "-coral-yellow": linear-gradient(267.91deg, #ffe57f 9.35%, #ff7170 96.48%), @@ -12,9 +17,24 @@ $gradients: ( "-blue-green": linear-gradient(-70deg, #2188ff 0%, #01a49e 100%), "-red-orange": linear-gradient(-70deg, #ed4e50 0%, #f06f00 100%), "-blue-purple": linear-gradient(-70deg, #2188ff 0%, #804eda 100%), */ - "-pink-blue": linear-gradient(90deg, var(--color-auto-pink-5) -50%, var(--color-auto-blue-5) 150%), - "-pink-blue-dark": linear-gradient(-70deg, var(--color-auto-pink-3) 0%, var(--color-auto-blue-3) 100%), - "-blue-pink": linear-gradient(-70deg, var(--color-auto-blue-5) 0%, var(--color-auto-pink-5) 100%) + "-pink-blue": + linear-gradient( + 90deg, + var(--color-auto-pink-5) -50%, + var(--color-auto-blue-5) 150% + ), + "-pink-blue-dark": + linear-gradient( + -70deg, + var(--color-auto-pink-3) 0%, + var(--color-auto-blue-3) 100% + ), + "-blue-pink": + linear-gradient( + -70deg, + var(--color-auto-blue-5) 0%, + var(--color-auto-pink-5) 100% + ) ) !default; @mixin bg-gradient($parent, $gradient) { @@ -23,8 +43,9 @@ $gradients: ( } } +/* @mixin text-gradient($parent, $gradient) { - #{$parent} { + #{parent} { background-image: $gradient; -webkit-background-clip: text; background-clip: text; @@ -32,6 +53,7 @@ $gradients: ( color: transparent; } } +*/ $border-width: 2px; @mixin border-gradient($parent, $gradient) { @@ -71,9 +93,11 @@ $border-width: 2px; @include bg-gradient(".bg-gradient-#{$gradient}", $value); } +/* @each $gradient, $value in $gradients { - @include text-gradient(".text-gradient-#{$gradient}", $value); + @include text-gradient(".text-gradient-#{gradient}", $value); } +*/ @each $gradient, $value in $gradients { @include border-gradient(".border-gradient-#{$gradient}", $value); diff --git a/stylesheets/index.scss b/stylesheets/index.scss index ca807a051476..839832056c81 100644 --- a/stylesheets/index.scss +++ b/stylesheets/index.scss @@ -12,7 +12,6 @@ $marketing-font-path: "/dist/fonts/"; @import "new-mktg.scss"; @import "type.scss"; @import "nav.scss"; -@import "directory.scss"; @import "article.scss"; @import "search.scss"; @import "overrides.scss"; diff --git a/stylesheets/nav.scss b/stylesheets/nav.scss index f7c8a9fd5739..9271120e14e7 100644 --- a/stylesheets/nav.scss +++ b/stylesheets/nav.scss @@ -46,14 +46,14 @@ header summary, } .nav-mobile-burgerIcon { - background: url('/assets/images/octicons/hamburger.svg') no-repeat right; + background: url("/assets/images/octicons/hamburger.svg") no-repeat right; width: 18px; height: 23px; position: relative; z-index: 3; &.js-open { - background: url('/assets/images/octicons/x.svg') no-repeat right; + background: url("/assets/images/octicons/x.svg") no-repeat right; width: 16px; height: 21px; } @@ -91,7 +91,7 @@ header summary, } } -.nav-dropdown { +.nav-dropdown { @media (min-width: 1012px) and (max-width: 1279px) { right: 0; } diff --git a/stylesheets/new-mktg.scss b/stylesheets/new-mktg.scss index 6d5c56e10191..ecef50779a2b 100644 --- a/stylesheets/new-mktg.scss +++ b/stylesheets/new-mktg.scss @@ -1,23 +1,15 @@ /* Styles not incorporated into Primer yet ------------------------------------------------------------------------------*/ -// Position utils -@media (min-width: $width-lg) { - .top-lg-n9 { - top: -$spacer-9; - } -} - -// Type -.color-text-link-mktg { - color: var(--color-auto-blue-5) !important; -} - // Text styling .underline-dashed { display: inline; padding-bottom: $spacer-1; - background-image: linear-gradient(to right, var(--color-auto-gray-3) 50%, transparent 0%); + background-image: linear-gradient( + to right, + var(--color-auto-gray-3) 50%, + transparent 0% + ); background-repeat: repeat-x; background-position: bottom; background-size: 10px 1px; @@ -51,7 +43,9 @@ // Typography $marketing-font-path: "/assets/fonts/alliance/"; -$font-family-mktg: "Alliance No.1", -apple-system, BlinkMacSystemFont, "Segoe UI", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol" !default; +$font-family-mktg: "Alliance No.1", -apple-system, BlinkMacSystemFont, + "Segoe UI", Helvetica, Arial, sans-serif, "Apple Color Emoji", + "Segoe UI Emoji", "Segoe UI Symbol" !default; $font-weight-extrabold: 800 !default; .font-mktg { @@ -63,7 +57,8 @@ $font-weight-extrabold: 800 !default; font-family: "Alliance No.1"; font-style: normal; font-weight: $font-weight-normal; - src: local("Alliance No.1 Regular"), local("alliance-no-1-regular"), url("#{$marketing-font-path}alliance-no-1-regular.woff") format("woff"); + src: local("Alliance No.1 Regular"), local("alliance-no-1-regular"), + url("#{$marketing-font-path}alliance-no-1-regular.woff") format("woff"); font-display: swap; } @@ -71,7 +66,8 @@ $font-weight-extrabold: 800 !default; font-family: "Alliance No.1"; font-style: normal; font-weight: $font-weight-semibold; - src: local("Alliance No.1 Medium"), local("alliance-no-1-medium"), url("#{$marketing-font-path}alliance-no-1-medium.woff") format("woff"); + src: local("Alliance No.1 Medium"), local("alliance-no-1-medium"), + url("#{$marketing-font-path}alliance-no-1-medium.woff") format("woff"); font-display: swap; } @@ -79,7 +75,8 @@ $font-weight-extrabold: 800 !default; font-family: "Alliance No.1"; font-style: normal; font-weight: $font-weight-bold; - src: local("Alliance No.1 Bold"), local("alliance-no-1-bold"), url("#{$marketing-font-path}alliance-no-1-bold.woff") format("woff"); + src: local("Alliance No.1 Bold"), local("alliance-no-1-bold"), + url("#{$marketing-font-path}alliance-no-1-bold.woff") format("woff"); font-display: swap; } @@ -87,6 +84,7 @@ $font-weight-extrabold: 800 !default; font-family: "Alliance No.1"; font-style: normal; font-weight: $font-weight-extrabold; - src: local("Alliance No.1 ExtraBold"), local("alliance-no-1-extrabold"), url("#{$marketing-font-path}alliance-no-1-extrabold.woff") format("woff"); + src: local("Alliance No.1 ExtraBold"), local("alliance-no-1-extrabold"), + url("#{$marketing-font-path}alliance-no-1-extrabold.woff") format("woff"); font-display: swap; } diff --git a/stylesheets/opacity.scss b/stylesheets/opacity.scss index 74f81ddefa00..a2b96b4cd755 100644 --- a/stylesheets/opacity.scss +++ b/stylesheets/opacity.scss @@ -1,11 +1,6 @@ -.opacity-0 { opacity: 0; } -.opacity-10 { opacity: 0.1; } -.opacity-80 { opacity: 0.2; } -.opacity-30 { opacity: 0.3; } -.opacity-40 { opacity: 0.4; } -.opacity-50 { opacity: 0.5; } -.opacity-60 { opacity: 0.6; } -.opacity-70 { opacity: 0.7; } -.opacity-80 { opacity: 0.8; } -.opacity-90 { opacity: 0.9; } -.opacity-100 { opacity: 1; } \ No newline at end of file +.opacity-60 { + opacity: 0.6; +} +.opacity-70 { + opacity: 0.7; +} diff --git a/stylesheets/overrides.scss b/stylesheets/overrides.scss index b898027c762a..30f3389ca67f 100644 --- a/stylesheets/overrides.scss +++ b/stylesheets/overrides.scss @@ -14,6 +14,7 @@ } } +// NB: Note that there's also overlapping styling in "article.scss" .markdown-body ol > li { padding: $spacer-2 0 $spacer-2 $spacer-7; border: 0; @@ -31,7 +32,6 @@ .extended-markdown { margin-top: 15px; } - } .markdown-body ul ul, @@ -65,21 +65,18 @@ color: var(--color-text-primary); } -.product-callout p, .contributor-callout p { +.product-callout p, +.contributor-callout p { margin: 0; } +// Largely overwritten in tables.scss .markdown-body table { display: table; table-layout: fixed; line-height: 1.5; } -li.nestedTocItem { - margin-left: 2em; - list-style-type: circle; -} - /* Getting Started and Popular Articles sections in article layout */ .markdown-body div.featured-links { padding-bottom: 30px; @@ -97,12 +94,6 @@ li.nestedTocItem { margin-top: 0; } -.octicon { - display: inline-block; - vertical-align: text-top; - fill: currentColor; -} - /* code styles */ pre .redbox { border: 2px solid var(--color-auto-red-5); @@ -125,27 +116,6 @@ pre .bluebox { margin-right: 2px; } -/* Accessibility color contrast */ -.btn-mktg { - background-color: var(--color-auto-blue-5); -} - -/* Accessibility color contrast */ -.btn-outline-mktg { - background-color: var(--color-auto-inverse); - color: var(--color-auto-blue-5); -} - -/* Accessibility color contrast */ -.color-bg-danger a { - color: var(--color-auto-blue-6); -} - -/* Accessibility color contrast */ -.markdown-body .color-bg-info blockquote { - color: var(--color-auto-gray-6); -} - /* Helpfulness survey override */ :checked + .x-radio-label { background: var(--color-auto-blue-5); diff --git a/stylesheets/product-landing.scss b/stylesheets/product-landing.scss index 2024e1b43e5f..65d0369fe314 100644 --- a/stylesheets/product-landing.scss +++ b/stylesheets/product-landing.scss @@ -1,3 +1,7 @@ .bg-guides-gradient { - background: linear-gradient(0deg, var(--color-auto-blue-0) 0%, transparent 100%); + background: linear-gradient( + 0deg, + var(--color-auto-blue-0) 0%, + transparent 100% + ); } diff --git a/stylesheets/product-sublanding.scss b/stylesheets/product-sublanding.scss index f3e5cb6334d2..200145b89dca 100644 --- a/stylesheets/product-sublanding.scss +++ b/stylesheets/product-sublanding.scss @@ -6,7 +6,7 @@ .learning-track { &--description { - min-height: 1em * $body-line-height * 3 + min-height: 1em * $body-line-height * 3; } } @@ -17,10 +17,12 @@ .step-circle-text { color: var(--color-auto-purple-5); } + .description-text { opacity: 0.7; line-height: 1.8em; } + .uppercase-category-text { letter-spacing: 0.08em; font-size: 0.8em; @@ -39,27 +41,14 @@ @include truncate(3); @include truncate(8); - .fade-background-left { - background: linear-gradient( - to right, - var(--color-bg-tertiary), - transparent - ); + background: linear-gradient(to right, var(--color-bg-tertiary), transparent); } .fade-background-right { - background: linear-gradient( - to left, - var(--color-bg-tertiary), - transparent - ); + background: linear-gradient(to left, var(--color-bg-tertiary), transparent); } .fade-background-bottom { - background: linear-gradient( - to top, - var(--color-bg-tertiary), - transparent - ); + background: linear-gradient(to top, var(--color-bg-tertiary), transparent); } diff --git a/stylesheets/release-notes.scss b/stylesheets/release-notes.scss index 7470f3132348..ba3397dde5f2 100644 --- a/stylesheets/release-notes.scss +++ b/stylesheets/release-notes.scss @@ -1,15 +1,15 @@ ul.release-notes-list li.release-notes-list-item { font-size: 15px !important; - &::marker { + &::marker { // `• ` - content: '\2022\00a0\00a0\00a0\00a0'; + content: "\2022\00a0\00a0\00a0\00a0"; font-size: 1.6em; color: var(--color-auto-gray-4); } &.list-style-none::marker { - content: ''; + content: ""; } } @@ -17,7 +17,9 @@ ul.release-notes-list li.release-notes-list-item { font-size: 15px !important; } -details[open].release-notes-version-picker summary .octicon.octicon-chevron-down { +details[open].release-notes-version-picker + summary + .octicon.octicon-chevron-down { transform: rotate(180deg); } @@ -27,7 +29,7 @@ details[open].release-notes-version-picker summary .octicon.octicon-chevron-down } } -$colors-list:( +$colors-list: ( features: var(--color-auto-green-5), bugs: var(--color-auto-yellow-5), known_issues: var(--color-auto-blue-5), @@ -37,11 +39,12 @@ $colors-list:( backups: var(--color-auto-orange-5) ); -@each $key,$val in $colors-list{ +@each $key, $val in $colors-list { .release-notes-section-#{$key} { .release-notes-section-label { background-color: #{$val}; } + .release-notes-section-heading { color: #{$val}; } diff --git a/stylesheets/scroll-button.scss b/stylesheets/scroll-button.scss index d2fe257a87ad..4f49d365359a 100644 --- a/stylesheets/scroll-button.scss +++ b/stylesheets/scroll-button.scss @@ -1,18 +1,19 @@ button.arrow-for-scrolling-top { - opacity: 0; + opacity: 0; + transition: 1s; + background-color: var(--color-auto-blue-5); + color: var(--color-text-inverse); + position: fixed; + bottom: 10px; + right: 10px; + display: block; + width: 40px; + height: 40px; + border-radius: 50%; + + &.show { + opacity: 1; + border: none; transition: 1s; - background-color: var(--color-auto-blue-5); - color: var(--color-text-inverse); - position: fixed; - bottom: 10px; - right: 10px; - display: block; - width: 40px; - height: 40px; - border-radius: 50%; - &.show { - opacity: 1; - border: none; - transition: 1s; - } + } } diff --git a/stylesheets/search.scss b/stylesheets/search.scss index 0972cd31b9a9..1219f52808ba 100644 --- a/stylesheets/search.scss +++ b/stylesheets/search.scss @@ -22,31 +22,8 @@ Form and inputs using .ais- prefix gets added by search.js */ padding: 10px $spacer-2 10px $spacer-5; font-size: 16px; @extend .form-control; - background: var(--color-bg-primary) url("/assets/images/octicons/search.svg") no-repeat 6px; -} - -.ais-SearchBox-reset { - width: 30px; - height: 100%; - position: absolute; - top: 0; - right: 0; - opacity: 0.5; - border: none; - outline: none; - background: none; - z-index: 1; - - @include breakpoint(md) { - header & { - height: 30px; - } - } - - .ais-SearchBox-resetIcon { - width: 12px; - height: 12px; - } + background: var(--color-bg-primary) url("/assets/images/octicons/search.svg") + no-repeat 6px; } .ais-Hits-item { @@ -70,8 +47,7 @@ Form and inputs using .ais- prefix gets added by search.js */ } mark, -.ais-Highlight-highlighted -{ +.ais-Highlight-highlighted { background: none; color: inherit; diff --git a/stylesheets/shadows.scss b/stylesheets/shadows.scss index c3f05069d19c..63af06627ea8 100644 --- a/stylesheets/shadows.scss +++ b/stylesheets/shadows.scss @@ -1,5 +1,5 @@ .hover-shadow { - & { + /* & { transition: box-shadow 0.3s ease-in-out; &:hover { @@ -13,7 +13,7 @@ &:hover { box-shadow: var(--color-shadow-medium) !important; } - } + } */ &-large { transition: box-shadow 0.3s ease-in-out; @@ -23,11 +23,11 @@ } } - &-extra-large { + /* &-extra-large { transition: box-shadow 0.3s ease-in-out; &:hover { box-shadow: var(--color-shadow-extra-large) !important; } - } + } */ } diff --git a/stylesheets/sidebar.scss b/stylesheets/sidebar.scss index 5b7a136706af..dcfcd8e58639 100644 --- a/stylesheets/sidebar.scss +++ b/stylesheets/sidebar.scss @@ -46,8 +46,6 @@ .sidebar-category, .sidebar-maptopic, .sidebar-article { - &.active > a { - } &.is-current-page > a { color: var(--color-auto-blue-3); } @@ -60,6 +58,7 @@ .sidebar-maptopic { .sidebar-article { position: relative; + &::before { content: ""; position: absolute; @@ -69,6 +68,7 @@ width: 1px; top: 0; } + &.active { &::before { border-left: 3px solid var(--color-auto-blue-7); diff --git a/stylesheets/type.scss b/stylesheets/type.scss index 13b427b55380..9811628ba1f0 100644 --- a/stylesheets/type.scss +++ b/stylesheets/type.scss @@ -25,6 +25,7 @@ summary { display: inline-block; margin-top: 10px; margin-bottom: 10px; + p { margin: 0; padding: 0; @@ -37,8 +38,4 @@ summary { // except those on each product's toc h3 a { color: var(--color-auto-blue-5); - - .directory-toc & { - color: var(--color-auto-gray-9); - } }