Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -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")

<!-- Description of the writer impact here -->
4 changes: 2 additions & 2 deletions includes/header.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<div class="py-2 py-md-0 d-md-inline-block">
<h4 class="text-mono f5 text-normal color-text-secondary d-md-none">{% data ui.homepage.explore_by_product %}</h4>
<details class="dropdown-withArrow position-relative details details-reset d-md-none close-when-clicked-outside">
<summary class="nav-desktop-productDropdownButton color-text-link-mktg py-2" role="button" aria-label="Toggle products list">
<summary class="nav-desktop-productDropdownButton color-text-link py-2" role="button" aria-label="Toggle products list">
<div id="current-product" class="d-flex flex-items-center flex-justify-between" style="padding-top: 2px;">
<!-- Product switcher - GitHub.com, Enterprise Server, etc -->
<!-- 404 and 500 error layouts are not real pages so we need to hardcode the name for those -->
Expand All @@ -35,7 +35,7 @@ <h4 class="text-mono f5 text-normal color-text-secondary d-md-none">{% data ui.h
{% for product in activeProducts %}
<a href="{% unless product.external %}/{{ currentLanguage }}{% endunless %}{{ product.href }}"
class="d-block py-2
{% if product.id == currentProduct %}color-text-link-mktg text-underline active{% elsif product.id == currentProduct.id %}color-text-link-mktg text-underline active{% else %}Link--primary no-underline{% endif %}">
{% 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 %}
<span class="ml-1"><svg width="9" height="10" viewBox="0 0 9 10" fill="none" xmlns="http://www.w3.org/2000/svg"><path stroke="currentColor" d="M.646 8.789l8-8M8.5 9V1M1 .643h8"/></svg></span>
Expand Down
24 changes: 11 additions & 13 deletions stylesheets/article.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down Expand Up @@ -45,7 +45,6 @@
/* Deprecation banner
------------------------------------------------------------------------------*/
.deprecation-banner {

& + .alert {
margin-top: 5px;
}
Expand All @@ -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;
}

Expand All @@ -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, ...)
Expand Down Expand Up @@ -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;
}
}
2 changes: 1 addition & 1 deletion stylesheets/dev-toc.scss
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ ul.versions-list > li {

details ul.products-list li {
margin: 3px 0 0 30px;
}
}
50 changes: 0 additions & 50 deletions stylesheets/directory.scss

This file was deleted.

38 changes: 31 additions & 7 deletions stylesheets/gradient.scss
Original file line number Diff line number Diff line change
@@ -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%),
Expand All @@ -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) {
Expand All @@ -23,15 +43,17 @@ $gradients: (
}
}

/*
@mixin text-gradient($parent, $gradient) {
#{$parent} {
#{parent} {
background-image: $gradient;
-webkit-background-clip: text;
background-clip: text;
-webkit-text-fill-color: transparent;
color: transparent;
}
}
*/

$border-width: 2px;
@mixin border-gradient($parent, $gradient) {
Expand Down Expand Up @@ -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);
Expand Down
1 change: 0 additions & 1 deletion stylesheets/index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
6 changes: 3 additions & 3 deletions stylesheets/nav.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down Expand Up @@ -91,7 +91,7 @@ header summary,
}
}

.nav-dropdown {
.nav-dropdown {
@media (min-width: 1012px) and (max-width: 1279px) {
right: 0;
}
Expand Down
34 changes: 16 additions & 18 deletions stylesheets/new-mktg.scss
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -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 {
Expand All @@ -63,30 +57,34 @@ $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;
}

@font-face {
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;
}

@font-face {
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;
}

@font-face {
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;
}
17 changes: 6 additions & 11 deletions stylesheets/opacity.scss
Original file line number Diff line number Diff line change
@@ -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; }
.opacity-60 {
opacity: 0.6;
}
.opacity-70 {
opacity: 0.7;
}
Loading