Skip to content
Open
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 .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.2.2
3.4
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ __Wax is an extensible workflow for producing scholarly exhibitions with minimal
It's comprised of: __a few Ruby gems__ for processing image data and associated metadata ([wax_tasks](https://github.com/minicomp/wax_tasks/), [wax_iiif](https://github.com/minicomp/wax_iiif/)), __a Jekyll theme__ ([wax_theme](https://github.com/minicomp/wax/)), and (hopefully soon!) a lot of __documentation and recipes__ for creating, deploying, and maintaining digital exhibitions.


- [Prerequisites](#Prerequisites)
- [Getting Started](#Getting-Started)
- [Using Docker](#Using-Docker)
- [Contributing](#Contributing)
- [Prerequisites](#prerequisites)
- [Getting Started](#getting-started)
- [Using Docker](#using-docker)
- [Contributing](#contributing)

<br>

Expand All @@ -32,7 +32,7 @@ It's comprised of: __a few Ruby gems__ for processing image data and associated
# Prerequisites


You'll need `git` and `ruby >= 3.2` with `bundler` installed.
You'll need `git` and `ruby >= 3.4` with `bundler` installed.
These dependencies can either be installed natively on your system or within a [Docker environment](#Using-Docker). For instructions, check the Wiki's [Setting up your system page](https://minicomp.github.io/wiki/wax/setting-up-your-system/).

Check your versions with:
Expand Down
33 changes: 32 additions & 1 deletion _sass/_wax.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,35 @@
@import 'bootstrap';
@use 'bootstrap';


// Define all variables with !default so they can be configured via 'with'
// These are the default values that will be used if not overridden

/* text */
$body-font: bootstrap.$font-family-base !default;
$heading-font: bootstrap.$font-family-base !default;

/* Image Size */
$thumbnail-height: 140px !default;
$thumbnail-width: 140px !default;

/* colors */
$text-color: #100c01 !default;
$bg-color: #ffffff !default;
$neutral: #eae7de !default;
$accent-light: #966d09 !default;
$accent-dark: #644906 !default;

/* viewport sizes */
$max-width: 800px !default;

/* margins */
$less-margin: 1.0rem !default;
$margin: 1.5rem !default;
$more-margin: 2.0rem !default;
$super-margin: 3.0rem !default;
$viewer-height: 550px !default;
$parallax-height: 350px !default;
$footer-height: 250px !default;

/*

Expand Down
73 changes: 31 additions & 42 deletions assets/styles.scss
Original file line number Diff line number Diff line change
@@ -1,51 +1,40 @@
---
sitemap: false
---
/*
variable declaration
*/
@use 'wax' with (
/* text */
$body-font: ('Open Sans', 'sans-serif'),
$heading-font: ('Open Sans', 'sans-serif'),

/* Image Size */
$thumbnail-height: 140px,
$thumbnail-width: 140px,

/* colors */
$text-color: #100c01,
$bg-color: #ffffff,
$neutral: #eae7de,
$accent-light: #966d09,
$accent-dark: #644906,

/* viewport sizes */
$max-width: 800px,

/* margins */
$less-margin: 1.0rem,
$margin: 1.5rem,
$more-margin: 2.0rem,
$super-margin: 3.0rem,
$viewer-height: 550px,
$parallax-height: 350px,
$footer-height: 250px
);

/* branding */
$logo: url("{{ '/assets/logo.png' | absolute_url }}");

/* text */

$body-font: 'Open Sans', 'sans-serif';
$heading-font: 'Open Sans', 'sans-serif';


/* Image Size */

$thumbnail-height: 140px;
$thumbnail-width: 140px;

/* colors */

$text-color: #100c01;
$bg-color: #ffffff;
$neutral: #eae7de;
$accent-light: #966d09;
$accent-dark: #644906;

/* viewport sizes */

$max-width: 800px;

/* margins */

$less-margin: 1.0rem;
$margin: 1.5rem;
$more-margin: 2.0rem;
$super-margin: 3.0rem;


$viewer-height: 550px;
$parallax-height: 350px;
$footer-height: 250px;
$logo: url("{{ '/assets/pmc-archive.jpg' | absolute_url }}");

/*
font & asset import
font import
*/

@import url('https://fonts.googleapis.com/css?family=Open+Sans:300,400,700&font-display=auto');
@import 'wax';
@import url('https://fonts.googleapis.com/css?family=Open+Sans:300,400,700&font-display=auto');
5 changes: 5 additions & 0 deletions wax_theme.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,11 @@ Gem::Specification.new do |spec|
spec.add_runtime_dependency 'jekyll', '~> 4.3.2'
spec.add_runtime_dependency 'wax_tasks', '~> 1.1'
spec.add_runtime_dependency 'webrick', '~> 1.8'
spec.add_runtime_dependency 'csv', '~> 3.3', '>= 3.3.5' # used by jekyll but no longer in ruby v3.4
spec.add_runtime_dependency 'logger', '~> 1.7' # used by jekyll but no longer in ruby v3.5
spec.add_runtime_dependency 'base64', '~> 0.3.0' # used by safe yaml but no longer in ruby v3.4

spec.add_development_dependency 'html-proofer', '~> 3.15'
spec.add_development_dependency 'benchmark', '~> 0.5.0' # used by mini_magick in pages task

end
Loading