Skip to content

Commit

Permalink
Merge pull request #1442 from klembot/develop
Browse files Browse the repository at this point in the history
2.7.1
  • Loading branch information
klembot authored Aug 27, 2023
2 parents 1acca51 + 9355441 commit b86f316
Show file tree
Hide file tree
Showing 8 changed files with 15 additions and 10 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
## twinejs

by Chris Klimas, Leon Arnott, Daithi O Crualaoich, Ingrid Cheung, Thomas Michael
Edwards, Micah Fitch, Juhana Leinonen, Michael Savich, and Ross Smith
by Chris Klimas, Lorenzo Ancora, Leon Arnott, Daithi O Crualaoich, Ingrid Cheung,
Thomas Michael Edwards, Micah Fitch, Juhana Leinonen, Michael Savich, and Ross Smith

### SYNOPSIS

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "Twine",
"version": "2.7.0",
"version": "2.7.1",
"description": "a GUI for creating nonlinear stories",
"author": "Chris Klimas <chris@twinery.org>",
"license": "GPL-3.0",
Expand Down

Large diffs are not rendered by default.

File renamed without changes
1 change: 1 addition & 0 deletions src/dialogs/about-twine/credits.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"code": [
"Chris Klimas",
"Lorenzo Ancora",
"Leon Arnott",
"Ingrid Cheung",
"Daithi O Crualaoich",
Expand Down
6 changes: 5 additions & 1 deletion src/dialogs/passage-edit/passage-edit-stack.css
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@
width: 100%;
}

.maximized .passage-edit-stack {
height: 100%;
}

.passage-edit-stack.collapsed {
flex-grow: 0;
/* Height is calculated in the component. */
Expand All @@ -13,4 +17,4 @@
height: 1em;
width: 1em;
transform: translateY(0.65em);
}
}
2 changes: 1 addition & 1 deletion src/store/prefs/defaults.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ export const defaults = (): PrefsState => ({
},
storyFormat: {
name: 'Harlowe',
version: '3.3.6'
version: '3.3.7'
},
storyFormatListFilter: 'current',
storyListSort: 'name',
Expand Down
4 changes: 2 additions & 2 deletions src/store/story-formats/defaults.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ export const builtins = () => [
},
{
name: 'Harlowe',
url: 'story-formats/harlowe-3.3.6/format.js',
version: '3.3.6'
url: 'story-formats/harlowe-3.3.7/format.js',
version: '3.3.7'
},
{
name: 'Paperthin',
Expand Down

0 comments on commit b86f316

Please sign in to comment.