Skip to content

Commit

Permalink
Merge commit '63dc93295e2df5073796b15c5fe01e4ae433e832'
Browse files Browse the repository at this point in the history
  • Loading branch information
@deepnight
deepnight committed Jan 3, 2023
2 parents 86bf26a + 63dc932 commit b6a32ed
Show file tree
Hide file tree
Showing 31 changed files with 311 additions and 150 deletions.
2 changes: 1 addition & 1 deletion app/assets/css/app.min.css
View file

Large diffs are not rendered by default.

95 changes: 87 additions & 8 deletions app/assets/css/app.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1185,6 +1185,7 @@ ul.log {
.icon.json { background-image: url("../icons/json.svg"); }
.icon.layer { background-image: url("../icons/layer.png"); }
.icon.level { background-image: url("../icons/level.svg"); }
.icon.list { background-image: url("../icons/list.svg"); }
.icon.locate { background-image: url("../icons/locate.svg"); }
.icon.love { background-image: url("../icons/love.svg"); }
.icon.manual { background-image: url("../icons/manual.svg"); }
Expand Down Expand Up @@ -2885,6 +2886,16 @@ textarea {
grid-template-rows: min-content auto;
height: 100%;

.changelogsWrapper {
padding: 20px;

overflow-x: hidden;
overflow-y: auto;
background-color: $bgDark;

color: $almostWhite;
}

&.short {
min-height: 0;
max-height: 450px;
Expand Down Expand Up @@ -2967,14 +2978,73 @@ textarea {
}
}

.changelog {
padding: 20px;
.hotfixes {
&:not(:empty) {
margin-bottom: 32px;
}

overflow-y: auto;
background-color: $bgDark;
.hotfix {
padding: 8px;
font-size: 10pt;
border: 1px solid $bgLight;
border-radius: 3px;
margin-bottom: 16px;
cursor: pointer;

color: $almostWhite;
&:hover {
border-color: $orange;
}

.hotfixVersion {
font-size: 11pt;
color: $orange;
font-weight: bold;
em {
color: $bgLighter;
}
}

&:not(.collapsed) {
background-color: $bgMed;

.hotfixVersion {
margin-bottom: 8px;
}
.icon {
background-image: url("../icons/expanded.svg");
}
}

&.collapsed {
>*:not(.hotfixVersion) {
display: none;
}
.icon {
background-image: url("../icons/collapsed.svg");
}
}

&>ul {
list-style: square inside;
&>li {
padding-left: 8px;
margin-bottom: 4px;
padding-bottom: 4px;
}
}
}
}
.markdownHtml {
h2.version {
margin-bottom: 32px;
font-size: 25pt;
color: $bgLighter;
border-bottom: 1px solid $bgLighter;
// border: none;
}
h2+h2 {
margin-top: 0 !important;
}
img {
width: 100%;
height: auto;
Expand Down Expand Up @@ -3043,12 +3113,14 @@ textarea {
margin-top: 8px;
}
}
&:last-child {
border: none;
padding-bottom: 0;
margin-bottom: 0;
}
}
}

#updateChangelogMd {
display: none;
}
}
}

Expand Down Expand Up @@ -3134,6 +3206,13 @@ textarea {
&:hover {
background-color: $orange;
color: black;
text-shadow: none;
strong {
color: black;
}
}
strong {
color: $orangeLight;
}
.sub {
display: block;
Expand Down
1 change: 1 addition & 0 deletions app/assets/icons/list.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
15 changes: 8 additions & 7 deletions app/assets/tpl/changelog.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,23 +7,24 @@

<div class="cornerButtons">
<button class="close"> <span class="icon close"/> </button>
<button class="others" title="Show other versions"> <span class="icon search"/> </button>
<button class="others" title="All updates"> <span class="icon list"/> </button>
</div>
</header>

<div class="newUpdate"> <span>New update</span> </div>

<div class="changelog" id="updateChangelogHtml"></div>
<div id="updateChangelogMd">::md::</div>
<div class="changelogsWrapper">
<div class="hotfixes"></div>
<div class="markdownHtml" id="updateChangelogHtml"></div>
</div>


<!-- Parse markdowns -->
<script type="text/javascript" src="js/marked.min.js"></script>
<script type="text/javascript">
var rawMd = document.getElementById("updateChangelogMd").textContent;
document.getElementById("updateChangelogMd").remove();
document.getElementById("updateChangelogHtml").innerHTML =
marked(rawMd);
function parseMd(rawMarkdown, outputId) {
document.getElementById(outputId).innerHTML = marked(rawMarkdown);
}
</script>

<xml id="previousUpdate">
Expand Down
6 changes: 3 additions & 3 deletions app/extraFiles/samples/AutoLayers_1_basic.ldtk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
"doc": "https://ldtk.io/json",
"schema": "https://ldtk.io/files/JSON_SCHEMA.json",
"appAuthor": "Sebastien 'deepnight' Benard",
"appVersion": "1.2.0",
"appVersion": "1.2.1",
"url": "https://ldtk.io"
},
"iid": "a22d35f0-7820-11ed-b6fd-213e885f30da",
"jsonVersion": "1.2.0",
"appBuildId": 464630,
"jsonVersion": "1.2.1",
"appBuildId": 464652,
"nextUid": 108,
"identifierStyle": "Capitalize",
"worldLayout": "Free",
Expand Down
8 changes: 4 additions & 4 deletions app/extraFiles/samples/AutoLayers_2_stamps.ldtk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
"doc": "https://ldtk.io/json",
"schema": "https://ldtk.io/files/JSON_SCHEMA.json",
"appAuthor": "Sebastien 'deepnight' Benard",
"appVersion": "1.2.0",
"appVersion": "1.2.1",
"url": "https://ldtk.io"
},
"iid": "a243f240-7820-11ed-b6fd-f550906acdc3",
"jsonVersion": "1.2.0",
"appBuildId": 464630,
"jsonVersion": "1.2.1",
"appBuildId": 464652,
"nextUid": 40,
"identifierStyle": "Capitalize",
"worldLayout": "Free",
Expand Down Expand Up @@ -137,7 +137,7 @@
"savedSelections": [],
"cachedPixelData": {
"opaqueTiles": "1111111111111111111111111111111111111111111111111111111111111111111111111111111111111111110011111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111",
"averageColors": "f965f964fa65f965f854f854fa65f964fa64f964fa64fa64fa64f964f088f088f088f088f088f088f854f854f854f854f954f854f854f844f954f854f954fa64fa64f954f088f088f088f088f088f088f965f964f965f964f965f954f965f954fa65f965fa54fa64fa64f954f088f088f088f088f088f088f744f744f854f844f854f854f634f533f644f633f954f954f954f854f088f088f088f088f088f088f954f954f964f854f964f954f964f854f964f85430001000f088f088f088f088f088f088f088f088f854f754f964f964f954f854f954f854f854f854f088f088f088f088f088f088f088f088f088f088f855f854f965f964f965f964f965f964f965f964f088f088f088f088f088f088f088f088f088f088f854f854f744f854f954f954f854f965f964f954f088f088f088f088f088f088f088f088f088f088f854f854f854f854f954f964f954f965f854f954f088f088f088f088f088f088f088f088f088f088f854f854f964f855f854f854f954f854f854f964f088f088f088f088f088f088f088f088f088f088f965f854f744f854f643f088f088f088f088f088f088f088f088f088f088f088f088f088f088f088f854f643f643f754f754f088f088f088f088f088f088f088f088f088f088f088f088f088f088f088fa65f965f954f744f566f088f088f088f088f088f088f088f088f088f088f088f088f088f088f088f965f965f954f744f088f088f088f088f088f088f088f088f088f088f088f088f088f088f088f088"
"averageColors": "f965f964fa65f965f854f854fa65f964fa64f964fa64fa64fa64f964fa64f088f088f088f088f088f854f854f854f854f954f854f854f844f954f854f954fa64fa64f954fa64f088f088f088f088f088f965f964f965f964f965f954f965f954fa65f965fa54fa64fa64f954fa64f088f088f088f088f088f744f744f854f844f854f854f634f533f644f633f954f954f954f854f088f088f088f088f088f088f954f954f964f854f964f954f964f854f964f85430001000f088f088f088f088f088f088f088f088f854f754f964f964f954f854f954f854f854f854f088f088f088f088f088f088f088f088f088f088f855f854f965f964f965f964f965f964f965f964f088f088f088f088f088f088f088f088f088f088f854f854f744f854f954f954f854f965f964f954f088f088f088f088f088f088f088f088f088f088f854f854f854f854f954f964f954f965f854f954f088f088f088f088f088f088f088f088f088f088f854f854f964f855f854f854f954f854f854f964f088f088f088f088f088f088f088f088f088f088f965f854f744f854f643f088f088f088f088f088f088f088f088f088f088f088f088f088f088f088f854f643f643f754f754f088f088f088f088f088f088f088f088f088f088f088f088f088f088f088fa65f965f954f744f566f088f088f088f088f088f088f088f088f088f088f088f088f088f088f088f965f965f954f744f088f088f088f088f088f088f088f088f088f088f088f088f088f088f088f088"
}
}
], "enums": [], "externalEnums": [], "levelFields": [] },
Expand Down
8 changes: 4 additions & 4 deletions app/extraFiles/samples/AutoLayers_3_Mosaic.ldtk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
"doc": "https://ldtk.io/json",
"schema": "https://ldtk.io/files/JSON_SCHEMA.json",
"appAuthor": "Sebastien 'deepnight' Benard",
"appVersion": "1.2.0",
"appVersion": "1.2.1",
"url": "https://ldtk.io"
},
"iid": "a2533480-7820-11ed-b6fd-e9108160ae94",
"jsonVersion": "1.2.0",
"appBuildId": 464630,
"jsonVersion": "1.2.1",
"appBuildId": 464652,
"nextUid": 64,
"identifierStyle": "Capitalize",
"worldLayout": "LinearVertical",
Expand Down Expand Up @@ -507,7 +507,7 @@
"savedSelections": [],
"cachedPixelData": {
"opaqueTiles": "1111111111111111111111111111111111111111111111111111111111111111111111111111111111111111110011111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111",
"averageColors": "f965f964fa65f965f854f854fa65f964fa64f964fa64fa64fa64f964f088f088f088f088f088f088f854f854f854f854f954f854f854f844f954f854f954fa64fa64f954f088f088f088f088f088f088f965f964f965f964f965f954f965f954fa65f965fa54fa64fa64f954f088f088f088f088f088f088f744f744f854f844f854f854f634f533f644f633f954f954f954f854f088f088f088f088f088f088f954f954f964f854f964f954f964f854f964f85430001000f088f088f088f088f088f088f088f088f854f754f964f964f954f854f954f854f854f854f088f088f088f088f088f088f088f088f088f088f855f854f965f964f965f964f965f964f965f964f088f088f088f088f088f088f088f088f088f088f854f854f744f854f954f954f854f965f964f954f088f088f088f088f088f088f088f088f088f088f854f854f854f854f954f964f954f965f854f954f088f088f088f088f088f088f088f088f088f088f854f854f964f855f854f854f954f854f854f964f088f088f088f088f088f088f088f088f088f088f965f854f744f854f643f088f088f088f088f088f088f088f088f088f088f088f088f088f088f088f854f643f643f754f754f088f088f088f088f088f088f088f088f088f088f088f088f088f088f088fa65f965f954f744f566f088f088f088f088f088f088f088f088f088f088f088f088f088f088f088f965f965f954f744f088f088f088f088f088f088f088f088f088f088f088f088f088f088f088f088"
"averageColors": "f965f964fa65f965f854f854fa65f964fa64f964fa64fa64fa64f964fa64f088f088f088f088f088f854f854f854f854f954f854f854f844f954f854f954fa64fa64f954fa64f088f088f088f088f088f965f964f965f964f965f954f965f954fa65f965fa54fa64fa64f954fa64f088f088f088f088f088f744f744f854f844f854f854f634f533f644f633f954f954f954f854f088f088f088f088f088f088f954f954f964f854f964f954f964f854f964f85430001000f088f088f088f088f088f088f088f088f854f754f964f964f954f854f954f854f854f854f088f088f088f088f088f088f088f088f088f088f855f854f965f964f965f964f965f964f965f964f088f088f088f088f088f088f088f088f088f088f854f854f744f854f954f954f854f965f964f954f088f088f088f088f088f088f088f088f088f088f854f854f854f854f954f964f954f965f854f954f088f088f088f088f088f088f088f088f088f088f854f854f964f855f854f854f954f854f854f964f088f088f088f088f088f088f088f088f088f088f965f854f744f854f643f088f088f088f088f088f088f088f088f088f088f088f088f088f088f088f854f643f643f754f754f088f088f088f088f088f088f088f088f088f088f088f088f088f088f088fa65f965f954f744f566f088f088f088f088f088f088f088f088f088f088f088f088f088f088f088f965f965f954f744f088f088f088f088f088f088f088f088f088f088f088f088f088f088f088f088"
}
},
{
Expand Down
8 changes: 4 additions & 4 deletions app/extraFiles/samples/AutoLayers_4_Assistant.ldtk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
"doc": "https://ldtk.io/json",
"schema": "https://ldtk.io/files/JSON_SCHEMA.json",
"appAuthor": "Sebastien 'deepnight' Benard",
"appVersion": "1.2.0",
"appVersion": "1.2.1",
"url": "https://ldtk.io"
},
"iid": "a2533480-7820-11ed-b6fd-e9108160ae94",
"jsonVersion": "1.2.0",
"appBuildId": 464630,
"jsonVersion": "1.2.1",
"appBuildId": 464652,
"nextUid": 424,
"identifierStyle": "Capitalize",
"worldLayout": "LinearVertical",
Expand All @@ -27,7 +27,7 @@
"externalLevels": false,
"exportTiled": false,
"simplifiedExport": false,
"imageExportMode": "OneImagePerLevel",
"imageExportMode": "None",
"exportLevelBg": true,
"pngFilePattern": null,
"backupOnSave": false,
Expand Down
6 changes: 3 additions & 3 deletions app/extraFiles/samples/AutoLayers_5_Advanced.ldtk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
"doc": "https://ldtk.io/json",
"schema": "https://ldtk.io/files/JSON_SCHEMA.json",
"appAuthor": "Sebastien 'deepnight' Benard",
"appVersion": "1.2.0",
"appVersion": "1.2.1",
"url": "https://ldtk.io"
},
"iid": "a26276c0-7820-11ed-b6fd-ed05d55c9a75",
"jsonVersion": "1.2.0",
"appBuildId": 464630,
"jsonVersion": "1.2.1",
"appBuildId": 464652,
"nextUid": 104,
"identifierStyle": "Capitalize",
"worldLayout": "Free",
Expand Down
6 changes: 3 additions & 3 deletions app/extraFiles/samples/AutoLayers_6_OptionalRules.ldtk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
"doc": "https://ldtk.io/json",
"schema": "https://ldtk.io/files/JSON_SCHEMA.json",
"appAuthor": "Sebastien 'deepnight' Benard",
"appVersion": "1.2.0",
"appVersion": "1.2.1",
"url": "https://ldtk.io"
},
"iid": "a27ed860-7820-11ed-b6fd-7fbe30dcfa27",
"jsonVersion": "1.2.0",
"appBuildId": 464630,
"jsonVersion": "1.2.1",
"appBuildId": 464652,
"nextUid": 165,
"identifierStyle": "Capitalize",
"worldLayout": "LinearHorizontal",
Expand Down
Loading

0 comments on commit b6a32ed

Please sign in to comment.