diff --git a/.github/workflows/compile.py b/.github/workflows/compile.py index 82c42b2..c35625c 100644 --- a/.github/workflows/compile.py +++ b/.github/workflows/compile.py @@ -62,7 +62,7 @@ def main(file): # NOTE primary scss files do not have named parent directories extent = Path(file).parent.name if Path(file).parent.name else Path(file).stem if extent == "common": - for extent in ["custom", "libanswers", "libguides"]: + for extent in ["libanswers", "libguides"]: compile_css(extent, github_commit) else: compile_css(extent, github_commit) diff --git a/README.md b/README.md index c7c03e7..bf9a4ad 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ See [`ACTIONS.md`](https://github.com/caltechlibrary/libguine/blob/main/ACTIONS. ## CSS/SCSS -The CSS for the site is written with the [SCSS syntax of Sass](https://sass-lang.com/documentation/syntax#scss). It cannot be directly pasted anywhere that CSS is expected. When an `scss` file is modified, committed, and pushed to this repositiory, the compiled `custom.css` file will be downloadable as part of the artifacts produced during the GitHub Actions workflow run. Additionally, the updated `custom.css` file will be uploaded to LibGuides automatically. +The CSS for the site is written with the [SCSS syntax of Sass](https://sass-lang.com/documentation/syntax#scss). It cannot be directly pasted anywhere that CSS is expected. When an `scss` file is modified, committed, and pushed to this repositiory, the compiled `libguides.css` file will be downloadable as part of the artifacts produced during the GitHub Actions workflow run. Additionally, the updated `libguides.css` file will be uploaded to LibGuides automatically. ## HTML @@ -54,7 +54,7 @@ See [`.github/workflows/compile.py`](https://github.com/caltechlibrary/libguine/ ## JavaScript -The [`custom.js`](https://github.com/caltechlibrary/libguine/blob/main/custom.js) file can be uploaded directly into LibGuides. The GitHub Actions workflow will automatically upload a modified custom JavaScript file to LibGuides. +The [`libguides.js`](https://github.com/caltechlibrary/libguine/blob/main/libguides.js) file can be uploaded directly into LibGuides. The GitHub Actions workflow will automatically upload a modified custom JavaScript file to LibGuides. ## [bootstrap/config.json](https://github.com/caltechlibrary/libguine/blob/main/bootstrap/config.json) diff --git a/custom.scss b/custom.scss deleted file mode 100644 index 4b95a2e..0000000 --- a/custom.scss +++ /dev/null @@ -1,22 +0,0 @@ -@use "scss/custom"; - -/*** resets ***/ -html, -body, -.dropdown-menu, -.dropdown-header, -#s-lg-guide-header-info h1 { - font-size: revert; -} -body { - /* hide horizontal scroll after removing padding */ - overflow-x: hidden; - padding: 0; -} -/* hide editing header elements while keeping the template intact */ -#s-lg-guide-header, -#s-lg-tabs-container, -#s-lg-guide-tabs-title-bar, -#s-lib-footer-public { - display: none; -} diff --git a/head--system.html b/head--system.html index 27936e3..16b1bfe 100644 --- a/head--system.html +++ b/head--system.html @@ -4,6 +4,5 @@ - - + diff --git a/custom.js b/libguides.js similarity index 100% rename from custom.js rename to libguides.js diff --git a/scss/custom/_footer.scss b/scss/custom/_footer.scss deleted file mode 100644 index 3848ccd..0000000 --- a/scss/custom/_footer.scss +++ /dev/null @@ -1,159 +0,0 @@ -#footer-wrapper { - background-color: #062e47; - border-radius: 0 30% 0 0 / 5%; - margin-block-start: 90px; - @media (min-width: 768px) { - border-radius: 0 30% 0 0 / 10%; - } - @media (min-width: 992px) { - border-radius: 0 30% 0 0 / 20%; - } - footer { - color: white; - a { - color: white; - &:focus, - &:hover { - color: white; - } - &:active, - &:focus { - outline: #1e988a solid medium; - text-decoration: none; - } - } - abbr[title] { - text-decoration: none; - } - .contact .social a { - display: inline-block; - &:not(:last-child) { - margin-inline-end: 30px; // TODO $grid-gutter-width - } - svg { - height: 32px; - } - } - .h-card { - .u-email, - .p-tel { - line-height: 2; - } - .u-email, - .p-tel, - .p-name { - display: block; - } - .p-name { - margin-block-start: 24px; // TODO $font-size-base - } - .p-locality::after { - content: ","; - } - } - .logo { - fill: #fff; - margin-block: 24px; // same as footer headings - height: 5em; // “Caltech” feels the right size - } - .links { - line-height: 2; - } - // hours - .s-lc-w-today { - &, * { - display: block; - } - tbody { - padding-block: 16px; // TODO $font-size-base - } - } - .s-lc-w-sr-only { - position: absolute; - width: 1px; - height: 1px; - padding: 0; - margin: -1px; - overflow: hidden; - clip: rect(0, 0, 0, 0); - border: 0; - } - .s-lc-w-head-pre { - display: none; - } - .s-lc-w-head { - display: flex; - font-size: large; - font-weight: normal; - justify-content: space-between; - text-align: unset; - } - .s-lc-w-btn { - background: transparent; - border: none; - padding: 0; - } - .s-lc-w-next { - font-size: 0; - order: 1; - &::before { - content: "\e092"; - font-family: "Glyphicons Halflings"; - font-size: 24px; - line-height: 0.5; - } - } - .s-lc-w-previous { - font-size: 0; - &::before { - content: "\e091"; - font-family: "Glyphicons Halflings"; - font-size: 24px; - line-height: 0.5; - } - } - .s-lc-w-location { - border-block-end: #fff dotted thin; - display: flex; - justify-content: space-between; - line-height: 1; - padding-block: 8px; - } - .s-lc-w-time { - text-align: right; // for when hours wrap - & > * { - display: inline-block; - } - } - .s-lc-w-today-view-all { - display: none; - } - .hours footer { - display: flex; - justify-content: space-between; - } - } -} - -#s-lib-bc-list.breadcrumb { - font-size: revert; - font-weight: normal; - margin-block: 15px; // TODO $grid-gutter-width - max-width: 80%; // keep within border-radius - & > .active { - color: #1e988a; - } - .c3-asc & > .active { - color: #c75000; - } -} -@media (min-width: 1280px) { - #s-lib-bc-list.breadcrumb { - max-width: 90%; // keep within border-radius - } -} -@media (min-width: 1600px) { - #s-lib-bc-list.breadcrumb { - max-width: 100%; // keep within border-radius - } -} diff --git a/scss/custom/_index.scss b/scss/custom/_index.scss deleted file mode 100644 index a2042fd..0000000 --- a/scss/custom/_index.scss +++ /dev/null @@ -1,16 +0,0 @@ -@forward "../common/base"; -@forward "alerts"; -@forward "branding"; -@forward "navbar"; -@forward "footer"; -@forward "breadcrumbs"; -@forward "accordions"; -@forward "content"; -@forward "equalheights"; -@forward "cards"; -@forward "landing"; -@forward "directory"; -@forward "blog"; -@forward "library"; -@forward "archives"; -@forward "search"; diff --git a/scss/custom/_accordions.scss b/scss/libguides/_accordions.scss similarity index 100% rename from scss/custom/_accordions.scss rename to scss/libguides/_accordions.scss diff --git a/scss/custom/_alerts.scss b/scss/libguides/_alerts.scss similarity index 100% rename from scss/custom/_alerts.scss rename to scss/libguides/_alerts.scss diff --git a/scss/custom/_archives.scss b/scss/libguides/_archives.scss similarity index 99% rename from scss/custom/_archives.scss rename to scss/libguides/_archives.scss index 3d0ad7f..d903ac8 100644 --- a/scss/custom/_archives.scss +++ b/scss/libguides/_archives.scss @@ -73,7 +73,7 @@ $archives-secondary-color: #849895; font-size: small; margin: 0.5rem; } - // see custom.js for class logic + // see libguides.js for class logic @media (min-width: 420px) { .img-xs { min-width: unset; diff --git a/scss/custom/_blog.scss b/scss/libguides/_blog.scss similarity index 100% rename from scss/custom/_blog.scss rename to scss/libguides/_blog.scss diff --git a/scss/custom/_branding.scss b/scss/libguides/_branding.scss similarity index 100% rename from scss/custom/_branding.scss rename to scss/libguides/_branding.scss diff --git a/scss/custom/_breadcrumbs.scss b/scss/libguides/_breadcrumbs.scss similarity index 100% rename from scss/custom/_breadcrumbs.scss rename to scss/libguides/_breadcrumbs.scss diff --git a/scss/custom/_cards.scss b/scss/libguides/_cards.scss similarity index 100% rename from scss/custom/_cards.scss rename to scss/libguides/_cards.scss diff --git a/scss/custom/_content.scss b/scss/libguides/_content.scss similarity index 100% rename from scss/custom/_content.scss rename to scss/libguides/_content.scss diff --git a/scss/custom/_directory.scss b/scss/libguides/_directory.scss similarity index 100% rename from scss/custom/_directory.scss rename to scss/libguides/_directory.scss diff --git a/scss/custom/_equalheights.scss b/scss/libguides/_equalheights.scss similarity index 100% rename from scss/custom/_equalheights.scss rename to scss/libguides/_equalheights.scss diff --git a/scss/libguides/_footer.scss b/scss/libguides/_footer.scss index 47e392a..2943036 100644 --- a/scss/libguides/_footer.scss +++ b/scss/libguides/_footer.scss @@ -3,6 +3,143 @@ /* libguides/_footer.scss */ +#footer-wrapper { + background-color: #062e47; + border-radius: 0 30% 0 0 / 5%; + margin-block-start: 90px; + @media (min-width: 768px) { + border-radius: 0 30% 0 0 / 10%; + } + @media (min-width: 992px) { + border-radius: 0 30% 0 0 / 20%; + } + footer { + color: white; + a { + color: white; + &:focus, + &:hover { + color: white; + } + &:active, + &:focus { + outline: #1e988a solid medium; + text-decoration: none; + } + } + abbr[title] { + text-decoration: none; + } + .contact .social a { + display: inline-block; + &:not(:last-child) { + margin-inline-end: 30px; // TODO $grid-gutter-width + } + svg { + height: 32px; + } + } + .h-card { + .u-email, + .p-tel { + line-height: 2; + } + .u-email, + .p-tel, + .p-name { + display: block; + } + .p-name { + margin-block-start: 24px; // TODO $font-size-base + } + .p-locality::after { + content: ","; + } + } + .logo { + fill: #fff; + margin-block: 24px; // same as footer headings + height: 5em; // “Caltech” feels the right size + } + .links { + line-height: 2; + } + // hours + .s-lc-w-today { + &, * { + display: block; + } + tbody { + padding-block: 16px; // TODO $font-size-base + } + } + .s-lc-w-sr-only { + position: absolute; + width: 1px; + height: 1px; + padding: 0; + margin: -1px; + overflow: hidden; + clip: rect(0, 0, 0, 0); + border: 0; + } + .s-lc-w-head-pre { + display: none; + } + .s-lc-w-head { + display: flex; + font-size: large; + font-weight: normal; + justify-content: space-between; + text-align: unset; + } + .s-lc-w-btn { + background: transparent; + border: none; + padding: 0; + } + .s-lc-w-next { + font-size: 0; + order: 1; + &::before { + content: "\e092"; + font-family: "Glyphicons Halflings"; + font-size: 24px; + line-height: 0.5; + } + } + .s-lc-w-previous { + font-size: 0; + &::before { + content: "\e091"; + font-family: "Glyphicons Halflings"; + font-size: 24px; + line-height: 0.5; + } + } + .s-lc-w-location { + border-block-end: #fff dotted thin; + display: flex; + justify-content: space-between; + line-height: 1; + padding-block: 8px; + } + .s-lc-w-time { + text-align: right; // for when hours wrap + & > * { + display: inline-block; + } + } + .s-lc-w-today-view-all { + display: none; + } + .hours footer { + display: flex; + justify-content: space-between; + } + } +} + #s-lib-bc-list.breadcrumb { font-size: revert; font-weight: normal; diff --git a/scss/custom/_home.scss b/scss/libguides/_home.scss similarity index 100% rename from scss/custom/_home.scss rename to scss/libguides/_home.scss diff --git a/scss/libguides/_index.scss b/scss/libguides/_index.scss index a0026c9..9aba716 100644 --- a/scss/libguides/_index.scss +++ b/scss/libguides/_index.scss @@ -1,4 +1,18 @@ @forward "../common/base"; @forward "resets"; -@forward "exhibits"; +@forward "alerts"; +@forward "branding"; +@forward "navbar"; @forward "footer"; +@forward "breadcrumbs"; +@forward "accordions"; +@forward "content"; +@forward "equalheights"; +@forward "cards"; +@forward "landing"; +@forward "directory"; +@forward "blog"; +@forward "library"; +@forward "archives"; +@forward "exhibits"; +@forward "search"; diff --git a/scss/custom/_landing.scss b/scss/libguides/_landing.scss similarity index 100% rename from scss/custom/_landing.scss rename to scss/libguides/_landing.scss diff --git a/scss/custom/_library.scss b/scss/libguides/_library.scss similarity index 100% rename from scss/custom/_library.scss rename to scss/libguides/_library.scss diff --git a/scss/custom/_navbar.scss b/scss/libguides/_navbar.scss similarity index 100% rename from scss/custom/_navbar.scss rename to scss/libguides/_navbar.scss diff --git a/scss/libguides/_resets.scss b/scss/libguides/_resets.scss index f10c4ee..cfa9a71 100644 --- a/scss/libguides/_resets.scss +++ b/scss/libguides/_resets.scss @@ -1,5 +1,25 @@ /* libguides/_resets.scss */ +html, +body, +.dropdown-menu, +.dropdown-header, +#s-lg-guide-header-info h1 { + font-size: revert; +} +body { + /* hide horizontal scroll after removing padding */ + overflow-x: hidden; + padding: 0; +} +/* hide editing header elements while keeping the template intact */ +#s-lg-guide-header, +#s-lg-tabs-container, +#s-lg-guide-tabs-title-bar, +#s-lib-footer-public { + display: none; +} + #s-lg-guide-main { padding: 0; } diff --git a/scss/custom/_search.scss b/scss/libguides/_search.scss similarity index 96% rename from scss/custom/_search.scss rename to scss/libguides/_search.scss index be1bdf0..a0e46d7 100644 --- a/scss/custom/_search.scss +++ b/scss/libguides/_search.scss @@ -10,7 +10,7 @@ } } } -#search-alert { // element created in custom.js +#search-alert { // element created in libguides.js background-color: #fff; border: $burnt solid thin; color: #333;