Skip to content

repo sync #12162

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Nov 19, 2021
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
2 changes: 1 addition & 1 deletion components/page-header/Breadcrumbs.module.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
.breadcrumbs {
clip-path: inset(-5px -5px -5px 0px);
clip-path: inset(-0.5rem -0.5rem -0.5rem 0);
}
2 changes: 1 addition & 1 deletion components/sidebar/SidebarProduct.module.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.sidebarArticle::before {
content: "";
position: absolute;
left: 26px;
left: calc(1.5rem + 2px);
height: 100%;
border-left: 1px solid var(--color-fg-default);
width: 1px;
Expand Down
8 changes: 4 additions & 4 deletions components/ui/MarkdownContent/MarkdownContent.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
h5,
h6 {
display: inline-block;
margin-top: 10px;
margin-bottom: 10px;
margin-top: 0.5rem;
margin-bottom: 0.5rem;

p {
margin: 0;
Expand All @@ -36,8 +36,8 @@
}
}
& > a[class~="doctocat-link"] {
padding: 8px;
margin-left: -32px;
padding: 0.5rem;
margin-left: -2rem;
color: var(--color-fg-muted);
&:active,
&:focus {
Expand Down
30 changes: 15 additions & 15 deletions components/ui/MarkdownContent/stylesheets/code.scss
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
.markdownBody {
[class~="highlight"] pre,
pre {
margin-top: 10px;
margin-top: 0.5rem;
}

[class~="height-constrained-code-block"] pre {
max-height: 500px;
max-height: 32rem;
overflow: auto;
}

[class~="code-extra"] {
margin-top: 24px;
margin-top: 1.5rem;

pre {
margin-top: 0 !important;
Expand All @@ -22,24 +22,24 @@
}
}

// on graphql/overview/resource-limitations
pre [class~="redbox"],
pre [class~="greenbox"],
pre [class~="bluebox"] {
color: var(--color-fg-on-emphasis);
padding: 0 0.25rem;
border-radius: 4px; // primer rounded-1
}

pre [class~="redbox"] {
border: 2px solid var(--color-danger-emphasis);
padding: 2px;
border-radius: 2px;
margin-right: 2px;
background-color: var(--color-danger-emphasis);
}

pre [class~="greenbox"] {
border: 2px solid var(--color-success-emphasis);
padding: 2px;
border-radius: 2px;
margin-right: 2px;
background-color: var(--color-success-emphasis);
}

pre [class~="bluebox"] {
border: 2px solid var(--color-accent-emphasis);
padding: 2px;
border-radius: 2px;
margin-right: 2px;
background-color: var(--color-accent-emphasis);
}
}
22 changes: 11 additions & 11 deletions components/ui/MarkdownContent/stylesheets/lists.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,20 @@
counter-reset: li;
list-style: none;
position: relative;
padding-bottom: 10px;
padding-bottom: 0.5rem;
padding-left: 0;

> li {
padding: 8px 0 8px 40px;
padding: 0.5rem 0 0.5rem 2.5rem;
border: 0;
position: relative;
margin-bottom: 5px;
margin-bottom: 0.25rem;

&:before {
width: 22px;
height: 22px;
font-size: 14px;
margin: 1px 0 0 8px;
width: calc(1.5rem - 2px);
height: calc(1.5rem - 2px);
font-size: calc(1rem - 2px);
margin: 1px 0 0 0.5rem;
content: counter(li);
counter-increment: li;
position: absolute;
Expand Down Expand Up @@ -46,11 +46,11 @@
}

p:not(:first-child) {
margin-top: 15px;
margin-top: 1rem;
}

[class~="extended-markdown"] {
margin-top: 15px;
margin-top: 1rem;
}
}

Expand All @@ -63,8 +63,8 @@
ul ol,
ol ol,
ol ul {
margin-top: 15px;
margin-bottom: 15px;
margin-top: 1rem;
margin-bottom: 1rem;
}
}

Expand Down
10 changes: 5 additions & 5 deletions components/ui/MarkdownContent/stylesheets/table.scss
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
font-size: 85%;
padding: 0.2em 0.4em;
background-color: var(--color-canvas-subtle);
border-radius: 6px;
border-radius: 6px; // primer rounded-2
}

pre > code {
Expand All @@ -37,8 +37,8 @@
top: 0;
background: var(--color-canvas-default);
box-shadow: 0 3px 0 0 var(--color-canvas-subtle);
padding: 12px 8px;
border: 0px;
padding: 0.75rem 0.5rem;
border: 0;
}

th[align="center"] {
Expand All @@ -55,8 +55,8 @@
}

td {
padding: 10px 8px;
border: 0px;
padding: 0.75rem 0.5rem;
border: 0;
vertical-align: top;
}

Expand Down
4 changes: 2 additions & 2 deletions stylesheets/extended-markdown.scss
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
}

p:not(:first-child) {
margin-top: 15px;
margin-top: 1rem;
}

&.note pre code {
Expand All @@ -24,7 +24,7 @@

&.note pre {
background: none;
padding: 10px 10px 10px 0;
padding: 0.5rem 0.5rem 0.5rem 0;
margin-bottom: 0;
}
}
35 changes: 18 additions & 17 deletions stylesheets/images.scss
Original file line number Diff line number Diff line change
@@ -1,27 +1,28 @@
.markdown-body .procedural-image-wrapper {
display: block;
padding: 10px 0;
margin: 20px auto 0 auto;
padding: 1rem 0;
margin: 1rem auto 0 auto;
border: none;
max-width: calc(100% - 32px);
}
max-width: calc(100% - 2rem);

.markdown-body .procedural-image-wrapper img {
width: auto;
height: auto;
max-height: 500px;
padding: 0;
box-shadow: var(--color-shadow-medium);
}
img {
width: auto;
height: auto;
max-height: 32rem;
padding: 0;
box-shadow: var(--color-shadow-medium);
}

// make sure images that contain emoji render at the expected size
.markdown-body img[src*="https://github.githubassets.com/images/icons/emoji"]
{
height: 20px;
width: 20px;
// make sure images that contain emoji render at the expected size
img[src*="https://github.githubassets.com/images/icons/emoji"]
{
height: 20px;
width: 20px;
box-shadow: none;
}
}

.markdown-body img {
max-height: 500px;
max-height: 32rem;
padding: 0;
}