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

Jump to bottom

Bump composer/installers from 2.1.1 to 2.2.0 #18

Merged
merged 4 commits into from
Sep 11, 2022
Merged

Bump composer/installers from 2.1.1 to 2.2.0 #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
33071a9
Bump composer/installers from 2.1.1 to 2.2.0
dependabot[bot] Aug 22, 2022
b8f9804
Update build & lint
SteelWagstaff Sep 11, 2022
7af1549
Fix linting
SteelWagstaff Sep 11, 2022
2ed7e9c
Merge branch 'dev' into dependabot/composer/composer/installers-2.2.0
SteelWagstaff Sep 11, 2022
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/push.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
node: [ '14' ]
node: [ '14', '16', '18' ]
name: Node ${{ matrix.node }}
steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v3
- name: Setup node
uses: actions/setup-node@v1
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node }}
- run: npm install
Expand Down
4 changes: 2 additions & 2 deletions assets/styles/components/_colors.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// Colors
$color-1: initial !default;
$color-2: black !default;
$color-3: #acacac !default; //second hightlight color, or black
$color-4: #e6e6e6 !default; //shaded
$color-3: #acacac !default; // second highlight color, or black
$color-4: #e6e6e6 !default; // shaded

@if $type == "epub" {
$title-page-title-color: $color-2 !default;
Expand Down
26 changes: 3 additions & 23 deletions assets/styles/components/_elements.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,38 +2,30 @@

@if $type == 'epub' {
$para-indent: 1em !default;

$hx-margin-bottom: 1em !default;
$hx-margin-top: 1em !default;

$h1-margin-top: 1em !default;
$h1-font-weight: bold !default;
$h1-align: justify !default;
$h1-line-height: 1.5em !default;

$h2-margin-top: 1em !default;
$h2-align: justify !default;
$h2-margin-bottom: 1em !default;
$h2-line-height: 1.5em !default;

$h3-margin-top: 1em !default;
$h3-align: justify !default;
$h3-line-height: 1.5em !default;

$h4-margin-top: 1.25em !default;
$h4-align: justify !default;
$h4-line-height: 1.5em !default;

$h5-margin-top: 1.67em !default;
$h5-font-weight: bold !default;
$h5-align: justify !default;
$h5-line-height: 1.5em !default;

$h6-margin-top: 2.33em !default;
$h6-font-weight: bold !default;
$h6-align: justify !default;
$h6-line-height: 1.5em !default;

$blockquote-margin-top: 2em !default;
$blockquote-margin-right: 4.05em !default;
$blockquote-margin-bottom: 2em !default;
Expand All @@ -43,28 +35,20 @@
@if $type == 'web' {
$hx-line-height: 1.5em !default;
$hx-margin-top: .75em !default;

$section-title-font-weight: bold !default;

$h1-text-transform: uppercase !default;
$h1-font-weight: bold !default;

$h2-text-transform: uppercase !default;
$h2-font-weight: bold !default;

$h3-text-transform: uppercase !default;
$h3-font-weight: bold !default;

$h4-text-transform: uppercase !default;
$h4-font-weight: bold !default;

$h5-text-transform: uppercase !default;
$h5-font-weight: bold !default;

$h6-text-transform: uppercase !default;
$h6-font-weight: bold !default;
$h6-font-family: $font-3 !default;

$blockquote-font-size: .9em !default;
$blockquote-line-height: 1.4em !default;
}
Expand Down Expand Up @@ -123,24 +107,20 @@ $table-tr-border-top-width: (epub: 1px, prince: 0, web: 0) !default;
$table-tr-border-top-style: (epub: solid, prince: none, web: none) !default;
$table-tr-border-bottom-width: (epub: 1px, prince: 0, web: 0) !default;
$table-tr-border-bottom-style: (epub: solid, prince: none, web: none) !default;

$table-td-padding-top: 5px !default;
$table-td-padding-right: 5px !default;
$table-td-padding-bottom: 5px !default;
$table-td-padding-left: 5px !default;

$table-line-height: 1.1em;

// Lists
// UL
$ul-ul-margin-top: 0em !default;
$ul-ul-margin-top: 0 !default;
$ul-margin-left: (epub: 0, prince: 2em, web: 0) !default;
$ul-padding-left: 2em !default;
$ul-margin-top: 0em !default;

$ol-margin-left: (epub: 0em, prince: 2em, web: 0) !default;
$ul-margin-top: 0 !default;
$ol-margin-left: (epub: 0, prince: 2em, web: 0) !default;
$ol-ol-margin-top: 0.25em !default;

$li-li-margin-top: 0.25em !default;

// Blockquote
Expand Down
2 changes: 0 additions & 2 deletions assets/styles/components/_media.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,9 @@

// Images
$image-wrapper-margin-bottom: .5em !default;

$image-caption-font-size: 0.875em !default;
$image-caption-margin-top: (epub: 0.6em, prince: .6em, web: .6em) !default;
$image-caption-font-style: italic !default;

$image-caption-line-height: (prince: 1.2em, epub: 1.2em, web: 1.2em) !default;

// Interactive Content
Expand Down
13 changes: 6 additions & 7 deletions assets/styles/components/_pages.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,8 @@
@if $type == "epub" {
$title-subtitle-text-transform: none !default;
$title-subtitle-margin-top: 1em !default;

$dedication-font-style: normal !default;
$epigraph-font-style: normal !default;

$copyright-align: justify !default;
}

Expand All @@ -26,15 +24,15 @@ $title-title-line-height: 1.6em !default;
$title-title-margin-top: (epub: 30%, prince: 6cm, web: 3em) !default;

// Title Page Subtitle
$title-subtitle-font-size:(epub: 1.6em, prince: 1.82em, web: 1.25em) !default;
$title-subtitle-font-size: (epub: 1.6em, prince: 1.82em, web: 1.25em) !default;
$title-subtitle-margin-top: 1.5cm !default;
$title-subtitle-align: right !default;
$title-subtitle-font-style: none !default;
$title-subtitle-font-weight: bold !default;
$title-subtitle-text-transform: uppercase !default;

// Title Page Author
$title-author-font-size:(epub: 1em, prince: 1.54em, web: 1em) !default;
$title-author-font-size: (epub: 1em, prince: 1.54em, web: 1em) !default;
$title-author-margin-top: (epub: 1em, prince: 1.5cm, web: 2em) !default;
$title-author-text-transform: uppercase !default;
$title-author-align: right !default;
Expand All @@ -47,6 +45,7 @@ $title-publisher-font-weight: normal !default;
$title-publisher-font-size: .9em !default;
$title-publisher-letter-spacing: none !default;
$title-publisher-word-spacing: none !default;

// $title-publisher-margin-top: (epub: 1.5em, prince: 1.5em, web: 0) !default;
// $title-publisher-margin-bottom: (epub: 0.5em, prince: 2em, web: 0.5em) !default;

Expand All @@ -58,11 +57,11 @@ $title-publisher-city-letter-spacing: normal !default;
$title-publisher-city-word-spacing: normal !default;
$title-publisher-city-text-transform: none !default;

//Dedication
// Dedication
$dedication-margin-right: 0 !default;
$dedication-margin-left: 0 !default;

//Epigraph
// Epigraph
$epigraph-margin-right: 0 !default;
$epigraph-margin-left: 0 !default;
$epigraph-align: justify !default;
Expand All @@ -75,7 +74,7 @@ $copyright-line-height: 1.4em !default;

// Section License
$section-license-font-style: normal !default;
$section-license-margin-top: 0em !default;
$section-license-margin-top: 0 !default;

// Override variables above this line, using the !default flag to allow further overrides.
@import 'variables/pages';
Expand Down
12 changes: 3 additions & 9 deletions assets/styles/components/_section-titles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,13 @@
// Section Titles
@if $type == 'epub' {
$part-number-font-weight: normal !default;

$aphorism-cite-align: right !default;
}

@else if $type == "web" {
} @else if $type == "web" {
$section-title-text-transform: uppercase !default;
$section-title-font-weight: bold !default;

$section-title-font-weight: 600 !default;
$section-title-line-height: 1.5em !default;
$aphorism-align: right !default;

$back-matter-title-align: right !default;
$back-matter-title-font-size: 1.2em !default;
}
Expand All @@ -22,7 +17,7 @@ $section-title-block-margin-bottom: (epub: 2em, prince: 2.5cm, web: 5.4em) !defa
$section-title-block-margin-top: (epub: 1em, prince: 3.05cm, web: 5.4em) !default;
$section-header-margin-top: $section-title-block-margin-top !default;
$section-title-font-size: (epub: 1.5em, prince: 1.635em, web: 1.2em) !default;
$section-title-margin-top: (epub: 0, prince: 0em, web: 0) !default;
$section-title-margin-top: (epub: 0, prince: 0, web: 0) !default;
$section-title-margin-bottom: (epub: 2em, prince: 2.5cm, web: 2em) !default;
$section-title-font-weight: bold !default;
$section-title-align: right !default;
Expand Down Expand Up @@ -51,7 +46,6 @@ $aphorism-font-size: (epub: 0.875em, prince: 1em, web: 0.9em) !default;
$aphorism-margin-left: (epub: 50%, prince: 50%, web: auto) !default;
$aphorism-margin-bottom: (epub: 2em, prince: 4em, web: 0) !default;
$aphorism-line-height: 1.6em !default;

$aphorism-cite-font-variant: small-caps !default;
$aphorism-cite-font-size: (epub: .875em, prince: .875em, web: 0.9em) !default;
$aphorism-cite-align: right !default;
Expand Down Expand Up @@ -80,7 +74,7 @@ $part-title-font-weight: bold !default;
$part-title-align: right !default;
$part-title-margin-top: (epub: 2em, prince: 1em, web: 0) !default;
$part-title-margin-left: (epub: 20%, prince: 0, web: 0) !default;
$part-title-font-size:(epub: 1.7em, prince: 2.6em, web: 2.5em) !default;
$part-title-font-size: (epub: 1.7em, prince: 2.6em, web: 2.5em) !default;

// Chapter Number
$chapter-number-display: inline !default;
Expand Down
11 changes: 3 additions & 8 deletions assets/styles/components/_specials.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,8 @@
@if $type == 'epub' {
$hr-margin-top: 10px !default;
$hr-margin-bottom: 10px !default;

$hr-break-symbols-margin-bottom: 20px !default;

$textbox-align: justify !default;

$textbox-padding-top: 1.5em !default;
$textbox-padding-right: 1.5em !default;
$textbox-padding-bottom: 1.5em !default;
Expand Down Expand Up @@ -53,7 +50,6 @@ $edu-header-font-size: .9em !default;
// Footnotes
$footnote-font-size: (epub: 0.9em, prince: 0.75rem, web: 0.9em) !default;
$footnote-line-height: 1.4em !default;

$footnote-indent: 1em !default;
$footnote-number-marker-line-height: 1.4em !default;

Expand All @@ -76,7 +72,6 @@ $pullquote-margin-bottom: 20px !default;
// Columns
$column-twocolumn-font-size: 0.8em !default;
$column-line-height: 1.2em !default;

$column-threecolumn-text-align: left !default;

// Sidebar
Expand All @@ -102,8 +97,8 @@ div.sidebar {
width: 35%;
float: right;
margin-left: 0.75em;
margin-right: 0px;
background-color: rgb(230, 230, 230);
margin-right: 0;
background-color: rgb(230 230 230);
font-size: 0.8em;
font-style: italic;
text-align: left;
Expand All @@ -122,7 +117,7 @@ div.sidebar {
}

.sidebar li {
margin-top: 0em;
margin-top: 0;
}

.textbox.exercises ol li ,
Expand Down
3 changes: 0 additions & 3 deletions assets/styles/components/_structure.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,14 @@

// Running Content
$running-content-position: 'top-outside' !default;

$runninghead-right-text-transform: none !default;
$runninghead-right-letter-spacing: normal !default;
$runninghead-right-word-spacing: normal !default;
$runninghead-right-font-size: 0.75em !default;

$runninghead-left-text-transform: none !default;
$runninghead-left-letter-spacing: normal !default;
$runninghead-left-word-spacing: normal !default;
$runninghead-left-font-size: 0.75em !default;

$left-running-separator: '\A0\A0\A0\A0' !default;
$right-running-separator: '\A0\A0\A0\A0' !default;

Expand Down
7 changes: 3 additions & 4 deletions assets/styles/components/_toc.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

@if $type == 'epub' {
$toc-front-matter-title-font-style: italic !default;

$toc-chapter-author-font-style: italic !default;
}

Expand All @@ -13,7 +12,7 @@ $toc-block-margin-top: 1.5em !default;
// TOC Page Number

// TOC Front Matter
$toc-front-matter-margin-top: (epub: 0em, prince: 1em) !default;
$toc-front-matter-margin-top: (epub: 0, prince: 1em) !default;
$toc-front-matter-page-number-font-size: 1em !default;
$toc-front-matter-title-font-style: normal !default;

Expand All @@ -32,7 +31,7 @@ $toc-part-title-font-size: (epub: 1.2em, prince: 1.1em, web: 1em) !default;

// TOC Chapter Title
$toc-chapter-title-font-size: .875em !default;
$toc-chapter-margin-top: (epub: 0em, prince: 1.2em) !default;
$toc-chapter-margin-top: (epub: 0, prince: 1.2em) !default;

// TOC Chapter Subtitle
$toc-chapter-subtitle-margin-top: (epub: 0, prince: 0, web: 0) !default;
Expand All @@ -49,7 +48,7 @@ $toc-chapter-author-font-style: italic !default;
@import 'components/toc/left';

#toc .part {
margin-left: 0em;
margin-left: 0;
}

@if $type == "epub" {
Expand Down
7 changes: 3 additions & 4 deletions assets/styles/epub/_fonts.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
@import '_font-stack-epub'; // Dynamically generated

$serif-epub: serif !default;

$font-1: "Palatino Linotype", "Book Antiqua", Palatino, Georgia, Times, $serif-epub;
$font-2: "Palatino Linotype", "Book Antiqua", Palatino, Georgia, Times, $serif-epub;
$font-3: "Palatino Linotype", "Book Antiqua", Palatino, Georgia, Times, $serif-epub;
$font-1: "Palatino Linotype", "Book Antiqua", palatino, georgia, times, $serif-epub;
$font-2: "Palatino Linotype", "Book Antiqua", palatino, georgia, times, $serif-epub;
$font-3: "Palatino Linotype", "Book Antiqua", palatino, georgia, times, $serif-epub;

1 change: 0 additions & 1 deletion assets/styles/prince/_fonts.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

$serif-prince: serif !default;
$sans-serif-prince: sans-serif !default;

$font-1: "Linux Libertine", $serif-prince;
$font-2: "Linux Biolinum", $sans-serif-prince;
$font-3: "Linux Biolinum", $sans-serif-prince;
Expand Down
3 changes: 1 addition & 2 deletions assets/styles/web/_fonts.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,8 @@

$serif-web: serif !default;
$sans-serif-web: sans-serif !default;

$font-1: "Tinos", $serif-web;
$font-2: "Galdeano", $sans-serif-web;
$font-3: "Galdeano", $sans-serif-web;

@import url("https://fonts.googleapis.com/css?family=Galdeano|Tinos:400,400italic,700,700italic");
@import "https://fonts.googleapis.com/css?family=Galdeano|Tinos:400,400italic,700,700italic";
Loading