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.

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

Make sidebar sticky #139

Closed
wants to merge 40 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
483d48b
L2D Theme (Logo and basic colurs)
sabaferdous12 Feb 11, 2022
6ef0edd
Merge branch 'main' of https://github.com/carpentries/varnish
sabaferdous12 Feb 11, 2022
a93d009
Update README.md
sabaferdous12 Feb 11, 2022
4658636
Update squash-sass.sh
sabaferdous12 Feb 11, 2022
15187ba
regenerated css/js
actions-user Feb 11, 2022
db50719
Merge branch 'main' into znk-update
zkamvar Jan 24, 2023
6ca0b52
regenerated css/js
actions-user Jan 24, 2023
c72a9c2
Merge pull request #1 from carpentries/znk-update
sabaferdous12 Jan 24, 2023
f412e8b
new l2d logo
sabaferdous12 Mar 15, 2023
7e74bd3
Add button to download/view the "All in one" PDF
milanmlft Jun 12, 2023
401d9e8
Merge pull request #5 from milanmlft/milanmlft/issue4
milanmlft Jun 12, 2023
f286a2a
Add l2d-logo-sm.svg
milanmlft Jun 12, 2023
5b332db
Update L2D logo
milanmlft Jun 14, 2023
4530696
Rescale L2D logo
milanmlft Jun 21, 2023
c5a14a5
Merge remote-tracking branch 'carpentries/main'
milanmlft Sep 4, 2023
cf13fd6
Sync with carpentries upstream repo
milanmlft Sep 4, 2023
aeffaff
regenerated css/js
actions-user Sep 4, 2023
645e70b
Merge branch 'main' of github.com:carpentries/varnish into carpentrie…
milanmlft Mar 7, 2024
1f46091
Merge branch 'carpentries-main'
milanmlft Mar 7, 2024
79401ed
regenerated css/js
actions-user Mar 7, 2024
476711f
Merge branch 'main' of github.com:carpentries/varnish into carpentrie…
milanmlft Apr 26, 2024
d7c38d2
Merge branch 'carpentries-main'
milanmlft Apr 26, 2024
ec7e947
regenerated css/js
actions-user Apr 26, 2024
5e88d21
Fix navbar template
milanmlft Apr 26, 2024
621d62e
Add missing logo file
milanmlft Apr 26, 2024
0a6f2e4
Merge pull request #9 from LearnToDiscover/milanmlft/fix
milanmlft Apr 26, 2024
7ac5e27
Set up renovate
milanmlft Apr 26, 2024
51bb04a
Fix L2D logos in the correct place (#13)
milanmlft May 14, 2024
984327b
Remove unwanted elements from footer and update URL icons (#14)
milanmlft May 15, 2024
08cf866
[pull] main from carpentries:main (#15)
pull[bot] May 22, 2024
e90f058
[pull] main from carpentries:main (#17)
pull[bot] May 23, 2024
38595a0
Merge pull request #19 from carpentries/main
milanmlft May 23, 2024
7c363e0
Remove 'Glossary' and 'More tabs' (#20)
milanmlft May 23, 2024
1d120a0
Fix base renovate schema filename (#21)
milanmlft May 24, 2024
be764f9
Disable renovate
milanmlft May 24, 2024
dd4c578
Make sidebar sticky
milanmlft May 29, 2024
627df49
Merge branch 'main' of github.com:carpentries/varnish into carpentrie…
milanmlft May 29, 2024
828cf36
Merge branch 'carpentries-main'
milanmlft May 29, 2024
e915f90
Merge branch 'main' into milanmlft/sticky-sidebar
milanmlft May 29, 2024
9580d5f
Squash css and js
milanmlft May 29, 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
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: varnish
Title: Front-end for The Carpentries Lesson Infrastructure
Version: 1.0.3.9000
Version: 1.0.3.9000-1
Authors@R: c(
person(given = "Zhian N.",
family = "Kamvar",
Expand Down
10 changes: 6 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# {varnish}: Template for The Carpentries Workbench <img src='man/figures/logo.png' align='right' alt='' width=120 />
# Template for Carpentries Lessons (with L2D themes)


[![varnish status badge](https://carpentries.r-universe.dev/badges/varnish)](https://carpentries.r-universe.dev)

Expand Down Expand Up @@ -30,7 +31,7 @@ uglifyjs. Their sources live in the [`source/`](source/) folder with directives
to include their dependencies (bootstrap, jquery, feather).

The minified versions are built via GitHub actions any time one of the source
files is changed.
files is changed.

To build this locally, you need to make sure to have a working version of
`node` and `npm`, which can be installed [via the node version manager, nvm](https://github.com/nvm-sh/nvm#intro).
Expand Down Expand Up @@ -121,7 +122,7 @@ template:

Each of these parameters can be accessed via the `{{ yaml }}` mustache context.
For example, this adds a paragraph describing the license provided that the
`{{ license }}` parameter is present in the yaml:
`{{ license }}` parameter is present in the yaml:

```html
{{#yaml}}{{#license}}
Expand All @@ -138,8 +139,9 @@ For example, this adds a paragraph describing the license provided that the

- `{{ instructor }}`: a boolean indicating instructor view
- `{{ aio }}`: a boolean indicating that the aio page should be included
- `{{ aio_pdf }}`: a boolean indicating that the aio PDF page should be included
- `{{ this_page }}`: The file-only HTML path of the current page (e.g. `index.html` or `introduction.html`).
- `{{{ schedule }}}`: The HTML sidebar of the schedule of episodes.
- `{{{ schedule }}}`: The HTML sidebar of the schedule of episodes.
- `{{{ resources }}}`: an additional part of the sidebar giving extra resource elements avaialable in mobile view.

[{pkgdown}]: https://r-lib.github.io/pkgdown
Expand Down
Binary file modified inst/pkgdown/assets/android-chrome-192x192.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified inst/pkgdown/assets/android-chrome-512x512.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified inst/pkgdown/assets/apple-touch-icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8,800 changes: 8,800 additions & 0 deletions inst/pkgdown/assets/assets/images/l2d-logo-sm.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14,979 changes: 14,979 additions & 0 deletions inst/pkgdown/assets/assets/images/l2d-logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion inst/pkgdown/assets/assets/scripts.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion inst/pkgdown/assets/assets/styles.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion inst/pkgdown/assets/assets/styles.css.map

Large diffs are not rendered by default.

Binary file modified inst/pkgdown/assets/favicon-16x16.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified inst/pkgdown/assets/favicon-32x32.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified inst/pkgdown/assets/favicons/cp/apple-touch-icon-114x114.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified inst/pkgdown/assets/favicons/cp/apple-touch-icon-120x120.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified inst/pkgdown/assets/favicons/cp/apple-touch-icon-144x144.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified inst/pkgdown/assets/favicons/cp/apple-touch-icon-152x152.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified inst/pkgdown/assets/favicons/cp/apple-touch-icon-57x57.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified inst/pkgdown/assets/favicons/cp/apple-touch-icon-60x60.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified inst/pkgdown/assets/favicons/cp/apple-touch-icon-72x72.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified inst/pkgdown/assets/favicons/cp/apple-touch-icon-76x76.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified inst/pkgdown/assets/favicons/cp/favicon-128.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified inst/pkgdown/assets/favicons/cp/favicon-16x16.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified inst/pkgdown/assets/favicons/cp/favicon-196x196.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified inst/pkgdown/assets/favicons/cp/favicon-32x32.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified inst/pkgdown/assets/favicons/cp/favicon-96x96.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified inst/pkgdown/assets/favicons/cp/favicon.ico
Binary file not shown.
Binary file modified inst/pkgdown/assets/favicons/cp/mstile-144x144.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified inst/pkgdown/assets/favicons/cp/mstile-150x150.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed inst/pkgdown/assets/favicons/cp/mstile-310x150.png
Binary file not shown.
Binary file modified inst/pkgdown/assets/favicons/cp/mstile-310x310.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified inst/pkgdown/assets/favicons/cp/mstile-70x70.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified inst/pkgdown/assets/mstile-150x150.png
8,866 changes: 8,799 additions & 67 deletions inst/pkgdown/assets/safari-pinned-tab.svg

Large diffs are not rendered by default.

23 changes: 0 additions & 23 deletions inst/pkgdown/templates/footer.html
Original file line number Diff line number Diff line change
@@ -1,29 +1,6 @@
<footer class="row footer mx-md-3">
<hr/>
<div class="col-md-6">
{{# translate.ThisLessonCoC }}<p>{{& translate.ThisLessonCoC }}</p>{{/ translate.ThisLessonCoC }}
{{#yaml}}
<p>
{{^old-url}}
<a href="{{#yaml}}{{source}}/edit/{{branch}}/{{/yaml}}{{file_source}}{{^file_source}}README.md{{/file_source}}">{{ translate.EditOnGH }}</a>
{{/old-url}}
{{#old-url}}
{{#pre-beta-date}}
<a href="{{#yaml}}https://carpentries.github.io/workbench/contributor/pre-beta.html?id={{source}}/edit/{{branch}}/{{/yaml}}{{file_source}}{{^file_source}}README.md{{/file_source}}">{{ translate.EditOnGH }}</a>
{{/pre-beta-date}}
{{^pre-beta-date}}
<a href="{{#yaml}}{{source}}/edit/{{branch}}/{{/yaml}}{{file_source}}{{^file_source}}README.md{{/file_source}}">{{ translate.EditOnGH }}</a>
{{/pre-beta-date}}
{{/old-url}}
{{/yaml}}
| <a href="{{#yaml}}{{source}}/blob/{{branch}}/{{/yaml}}CONTRIBUTING.md">{{ translate.Contributing }}</a>
| <a href="{{#yaml}}{{source}}/{{/yaml}}">{{ translate.Source }}</a></p>
<p><a href="{{#yaml}}{{source}}/blob/{{branch}}/{{/yaml}}{{citation}}">{{ translate.Cite }}</a> | <a href="mailto:{{#yaml}}{{contact}}{{/yaml}}">{{ translate.Contact }}</a> | <a href="https://carpentries.org/about/">{{ translate.About }}</a></p>
</div>
<div class="col-md-6">
{{#yaml}}{{#license}}
<p>{{& translate.MaterialsLicensedUnder }}</p>
{{/license}}{{/yaml}}
<p>{{& translate.TemplateLicense }}</p>
<p>{{& translate.BuiltWith }}</p>
</div>
Expand Down
13 changes: 0 additions & 13 deletions inst/pkgdown/templates/header.html
Original file line number Diff line number Diff line change
Expand Up @@ -162,23 +162,10 @@
<a class="nav-link" href="{{#site}}{{root}}{{/site}}key-points.html">{{ translate.KeyPoints }}</a>
</li>
{{/overview}}
<li class="nav-item">
<a class="nav-link" href="{{#site}}{{root}}{{/site}}reference.html#glossary">{{ translate.Glossary }}</a>
</li>
<li class="nav-item">
<a class="nav-link" href="{{#site}}{{root}}{{/site}}profiles.html">{{ translate.LearnerProfiles }}</a>
</li>
{{/instructor}}
{{#more}}
<li class="nav-item dropdown">
<button class="nav-link dropdown-toggle" id="navbarDropdown" data-bs-toggle="dropdown" aria-expanded="false">
{{ translate.More }} <i data-feather="chevron-down"></i>
</button>
<ul class="dropdown-menu" aria-labelledby="navbarDropdown">
{{& more }}
</ul>
</li>
{{/more}}
</ul>
</div>
<!--
Expand Down
Loading