Skip to content

Commit bdb5ba5

Browse files
committed
Fixed issues with rounded borders on code blocks in some cases
1 parent f7be5c7 commit bdb5ba5

11 files changed

+54
-42
lines changed

material/assets/javascripts/bundle.748e2769.min.js renamed to material/assets/javascripts/bundle.9efd901c.min.js

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

material/assets/javascripts/bundle.748e2769.min.js.map renamed to material/assets/javascripts/bundle.9efd901c.min.js.map

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

material/assets/stylesheets/main.27ad92d8.min.css

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

material/assets/stylesheets/main.27ad92d8.min.css.map

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

material/assets/stylesheets/main.8c5ef100.min.css

-1
This file was deleted.

material/assets/stylesheets/main.8c5ef100.min.css.map

-1
This file was deleted.

material/assets/stylesheets/palette.9647289d.min.css renamed to material/assets/stylesheets/palette.cc9b2e1e.min.css

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

material/assets/stylesheets/palette.9647289d.min.css.map renamed to material/assets/stylesheets/palette.cc9b2e1e.min.css.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

material/base.html

+3-3
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@
3434
{% endif %}
3535
{% endblock %}
3636
{% block styles %}
37-
<link rel="stylesheet" href="{{ 'assets/stylesheets/main.8c5ef100.min.css' | url }}">
37+
<link rel="stylesheet" href="{{ 'assets/stylesheets/main.27ad92d8.min.css' | url }}">
3838
{% if config.theme.palette %}
3939
{% set palette = config.theme.palette %}
40-
<link rel="stylesheet" href="{{ 'assets/stylesheets/palette.9647289d.min.css' | url }}">
40+
<link rel="stylesheet" href="{{ 'assets/stylesheets/palette.cc9b2e1e.min.css' | url }}">
4141
{% if palette.primary %}
4242
{% import "partials/palette.html" as map %}
4343
{% set primary = map.primary(
@@ -214,7 +214,7 @@
214214
</script>
215215
{% endblock %}
216216
{% block scripts %}
217-
<script src="{{ 'assets/javascripts/bundle.748e2769.min.js' | url }}"></script>
217+
<script src="{{ 'assets/javascripts/bundle.9efd901c.min.js' | url }}"></script>
218218
{% for path in config["extra_javascript"] %}
219219
<script src="{{ path | url }}"></script>
220220
{% endfor %}

src/assets/stylesheets/main/extensions/pymdownx/_highlight.scss

+14-22
Original file line numberDiff line numberDiff line change
@@ -314,20 +314,21 @@
314314
// Scoped in typesetted content to match specificity of regular content
315315
.md-typeset {
316316

317-
// Code block with line numbers
317+
// Code block with line numbers - unfortunately, these selectors need to be
318+
// overly specific so they don't bleed into code blocks in annotations.
318319
.highlighttable {
319320
margin: 1em 0;
320321
direction: ltr;
321322

322-
// Remove rounded borders on left side
323-
code {
323+
// Remove rounded borders on code blocks
324+
> tbody > tr > .code > div > pre > code {
324325
border-top-left-radius: 0;
325326
border-bottom-left-radius: 0;
326327
}
327328
}
328329

329330
// Code block result container
330-
:is(.highlight, .highlighttable) + .result {
331+
.highlight + .result {
331332
margin-top: calc(-1em + #{px2em(-2px)});
332333
padding: 0 px2em(16px);
333334
overflow: visible;
@@ -356,14 +357,17 @@
356357
.md-content__inner > .highlight {
357358
margin: 1em px2rem(-16px);
358359

359-
// Highlighted line
360-
.hll {
361-
margin: 0 px2rem(-16px);
362-
padding: 0 px2rem(16px);
360+
// Remove rounded borders
361+
> .filename,
362+
> pre > code {
363+
border-radius: 0;
363364
}
364365

365-
// Remove rounded borders
366-
code {
366+
// Code block with line numbers - unfortunately, these selectors need to be
367+
// overly specific so they don't bleed into code blocks in annotations.
368+
> .highlighttable > tbody > tr > .filename span.filename,
369+
> .highlighttable > tbody > tr > .linenos,
370+
> .highlighttable > tbody > tr > .code > div > pre > code {
367371
border-radius: 0;
368372
}
369373

@@ -374,16 +378,4 @@
374378
border-radius: 0;
375379
}
376380
}
377-
378-
// Top-level code block with line numbers
379-
.md-content__inner > .highlighttable {
380-
margin: 1em px2rem(-16px);
381-
border-radius: 0;
382-
383-
// Highlighted line
384-
.hll {
385-
margin: 0 px2rem(-16px);
386-
padding: 0 px2rem(16px);
387-
}
388-
}
389381
}

src/assets/stylesheets/main/extensions/pymdownx/_tabbed.scss

+29-9
Original file line numberDiff line numberDiff line change
@@ -187,21 +187,41 @@
187187
// Code block is the first child of a tab - remove margin and mirror
188188
// previous (now deprecated) SuperFences code block grouping behavior
189189
> pre:first-child,
190-
> .highlight:first-child > pre:first-child,
191-
> .highlight:first-child > .highlighttable {
190+
> .highlight:first-child > pre {
192191
margin: 0;
193192

194-
// Remove rounded borders
193+
// Remove rounded borders on code block
195194
> code {
196-
border-start-start-radius: 0;
197-
border-start-end-radius: 0;
195+
border-top-left-radius: 0;
196+
border-top-right-radius: 0;
198197
}
199198
}
200199

201-
// Remove rounded border on line numbers container
202-
> .highlighttable:first-child .linenos {
203-
border-start-start-radius: 0;
204-
border-start-end-radius: 0;
200+
// Code block title - remove spacing and rounded borders
201+
> .highlight:first-child > .filename {
202+
margin: 0;
203+
border-top-left-radius: 0;
204+
border-top-right-radius: 0;
205+
}
206+
207+
// Code block with line numbers - unfortunately, these selectors need to be
208+
// overly specific so they don't bleed into code blocks in annotations.
209+
> .highlight:first-child > .highlighttable {
210+
margin: 0;
211+
212+
// Remove rounded borders on line numbers and titles
213+
> tbody > tr > .filename span.filename,
214+
> tbody > tr > .linenos {
215+
margin: 0;
216+
border-top-left-radius: 0;
217+
border-top-right-radius: 0;
218+
}
219+
220+
// Remove rounded borders on code blocks
221+
> tbody > tr > .code > div > pre > code {
222+
border-top-left-radius: 0;
223+
border-top-right-radius: 0;
224+
}
205225
}
206226

207227
// Adjust spacing for nested tabbed container

0 commit comments

Comments
 (0)