Skip to content
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.

Sign up for GitHub

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

CSS fixes for overview headings and resources sections #147

Merged
merged 3 commits into from
Jul 9, 2024
Merged

CSS fixes for overview headings and resources sections #147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ae263e4
CSS fixes for overview headings
froggleston Jul 4, 2024
4d7721a
Fix for Resources sections being styled incorrectly
froggleston Jul 5, 2024
fee4388
Update compile-css.yaml
froggleston Jul 9, 2024
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
6 changes: 3 additions & 3 deletions .github/workflows/compile-css.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ name: Render CSS and Javascript
jobs:
compress-everything:
name: Render css/javascript
runs-on: macOS-11
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Clean
run: rm -rf inst/pkgdown/assets/assets/
- uses: actions/setup-node@v2
- uses: actions/setup-node@v4
- run: npm install
- name: Comple js
run: bash squash-a-script.sh
Expand Down
2 changes: 1 addition & 1 deletion inst/pkgdown/assets/assets/styles.css
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion inst/pkgdown/assets/assets/styles.css.map
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions inst/pkgdown/templates/navbar.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,10 +124,10 @@ <h2 class="accordion-header chapters" id="flush-headingEleven">
<hr class="half-width"/>

{{#resources}}
<div class="accordion accordion-flush resources" id="accordionFlush12">
<div class="accordion accordion-flush lesson-resources" id="accordionFlush12">
<div class="accordion-item">
<h2 class="accordion-header" id="flush-headingTwelve">
<button class="accordion-button {{^overview}}collapsed{{/overview}}{{#overview}}show{{/overview}}" id="resources" type="button" data-bs-toggle="collapse" data-bs-target="#flush-collapseTwelve" aria-expanded="false" aria-controls="flush-collapseTwelve">
<button class="accordion-button {{^overview}}collapsed{{/overview}}{{#overview}}show{{/overview}}" id="lesson-resources" type="button" data-bs-toggle="collapse" data-bs-target="#flush-collapseTwelve" aria-expanded="false" aria-controls="flush-collapseTwelve">
{{ translate.RESOURCES }}
</button>
</h2>
Expand Down Expand Up @@ -175,7 +175,7 @@ <h2 class="accordion-header" id="flush-headingTwelve">
</div>
</div>
</div>
<hr class="half-width resources"/>
<hr class="half-width lesson-resources"/>
{{/resources}}

{{^overview}}{{#aio}}
Expand Down
54 changes: 27 additions & 27 deletions source/stylesheets/dark.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,38 +97,38 @@ $color-mode-type: data;
.sidebar .collapsed::after {
background-image: url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='%23dee2e6'><path fill-rule='evenodd' d='M1.646 4.646a.5.5 0 0 1 .708 0L8 10.293l5.646-5.647a.5.5 0 0 1 .708.708l-6 6a.5.5 0 0 1-.708 0l-6-6a.5.5 0 0 1 0-.708z'/></svg>");
}

.sidebar .accordion-button:not(.collapsed)::after {
background-image: url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='%23dee2e6'><path fill-rule='evenodd' d='M1.646 4.646a.5.5 0 0 1 .708 0L8 10.293l5.646-5.647a.5.5 0 0 1 .708.708l-6 6a.5.5 0 0 1-.708 0l-6-6a.5.5 0 0 1 0-.708z'/></svg>");
}

.sidebar .accordion-button.collapsed::after {
background-image: url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='%23dee2e6'><path fill-rule='evenodd' d='M1.646 4.646a.5.5 0 0 1 .708 0L8 10.293l5.646-5.647a.5.5 0 0 1 .708.708l-6 6a.5.5 0 0 1-.708 0l-6-6a.5.5 0 0 1 0-.708z'/></svg>");
}

.sidebar .accordion-button:not(.collapsed)::after {
background-image: url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='%23dee2e6'><path fill-rule='evenodd' d='M1.646 4.646a.5.5 0 0 1 .708 0L8 10.293l5.646-5.647a.5.5 0 0 1 .708.708l-6 6a.5.5 0 0 1-.708 0l-6-6a.5.5 0 0 1 0-.708z'/></svg>");
}

.accordion-button.collapsed::after {
background-image: url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='%23dee2e6'><path fill-rule='evenodd' d='M1.646 4.646a.5.5 0 0 1 .708 0L8 10.293l5.646-5.647a.5.5 0 0 1 .708.708l-6 6a.5.5 0 0 1-.708 0l-6-6a.5.5 0 0 1 0-.708z'/></svg>");
}

.accordion-button:not(.collapsed)::after {
background-image: url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='%23dee2e6'><path fill-rule='evenodd' d='M1.646 4.646a.5.5 0 0 1 .708 0L8 10.293l5.646-5.647a.5.5 0 0 1 .708.708l-6 6a.5.5 0 0 1-.708 0l-6-6a.5.5 0 0 1 0-.708z'/></svg>");
}

// Sidebar + and - for smaller screens
@include media-breakpoint-down(xl) {

.sidebar .accordion-button.collapsed:not(#instructor):not(#language):not(#chapters):not(#resources)::after {
.sidebar .accordion-button.collapsed:not(#instructor):not(#language):not(#chapters):not(#lesson-resources)::after {
background-image: url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23dee2e6' stroke-width='2' stroke-linecap='round' stroke-linejoin='round' class='feather feather-plus'><line x1='12' y1='5' x2='12' y2='19'></line><line x1='5' y1='12' x2='19' y2='12'></line></svg>");
}
.sidebar .accordion-button:not(.collapsed):not(#instructor):not(#language):not(#flush-collapseNine):not(#chapters):not(#resources)::after {

.sidebar .accordion-button:not(.collapsed):not(#instructor):not(#language):not(#flush-collapseNine):not(#chapters):not(#lesson-resources)::after {
background-image: url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23dee2e6' stroke-width='2' stroke-linecap='round' stroke-linejoin='round' class='feather feather-minus'><line x1='5' y1='12' x2='19' y2='12'></line></svg>");
}

}

// From styles.css.scss
Expand Down Expand Up @@ -347,15 +347,15 @@ $color-mode-type: data;
border-top: 10px solid var(--bs-tertiary-color);
}
}

.callout pre {
background: var(--bs-tertiary-bg);
}

.accordion pre {
background: var(--bs-tertiary-bg);
}

.code-label {
border-bottom: 1px solid var(--bs-border-color);
}
Expand All @@ -371,19 +371,19 @@ $color-mode-type: data;
.bottom-nav {
background-color: var(--bs-body-bg);
}

.searchbox {
border: 1px solid var(--bs-light-border-subtle);
}

.mobile-title {
box-shadow: 0px 2px 2px var(--bs-border-color-translucent);
}

.percentage {
color: var(--bs-body-color);
}

.progress {
background: tint-color($dark-blue, 10%);
}
Expand Down Expand Up @@ -411,30 +411,30 @@ $color-mode-type: data;
.lesson-progress {
background: var(--bs-tertiary-bg);
}

.nav-container {
border-bottom: none;
}

.navbar-toggler {
color: var(--bs-body-color);
}

.top-nav .dropdown button {
background: var(--bs-body-bg);
color: var(--bs-body-color);
}

.top-nav .dropdown .bordered-button {
background: var(--bs-body-bg);
color: var(--bs-body-color);
border-left: 1px solid var(--bs-body-color);
}

#expand-code {
color: var(--bs-link-color);
}

@include media-breakpoint-up(md) {
#to-top {
filter: drop-shadow(0px 0px 5px var(--bs-body-bg)) drop-shadow(0px 0px 5px var(--bs-body-bg)) drop-shadow(0px 0px 5px var(--bs-body-bg)) drop-shadow(0px 0px 5px var(--bs-body-bg)) drop-shadow(0px 0px 5px var(--bs-body-bg));
Expand All @@ -450,7 +450,7 @@ $color-mode-type: data;
}
.top-nav hr{
color: var(--bs-body-color);
}
}
.top-nav {
border-top: 22px solid shade-color($blue, 20%);
.peer-reviewed {
Expand Down Expand Up @@ -492,7 +492,7 @@ $color-mode-type: data;
border-top: 22px solid shade-color($light-red, 20%);
}
}

@include media-breakpoint-up(xl) {
.top-nav hr {
color: var(--bs-body-color);
Expand Down Expand Up @@ -529,11 +529,11 @@ $color-mode-type: data;
color: var(--bs-body-color);
background: tint-color($dark-purple, 20%);
}

.overview {
background: var(--bs-tertiary-bg);
}

@include media-breakpoint-up(md) {
.overview .bordered {
border-left: 1px solid var(--bs-body-color);
Expand Down Expand Up @@ -585,7 +585,7 @@ $color-mode-type: data;
}
}
}

.sidebar-collapsed {
background: var(--bs-tertiary-bg);
}
Expand All @@ -595,12 +595,12 @@ $color-mode-type: data;
pre .img img, pre .r-plt img {
background-color: var(--bs-tertiary-bg);
}

code {
font-family: 'Source Code Pro', monospace;
color: var(--bs-body-color);
}

p > code {
background-color: var(--bs-tertiary-bg);
}
Expand Down
2 changes: 1 addition & 1 deletion source/stylesheets/header.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -442,7 +442,7 @@
float: right;
}

.resources-side {
.lesson-resources-side {
display: none;
}

Expand Down
10 changes: 7 additions & 3 deletions source/stylesheets/overview.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,15 +39,15 @@
text-decoration-thickness: 1px;
text-underline-offset: 25px;
margin-bottom: 50px;
font-size: min(1.5rem, calc(1.25rem + 0.25vw));
font-size: min(1.2rem, calc(1.15rem + 0.25vw));
font-weight: 600;
line-height: 1.5rem;
}

.overview .bordered {
border-top: 2px solid $black;
padding-top: 25px;
margin-top: -25px;
margin-top: -10px;
}

@include media-breakpoint-up(md) {
Expand All @@ -60,6 +60,10 @@
}

.overview .inner {
margin-left: 60px;
margin-left: 30px;
}
}

.card-body {
padding: 0 !important;
}
5 changes: 3 additions & 2 deletions source/stylesheets/sidenav.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@
}
}

#chapters, #resources, .accordion-header.chapters {
#chapters, #lesson-resources, .accordion-header.chapters {
font-size: 24px;
font-weight: 400;
letter-spacing: 0.2px;
Expand Down Expand Up @@ -178,9 +178,10 @@
padding-bottom: 100px;
}

.resources {
.lesson-resources {
display: none;
}

.collapse-toggle {
margin-bottom:25px;
}
Expand Down
6 changes: 3 additions & 3 deletions source/stylesheets/styles.css.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,12 +271,12 @@ dt > * {

@include media-breakpoint-down(xl) {

.sidebar .accordion-button.collapsed:not(#instructor):not(#language):not(#chapters):not(#resources)::after {
.sidebar .accordion-button.collapsed:not(#instructor):not(#language):not(#chapters):not(#lesson-resources)::after {
background-image: url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='currentColor' stroke-width='2' stroke-linecap='round' stroke-linejoin='round' class='feather feather-plus'><line x1='12' y1='5' x2='12' y2='19'></line><line x1='5' y1='12' x2='19' y2='12'></line></svg>");
transform:none !important;
}

.sidebar .accordion-button:not(.collapsed):not(#instructor):not(#language):not(#flush-collapseNine):not(#chapters):not(#resources)::after {
.sidebar .accordion-button:not(.collapsed):not(#instructor):not(#language):not(#flush-collapseNine):not(#chapters):not(#lesson-resources)::after {
background-image: url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='currentColor' stroke-width='2' stroke-linecap='round' stroke-linejoin='round' class='feather feather-minus'><line x1='5' y1='12' x2='19' y2='12'></line></svg>");
transform:none !important;
}
Expand Down Expand Up @@ -324,7 +324,7 @@ dt > * {
display: none !important;
}
// source: <https://css-tricks.com/almanac/properties/p/page-break/#aa-example>
h2 {
h2 {
page-break-before: auto;
}
h3, h4 {
Expand Down