Skip to content

Commit

Permalink
v2.5.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@JannisX11
JannisX11 committed Mar 9, 2019
1 parent 2932389 commit 6ffc628
Show file tree
Hide file tree
Showing 40 changed files with 3,490 additions and 2,650 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ matrix:

- name: "Windows"
os: osx
script: build -w --x64 --publish=always && build -w --ia32 --publish=always
script: build -w --x64 --publish=always

- name: "Linux"
os: linux
Expand Down
202 changes: 130 additions & 72 deletions css/style.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,77 +79,80 @@
-moz-osx-font-smoothing: grayscale;
}

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


Expand Down Expand Up @@ -177,6 +180,7 @@
height: 30px;
width: 24px;
text-align: center;
vertical-align: text-top;
}
.dialog .message_box_icon {
font-size: 40pt;
Expand Down Expand Up @@ -787,7 +791,7 @@
}

.half {
width: calc(50% - 2px);
width: calc(50% - 4px);
}

.tooltip {
Expand Down Expand Up @@ -928,14 +932,46 @@
.outliner_object:hover {
color: var(--color-light);
}
.drag_hover {
border: 2px solid var(--color-accent);
#cubes_list.drag_hover > .vue-tree {
position: relative;
}
.drag_hover.drag_hover_insert_before {
border-top: 2px solid var(--color-accent);
border-bottom: none;
border-right: none;
border-left: none;
#cubes_list.drag_hover > .vue-tree > ul::before {
content: '';
width: calc(100% - 12px);
height: 2px;
margin-left: 6px;
background: var(--color-accent);
z-index: 3;
display: block;
position: absolute;
bottom: 0px;
}
.drag_hover[order]::before {
content: '';
width: calc(100% - 12px);
height: 2px;
margin-left: 6px;
background: var(--color-accent);
z-index: 3;
display: block;
position: absolute;
}
.drag_hover[order] {
position: relative;
}
.drag_hover[order="-1"]::before {
margin-top: -1px;
}
.drag_hover[order="1"]::before {
bottom: 0px;
}
.drag_hover[order="0"]::before {
width: 5px;
height: 30px;
margin-left: 0;
border-top-right-radius: 4px;
border-bottom-right-radius: 4px;

}
/*Cancel Dragover for main list*/
#cubes_list > div > ul > li.outliner_node.parent_li {
Expand All @@ -957,7 +993,8 @@
float: right;
}
body > .outliner_object {
width: 260px;
width: 180px;
padding-left: 0 !important;
box-shadow: 0 0 4px black;
}
body > .outliner_object a {
Expand Down Expand Up @@ -992,7 +1029,7 @@
font-weight: normal;
position: absolute;
top: -20px;
left: 40px;
left: 20px;
border: 1px solid var(--color-border);
}

Expand Down Expand Up @@ -1143,7 +1180,8 @@
white-space: nowrap;
position: relative;
vertical-align: middle;
padding: 8px;
padding-left: 8px;
padding-right: 8px;
border: 1px solid transparent;
box-sizing: border-box;
}
Expand All @@ -1155,7 +1193,8 @@
border: 1px solid var(--color-border);
}
.texture > i {
margin-top: 4px;
margin-top: 12px;
float: right;
}
.texture > i.clickable:hover {
color: var(--color-light);
Expand All @@ -1169,7 +1208,6 @@
div.texture_icon_wrapper {
height: 48px;
width: 48px;
margin-top: -8px;
overflow: hidden;
position: relative;
}
Expand All @@ -1185,24 +1223,27 @@
width: 48px;
height: 48px;
}
.texture_id {
display: none !important;
}

.texture_remove {
width: 24px;
}

.texture_name {
margin-top: 3px;
margin-top: 2px;
margin-left: 6px;
margin-right: 4px;
width: calc(100% - 82px);
overflow: hidden;
font-size: 0.94em;
cursor: default;
}
.texture.particle .texture_name {
.texture_res {
margin-top: -3px;
margin-left: 6px;
margin-right: 4px;
width: calc(100% - 82px);
height: 20px;
overflow: hidden;
font-size: 0.86em;
opacity: 0.6;
cursor: default;
}
.texture.particle .texture_name, .texture.particle .texture_res {
width: calc(100% - 106px);
}
.texture_error {
Expand Down Expand Up @@ -1260,12 +1301,12 @@
}
body.animation_mode #timeline {
display: block;
height: 130px;
background-color: var(--color-dark);
height: 162px;
background-color: var(--color-back);
border-top: 1px solid var(--color-border);
}
body.animation_mode #preview .single_canvas_wrapper {
height: calc(100% - 130px);
height: calc(100% - 162px);
}
#timeline_inner {
overflow-y: hidden;
Expand Down Expand Up @@ -1482,6 +1523,7 @@
bottom: -3px;
font-size: 0.8em;
cursor: default;
pointer-events: none;
}
#uv .bar.next_to_title {
margin-top: -32px;
Expand Down Expand Up @@ -1782,6 +1824,30 @@
border: none;
}

/*Keybind recording*/
#overlay_message_box {
height: 100%;
width: 100%;
position: absolute;
z-index: 130;
text-align: center;
background-color: rgba(0, 0, 0, 0.8);
}
#overlay_message_box > div {
margin-top: 64px;
width: 400px;
margin-left: auto;
margin-right: auto;
}
#overlay_message_box > div > p {
margin-bottom: 20px;
}
#overlay_message_box h3 i {
vertical-align: sub;
padding: 8px;
font-size: 1.2em;
}

/*Display*/
.mode_tab {
display: block;
Expand Down Expand Up @@ -1992,14 +2058,6 @@
cursor: default;
pointer-events: none;
}
#overlay_message_box {
height: 100%;
width: 100%;
position: absolute;
z-index: 130;
text-align: center;
background-color: rgba(0, 0, 0, 0.6);
}
.uv_message_box {
position: absolute;
margin-left: auto;
Expand Down
Binary file modified font/icomoon.eot
View file
Binary file not shown.
Loading

0 comments on commit 6ffc628

Please sign in to comment.