mirror/blockbench
2
0
Fork 0
mirror of https://github.com/JannisX11/blockbench.git synced 2025-04-12 17:41:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Don't append semicolon to instruction if it's a command

Browse Source 
Closes #1505
Make toolbar configure icon more subtle
Load splash art instantly when starting Blockbench
This commit is contained in:
JannisX11 2022-11-08 20:21:07 +01:00
parent d256ce7c73
commit 96503005a9
4 changed files with 30 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
css/general.css
View File

@ -316,17 +316,19 @@
width: 40px;
padding: 2px;
}
.toolbar > .tool.toolbar_menu {
float: right;
width: 12px;
color: var(--color-subtle_text);
}
.toolbar.vertical .toolbar_menu {
height: 24px;
padding: 0;
}
.toolbar > .tool.toolbar_menu {
float: right;
width: 14px;
}
.toolbar > .tool.toolbar_menu > i {
width: 16px;
margin-left: -5px;
font-size: 20px;
}
.toolbar.vertical > .tool.toolbar_menu > i {
width: auto;
@ -370,7 +372,7 @@
padding: 0;
}
.tool.widget.bar_text {
padding: 2px 3px;
padding: 3px;
}
.tool.has_label {
width: auto;

1
css/start_screen.css
View File

@ -443,6 +443,7 @@
padding: 20px 24px;
display: block;
border-bottom: 5px solid var(--color-border);
border-top: 5px solid var(--color-border);
}
section#quick_setup > h2 {
display: block;

2
js/animations/keyframe.js
View File

@ -279,7 +279,7 @@ class Keyframe {
}
})
scripts = scripts.filter(script => !!script.replace(/[\n\s;.]+/g, ''));
scripts = scripts.map(line => line.match(/;\s*$/) ? line : (line+';'));
scripts = scripts.map(line => (line.match(/;\s*$/) || line.startsWith('/')) ? line : (line+';'));
return scripts.length <= 1 ? scripts[0] : scripts;
} else {
let points = [];

39
js/interface/start_screen.js
View File

@ -425,6 +425,25 @@ onVueSetup(function() {
Blockbench.on('construct_format delete_format', () => {
StartScreen.vue.$forceUpdate();
})
if (settings.streamer_mode.value) {
updateStreamerModeNotification()
}
addStartScreenSection('splash_screen', {
"text_color": '#000000',
"graphic": {
"type": "image",
"source": "./assets/splash_art.png?44",
"width": 1000,
"aspect_ratio": "64/27",
"description": "Splash Art by [Wan_win](https://twitter.com/Wan_w1n)",
"text_color": '#cfcfcf'
}
})
if (!Blockbench.hasFlag('after_update')) {
document.getElementById('start_screen').scrollTop = 100;
}
});
@ -480,6 +499,7 @@ ModelLoader.loaders = {};
let section = addStartScreenSection({
color: 'var(--color-back)',
graphic: {type: 'icon', icon: 'fa-archive'},
insert_after: 'splash_screen',
text: [
{type: 'h2', text: tl('message.recover_backup.title')},
{text: tl('message.recover_backup.message')},
@ -497,23 +517,6 @@ ModelLoader.loaders = {};
]
})
}
if (settings.streamer_mode.value) {
updateStreamerModeNotification()
}
addStartScreenSection('splash_screen', {
"text_color": '#000000',
"graphic": {
"type": "image",
"source": "./assets/splash_art.png?44",
"width": 1000,
"aspect_ratio": "64/27",
"description": "Splash Art by [Wan_win](https://twitter.com/Wan_w1n)",
"text_color": '#cfcfcf'
}
})
if (!Blockbench.hasFlag('after_update')) {
document.getElementById('start_screen').scrollTop = 100;
}
//Twitter
let twitter_ad;
@ -548,7 +551,7 @@ ModelLoader.loaders = {};
if (Blockbench.startup_count <= 1) {
let section = Interface.createElement('section', {id: 'quick_setup'});
$('#start_screen > content').prepend(section);
document.querySelector('#start_screen #splash_screen').after(section);
new Vue({
data() {return {