Skip to content

Commit b6201ad

Browse files
authored
Merge pull request #5724 from github/repo-sync
repo sync
2 parents 74943ab + 3601ca7 commit b6201ad

20 files changed

Lines changed: 374 additions & 384 deletions

stylesheets/alerts.scss

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
/* Notes, tips, warning, and danger styles
2+
------------------------------------------------------------------------------*/
3+
4+
.note,
5+
.tip,
6+
.warning,
7+
.danger {
8+
// remove extra space under lists inside of notes
9+
ul,
10+
ol {
11+
margin-bottom: 0;
12+
}
13+
}

stylesheets/article.scss

Lines changed: 0 additions & 142 deletions
Original file line numberDiff line numberDiff line change
@@ -41,145 +41,3 @@
4141
.article-grid-body {
4242
grid-area: bottom;
4343
}
44-
45-
/* Deprecation banner
46-
------------------------------------------------------------------------------*/
47-
.deprecation-banner {
48-
& + .alert {
49-
margin-top: 5px;
50-
}
51-
52-
& > *:first-child {
53-
margin-top: 0;
54-
}
55-
56-
& > *:last-child {
57-
margin-bottom: 0;
58-
}
59-
60-
b,
61-
strong {
62-
font-weight: bold;
63-
}
64-
65-
p {
66-
margin: 0;
67-
}
68-
}
69-
70-
/* Code style overrides
71-
------------------------------------------------------------------------------*/
72-
73-
.markdown-body .highlight pre,
74-
.markdown-body pre {
75-
margin-top: 10px;
76-
}
77-
78-
.height-constrained-code-block pre {
79-
max-height: 500px;
80-
overflow: auto;
81-
}
82-
83-
/* Breadcrumbs
84-
------------------------------------------------------------------------------*/
85-
86-
.breadcrumbs-wrapper {
87-
@include breakpoint(xl) {
88-
height: 39px;
89-
}
90-
}
91-
92-
.breadcrumbs a:not(:last-child)::after,
93-
.breadcrumbs span:not(:last-child)::after {
94-
content: "/";
95-
color: var(--color-auto-gray-4);
96-
padding-right: $spacer-1;
97-
padding-left: $spacer-2;
98-
display: inline-block;
99-
}
100-
101-
/* Numbered procedures (step 1, step 2, ...)
102-
------------------------------------------------------------------------------*/
103-
104-
.markdown-body ol {
105-
counter-reset: li;
106-
list-style: none;
107-
position: relative;
108-
padding-bottom: 10px;
109-
padding-left: 0;
110-
}
111-
112-
.markdown-body ol > li {
113-
padding: 15px 0 15px 55px;
114-
position: relative;
115-
margin-bottom: 5px;
116-
border-top: 3px solid var(--color-auto-gray-2);
117-
}
118-
119-
.markdown-body ol > li:before {
120-
content: counter(li);
121-
counter-increment: li;
122-
position: absolute;
123-
top: 10px;
124-
left: 0;
125-
height: 100%;
126-
width: 30px;
127-
padding: 0 10px 0 0;
128-
color: var(--color-auto-gray-4);
129-
font-size: 22px;
130-
font-weight: bold;
131-
line-height: 35px;
132-
text-align: right;
133-
}
134-
135-
.markdown-body ol > li > p {
136-
margin: 0;
137-
}
138-
139-
.markdown-body ol > li > p:first-child {
140-
margin-top: 0;
141-
}
142-
143-
.markdown-body ol > li:after {
144-
content: ".";
145-
display: block;
146-
clear: both;
147-
visibility: hidden;
148-
line-height: 0;
149-
height: 0;
150-
}
151-
152-
.procedural-image-wrapper {
153-
display: block;
154-
padding: 10px 0;
155-
margin: 20px auto 0 auto;
156-
}
157-
158-
.procedural-image-wrapper img {
159-
border-radius: 5px;
160-
border: 2px solid var(--color-auto-gray-2);
161-
width: auto;
162-
height: auto;
163-
max-height: 500px;
164-
}
165-
166-
// make sure images that contain emoji render at the expected size
167-
img[src*="https://github.githubassets.com/images/icons/emoji"] {
168-
height: 20;
169-
width: 20;
170-
align: absmiddle;
171-
}
172-
173-
/* Notes, tips, warning, and danger styles
174-
------------------------------------------------------------------------------*/
175-
176-
.note,
177-
.tip,
178-
.warning,
179-
.danger {
180-
// remove extra space under lists inside of notes
181-
ul,
182-
ol {
183-
margin-bottom: 0;
184-
}
185-
}

stylesheets/breadcrumbs.scss

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
2+
/* Breadcrumbs
3+
------------------------------------------------------------------------------*/
4+
5+
.breadcrumbs-wrapper {
6+
@include breakpoint(xl) {
7+
height: 39px;
8+
}
9+
}
10+
11+
.breadcrumbs a:not(:last-child)::after,
12+
.breadcrumbs span:not(:last-child)::after {
13+
content: "/";
14+
color: var(--color-auto-gray-4);
15+
padding-right: $spacer-1;
16+
padding-left: $spacer-2;
17+
display: inline-block;
18+
}

stylesheets/bump-link.scss

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
// Arrow links
2+
.Bump-link-symbol {
3+
display: inline-block;
4+
transition: $transition-time / 2;
5+
transform: translateX(0);
6+
}
7+
8+
.Bump-link:hover .Bump-link-symbol {
9+
transform: translateX(3px);
10+
}
11+
12+
.Bump-link--hover .Bump-link-symbol {
13+
color: inherit;
14+
opacity: 0;
15+
transition: $transition-time / 2;
16+
transform: translateX(0);
17+
}
18+
19+
.Bump-link--hover:hover .Bump-link-symbol {
20+
opacity: 1;
21+
transform: translateX(3px);
22+
}

stylesheets/code.scss

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
/* Code style overrides
2+
------------------------------------------------------------------------------*/
3+
4+
.markdown-body .highlight pre,
5+
.markdown-body pre {
6+
margin-top: 10px;
7+
}
8+
9+
.height-constrained-code-block pre {
10+
max-height: 500px;
11+
overflow: auto;
12+
}
13+
14+
.markdown-body .code-extra {
15+
margin-top: $spacer-4;
16+
17+
pre {
18+
margin-top: 0 !important;
19+
border-top-left-radius: 0 !important;
20+
border-top-right-radius: 0 !important;
21+
border-left: 1px var(--color-auto-gray-2) solid !important;
22+
border-bottom: 1px var(--color-auto-gray-2) solid !important;
23+
border-right: 1px var(--color-auto-gray-2) solid !important;
24+
}
25+
}
26+
27+
/* code styles */
28+
pre .redbox {
29+
border: 2px solid var(--color-auto-red-5);
30+
padding: 2px;
31+
border-radius: 2px;
32+
margin-right: 2px;
33+
}
34+
35+
pre .greenbox {
36+
border: 2px solid var(--color-auto-green-5);
37+
padding: 2px;
38+
border-radius: 2px;
39+
margin-right: 2px;
40+
}
41+
42+
pre .bluebox {
43+
border: 2px solid var(--color-auto-blue-5);
44+
padding: 2px;
45+
border-radius: 2px;
46+
margin-right: 2px;
47+
}
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
/* Deprecation banner
2+
------------------------------------------------------------------------------*/
3+
.deprecation-banner {
4+
& + .alert {
5+
margin-top: 5px;
6+
}
7+
8+
& > *:first-child {
9+
margin-top: 0;
10+
}
11+
12+
& > *:last-child {
13+
margin-bottom: 0;
14+
}
15+
16+
b,
17+
strong {
18+
font-weight: bold;
19+
}
20+
21+
p {
22+
margin: 0;
23+
}
24+
}

stylesheets/extended-markdown.scss

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
.extended-markdown p {
2+
margin: 0;
3+
}
4+
5+
.extended-markdown p:not(:first-child) {
6+
margin-top: 15px;
7+
}
8+
9+
.extended-markdown.note pre {
10+
background: none;
11+
padding: 10px 10px 10px 0;
12+
margin-bottom: 0;
13+
}
14+
15+
.extended-markdown.note pre code {
16+
color: var(--color-text-primary);
17+
}

stylesheets/featured-links.scss

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
/* Getting Started and Popular Articles sections in article layout */
2+
.markdown-body div.featured-links {
3+
padding-bottom: 30px;
4+
}
5+
6+
.markdown-body div.featured-links-heading {
7+
padding-top: 24px;
8+
}
9+
10+
.markdown-body div.featured-links p.link-with-intro-intro {
11+
margin-bottom: 5px;
12+
}
13+
14+
.markdown-body div.featured-links h4.link-with-intro-title {
15+
margin-top: 0;
16+
}
Lines changed: 0 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,4 @@
1-
/* Styles not incorporated into Primer yet
2-
------------------------------------------------------------------------------*/
3-
4-
// Text styling
5-
.underline-dashed {
6-
display: inline;
7-
padding-bottom: $spacer-1;
8-
background-image: linear-gradient(
9-
to right,
10-
var(--color-auto-gray-3) 50%,
11-
transparent 0%
12-
);
13-
background-repeat: repeat-x;
14-
background-position: bottom;
15-
background-size: 10px 1px;
16-
}
17-
18-
// Arrow links
19-
.Bump-link-symbol {
20-
display: inline-block;
21-
transition: $transition-time / 2;
22-
transform: translateX(0);
23-
}
24-
25-
.Bump-link:hover .Bump-link-symbol {
26-
transform: translateX(3px);
27-
}
28-
29-
.Bump-link--hover .Bump-link-symbol {
30-
color: inherit;
31-
opacity: 0;
32-
transition: $transition-time / 2;
33-
transform: translateX(0);
34-
}
35-
36-
.Bump-link--hover:hover .Bump-link-symbol {
37-
opacity: 1;
38-
transform: translateX(3px);
39-
}
40-
411
// stylelint-disable primer/no-unused-vars
42-
432
// Typography
443

454
$marketing-font-path: "/assets/fonts/alliance/";

stylesheets/headings.scss

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
h1,
2+
h2,
3+
h3,
4+
h4 {
5+
a {
6+
color: var(--color-auto-gray-9);
7+
}
8+
}
9+
10+
// all h3 headers that are links should be blue-500
11+
// except those on each product's toc
12+
h3 a {
13+
color: var(--color-auto-blue-5);
14+
}
15+
16+
.markdown-body {
17+
h1,
18+
h2,
19+
h3,
20+
h4,
21+
h5,
22+
h6 {
23+
font-family: $font-mktg;
24+
font-weight: $font-weight-semibold;
25+
padding-top: $spacer-3;
26+
}
27+
}
28+
29+
// needs specificity to override
30+
.markdown-body .lead-mktg p {
31+
color: var(--color-auto-gray-9);
32+
}
33+
34+
.product-callout p,
35+
.contributor-callout p {
36+
margin: 0;
37+
}

0 commit comments

Comments
 (0)