Skip to content

Commit

Permalink
v2.6.5
Browse files Browse the repository at this point in the history
@JannisX11
JannisX11 committed Apr 12, 2019
1 parent 46e5f39 commit fd145b7
Showing 38 changed files with 1,337 additions and 872 deletions.
132 changes: 103 additions & 29 deletions css/style.css
View file
Original file line number Diff line number Diff line change
@@ -90,80 +90,83 @@
-moz-osx-font-smoothing: grayscale;
}

.icon-sketchfab:before {
content: "\e91a";
}
.icon-blockbench_file:before {
content: "\e900";
content: "\e900";
}
.icon-vertexsnap:before {
content: "\e901";
content: "\e901";
}
.icon-create_bitmap:before {
content: "\e902";
content: "\e902";
}
.icon-objects:before {
content: "\e903";
content: "\e903";
}
.icon-bow:before {
content: "\e904";
content: "\e904";
}
.icon-bb_interface:before {
content: "\e905";
content: "\e905";
}
.icon-blockbench:before {
content: "\e906";
content: "\e906";
}
.icon-x11:before {
content: "\e907";
content: "\e907";
}
.icon-baby_zombie:before {
content: "\e908";
content: "\e908";
}
.icon-armor_stand:before {
content: "\e909";
content: "\e909";
}
.icon-armor_stand_small:before {
content: "\e90a";
content: "\e90a";
}
.icon-ground:before {
content: "\e90b";
content: "\e90b";
}
.icon-hud:before {
content: "\e90c";
content: "\e90c";
}
.icon-inventory_full:before {
content: "\e90d";
content: "\e90d";
}
.icon-inventory_nine:before {
content: "\e90e";
content: "\e90e";
}
.icon-inventory_single:before {
content: "\e90f";
content: "\e90f";
}
.icon-player_head:before {
content: "\e910";
content: "\e910";
}
.icon-zombie:before {
content: "\e911";
content: "\e911";
}
.icon-blockbench_inverted:before {
content: "\e912";
content: "\e912";
}
.icon-optifine_file:before {
content: "\e913";
content: "\e913";
}
.icon-saved:before {
content: "\e914";
content: "\e914";
}
.icon-player:before {
content: "\e915";
content: "\e915";
}
.icon-mirror_x:before {
content: "\e916";
content: "\e916";
}
.icon-mirror_y:before {
content: "\e917";
content: "\e917";
}
.icon-mirror_z:before {
content: "\e918";
content: "\e918";
}

.material-icons {
@@ -257,6 +260,7 @@
}
hr {
border-top: 1px solid var(--color-dark);
margin: 12px 0;
}
h2 {
font-weight: lighter;
@@ -312,6 +316,14 @@
background: var(--color-accent);
color: var(--color-text_acc) !important;
}
button.minor {
background: transparent;
border: none;
text-decoration: underline;
}
button.minor:hover {
color: var(--color-light) !important;
}
select {
-webkit-appearance: none;
appearance: none;
@@ -644,6 +656,7 @@
display: none;
position: fixed;
width: 540px;
min-width: 370px;
top: 0;
background-color: var(--color-ui);
border: 1px solid var(--color-border);
@@ -907,6 +920,7 @@
}
.bar_select select {
padding-right: 24px;
width: 100%;
}
.bar_select::before {
content: "\23F7";
@@ -919,6 +933,7 @@
top: 3px;
}
.half {
display: inline-block;
width: calc(50% - 4px);
}
.tooltip {
@@ -946,7 +961,7 @@
/*Layout*/
body {
display: grid;
grid-template-columns: 338px auto 300px;
grid-template-columns: 332px auto 300px;
grid-template-rows: 32px calc(100% - 58px) 26px;
grid-template-areas:
"header header header"
@@ -1271,7 +1286,7 @@
}
.contextMenu.sub {
display: none;
margin-top: -31px;
margin-top: -29px;
}
.contextMenu li {
height: 35px;
@@ -1766,12 +1781,13 @@
pointer-events: none;
z-index: 5;
}
#uv .bar.next_to_title {
.panel .bar.next_to_title {
margin-top: -32px;
position: relative;
float: right;
}
#uv .bar.next_to_title .tool {
.panel .bar.next_to_title > .tool {
float: right;
}
#uv_size .ui-resizable-se:before,
#uv_size .ui-resizable-sw:before,
@@ -1809,6 +1825,63 @@
left: 1px;
}

/*Edit Session UI*/
#chat {
z-index: 16;
min-height: 180px;
flex-grow: 0;
}
#chat_history {
background: var(--color-back);
color: var(--color-text);
min-height: 81px;
max-height: 320px;
overflow-y: scroll;
padding: 5px;
font-size: 12pt;
}
#chat_history li {
padding-top: 1px;
padding-left: 7px;
}
#chat_history li b {
margin-left: -6px;
user-select: text;
color: var(--color-text);
background-color: var(--color-button);
border-radius: 4px;
padding: 1px 4px;
}
#chat_history li b.self {
color: var(--color-text_acc);
background-color: var(--color-accent);
}
#chat_history li span.text {
user-select: text;
}
#chat_history li span.timestamp {
opacity: 0.6;
font-size: 0.8em;
float: right;
}
#chat_bar {
height: 32px;
margin-bottom: 6px;
margin-top: 5px;
}
#chat_input {
padding: 5px;
width: calc(100% - 36px);
margin-left: 2px;
}
#chat_bar > i {
margin: 4px;
}
#chat_bar > i:hover {
color: var(--color-light);
}


/*Settings Dialog*/
#settings h3 > i {
margin-top: 5px;
@@ -2365,6 +2438,7 @@
font-size: 0.92em;
background: var(--color-back);
border: 1px solid var(--color-border);
border-width: 1px 0;
}
#status_bar > div {
float: left;
Binary file modified font/icomoon.eot
View file
Binary file not shown.
4 changes: 3 additions & 1 deletion font/icomoon.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.
Binary file modified font/icomoon.ttf
View file
Binary file not shown.
Binary file modified font/icomoon.woff
View file
Binary file not shown.
32 changes: 24 additions & 8 deletions index.html
View file
Original file line number Diff line number Diff line change
@@ -4,6 +4,7 @@
<title>Blockbench</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="theme-color" content="#3e90ff">
<meta name="robots" content="noindex">
<link rel="shortcut icon" href="favicon.png" type="image/x-icon" />
<link rel="stylesheet" href="css/w3.css">
<link rel="stylesheet" href="css/jquery-ui.min.css">
@@ -19,7 +20,7 @@
<script>
if (typeof module === 'object') {window.module = module; module = undefined;}//jQuery Fix
const isApp = typeof require !== 'undefined';
const appVersion = '2.6.0';
const appVersion = '2.6.5';
</script>
<script src="lib/vue.min.js"></script>
<script src="lib/vue_sortable.js"></script>
@@ -339,7 +340,7 @@ <h2 class="dialog_handle tl">dialog.scale.title</h2>
<div class="dialog_bar">
<button type="button" onclick="scaleAll(true)" class="confirm_btn tl">dialog.scale.confirm</button>
<button type="button" class="cancel_btn tl" onclick="cancelScaleAll()">dialog.cancel</button>
<button type="button" class="hidden tl" id="scale_overflow_btn" onclick="scaleAllSelectOverflow()">dialog.scale.select_overflow</button>
<button type="button" class="minor hidden tl" id="scale_overflow_btn" onclick="scaleAllSelectOverflow()">dialog.scale.select_overflow</button>
</div>
<div id="dialog_close_button" onclick="$('.dialog#'+open_dialog).find('.cancel_btn:not([disabled])').click()"><i class="material-icons">clear</i></div>
</div>
@@ -432,7 +433,6 @@ <h2 class="dialog_handle tl">dialog.project.title</h2>
<input v-model="Project.name" type="text" id="project_name" v-on:focusout="syncGeometry()" class="dark_bordered input_wide">
</div>


<div class="dialog_bar narrow">
<label for="project_parent" class="tl">dialog.project.parent</label>
</div>
@@ -446,7 +446,6 @@ <h2 class="dialog_handle tl">dialog.project.title</h2>
<input v-model="Project.ambientocclusion" type="checkbox" id="project_ambientocclusion">
</div>


<div class="dialog_bar narrow">
<label class="tl">dialog.project.texture_size</label>
</div>
@@ -457,10 +456,9 @@ <h2 class="dialog_handle tl">dialog.project.title</h2>
<input v-model="Project.texture_height" type="number" id="project_texsize_y" class="dark_bordered mediun_width" min="1" value="32">
</div>


<div class="dialog_bar">
<button type="button" class="large tl confirm_btn cancel_btn" onclick="saveProjectSettings();hideDialog();">dialog.confirm</button>
<button type="button" class="large tl" id="entity_mode_convert" onclick="entityMode.convert()">dialog.project.to_entitymodel</button>
<button type="button" class="tl confirm_btn cancel_btn" onclick="saveProjectSettings();hideDialog();">dialog.confirm</button>
<button type="button" class="minor tl" id="entity_mode_convert" onclick="entityMode.convert()">dialog.project.to_entitymodel</button>
</div>
<div id="dialog_close_button" onclick="$('.dialog#'+open_dialog).find('.cancel_btn:not([disabled])').click()"><i class="material-icons">clear</i></div>
</div>
@@ -472,6 +470,7 @@ <h2 class="dialog_handle tl">dialog.project.title</h2>
<div class="tl tab" id="layout_settings" onclick="setSettingsTab('layout_settings')">dialog.settings.layout</div>
<div class="tl tab" id="credits" onclick="setSettingsTab('credits')">dialog.settings.about</div>
</div>

<div id="setting" class="tab_content">
<h2 class="tl i_b">dialog.settings.settings</h2>
<ul id="settingslist">
@@ -514,6 +513,7 @@ <h3 v-on:click="toggleCategory(category)">
</li>
</ul>
</div>

<div id="keybindings" class="hidden tab_content">
<h2 class="tl i_b">dialog.settings.keybinds</h2>
<div class="bar next_to_title" id="keybinds_title_bar"></div>
@@ -537,6 +537,7 @@ <h3 v-on:click="toggleCategory(category)"><i class="material-icons">{{ category.
</li>
</ul>
</div>

<div id="layout_settings" class="hidden tab_content">
<h2 class="tl i_b">dialog.settings.layout</h2>
<div class="bar next_to_title" id="layout_title_bar"></div>
@@ -684,6 +685,7 @@ <h2 class="tl i_b">dialog.settings.about</h2>
<a class="open-in-browser" href="https://stuk.github.io/jszip/">JSZip</a>
</p>
</div>

<div class="dialog_bar">
<button type="button" class="large confirm_btn cancel_btn tl" onclick="saveSettings()">dialog.close</button>
</div>
@@ -743,7 +745,7 @@ <h2 class="dialog_handle tl">dialog.input.title</h2>
{{ item.name }}
</li>
</ul>
<div class="small_text" v-if="actions[index]">{{ actions[index].description }}</div>
<div class="small_text" v-if="actions[index]">{{ Pressing.alt ? actions[index].keybind.label : actions[index].description }}</div>
</div>
</div>

@@ -937,6 +939,20 @@ <h2 class="dialog_handle tl">dialog.input.title</h2>
<vue-tree :option="option"></vue-tree>
</ul>
</div>
<div id="chat" class="panel grow">
<div class="bar next_to_title" id="chat_title_bar"></div>
<ul id="chat_history" v-if="expanded">
<li v-for="msg in history">
<b v-if="msg.showAuthor()" v-bind:class="{self: msg.self}">{{ msg.author }}:</b>
<span class="text" v-bind:style="{color: msg.hex || 'inherit'}">{{ msg.text }}</span>
<span class="timestamp">{{ msg.timestamp }}</span>
</li>
</ul>
<div id="chat_bar">
<input type="text" id="chat_input" class="dark_bordered f_left" maxlength="512">
<i class="material-icons" onclick="Chat.send()">send</i>
</div>
</div>
</div>
<div id="preview">
</div>
Loading

0 comments on commit fd145b7

Please sign in to comment.