Skip to content

Commit

Permalink
v2.1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@JannisX11
JannisX11 authored Nov 11, 2018
1 parent 5cdcf1a commit 2581ce6
Show file tree
Hide file tree
Showing 38 changed files with 5,764 additions and 2,381 deletions.
Binary file modified assets/player_skin.png
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 assets/zombie.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions css/spectrum.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ License: MIT
height: 30px;
width: 12px;
margin-top: -6px;
background-color: var(--color-back);
background-color: var(--color-ui);
border: 1px solid var(--color-border);
}
.sp-alpha-inner:hover .sp-alpha-handle {
Expand Down Expand Up @@ -258,7 +258,7 @@ License: MIT
left: -3px;
right: -3px;
background: white;
background-color: var(--color-back);
background-color: var(--color-ui);
border: 1px solid var(--color-border);
margin-top: 5px;
}
Expand Down
137 changes: 134 additions & 3 deletions css/style.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -180,9 +180,13 @@
font-size: 40pt;
float: left;
padding-right: 8px;
min-width: 61px;
max-height: 54px;
max-width: 62px;
}
.dialog img.message_box_icon {
min-width: auto;
}

/*Vars*/
body {
Expand Down Expand Up @@ -360,6 +364,21 @@
border: none;
font-weight: lighter;
}
textarea {
width: 100%;
height: -webkit-fill-available;
padding: 4px;
border: 1px solid var(--color-border);
background: var(--color-back);
color: var(--color-text);
cursor: default;
resize: none;
outline: none;
}
.code {
font-family: consolas, monospace;
font-size: 16px;
}
input[type="number"]::-webkit-outer-spin-button, input[type="number"]::-webkit-inner-spin-button, {
-webkit-appeareance: none;
}
Expand Down Expand Up @@ -563,11 +582,21 @@
grid-area: header;
overflow: hidden;
white-space: nowrap;
z-index: 10;
}
header > * {
display: inline-block;
}
#loading_error_message {
height: 100%;
width: 100%;
background-color: var(--color-dark);
border: 2px solid var(--color-accent);
text-align: center;
padding-top: 160px;
position: absolute;
z-index: 250;
}

.sidebar {
background-color: var(--color-ui);;
border: 1px solid var(--color-border);
Expand Down Expand Up @@ -741,6 +770,9 @@
margin: 4px;
margin-bottom: 0;
}
.text_button:hover {
color: var(--color-light);
}

select.tool {
-webkit-appearance: none;
Expand Down Expand Up @@ -1146,7 +1178,7 @@
border: 1px solid transparent;
box-sizing: border-box;
}
.animation:hover .animation_name {
.animation:hover {
color: var(--color-light);
}
.animation.selected {
Expand All @@ -1160,6 +1192,9 @@
.animation > * {
float: left;
}
.animation > .animation_name {
width: calc(100% - 28px);
}

/*Timeline*/
#timeline {
Expand All @@ -1168,7 +1203,7 @@
body.animation_mode #timeline {
display: block;
height: 130px;
background-color: var(--color-ui);
background-color: var(--color-dark);
border-top: 1px solid var(--color-border);
}
body.animation_mode #preview .single_canvas_wrapper {
Expand All @@ -1180,13 +1215,109 @@
position: relative;
background-color: var(--color-back);
height: 129px;
border-left: 1px solid var(--color-border);
}
#timeline_inner #timeline_marker {
position: absolute;
pointer-events: none;
height: 29px;
width: 20px;
top: 0;
margin-left: -9px;
border: 2px solid var(--color-accent);
border-top-width: 6px;
background-color: rgba(0, 0, 0, 0.2);
z-index: 3;
}
#timeline_inner #timeline_marker:before {
content: "";
display: block;
margin-left: 7px;
margin-top: 23px;
height: 200px;
width: 2px;
background-color: var(--color-accent);
}
#timeline_inner .keyframe {
position: absolute;
margin-left: -11px;
z-index: 3;
}
#timeline_inner .keyframe.selected {
color: var(--color-accent);
}
#timeline_head {
float: left;
width: 120px;
background-color: var(--color-ui);
}
#timeline_head > * {
height: 30px;
width: 100%;
border-bottom: 1px solid var(--color-border);
}
#timeline_head > #timeline_corner {
font-family: consolas, monospace;
background-color: var(--color-back);
padding: 3px;
padding-left: 8px;
}
#timeline_head > .channel_head {
height: 31px;
padding: 4px;
text-align: right;
}
#timeline_head > .channel_head span {
width: 86px;
float: right;
margin-top: -2px;
overflow: hidden;
}
#timeline_head > .channel_head .text_button {
width: 26px;
font-size: 16pt;
float: right;
}
#timeline_time {
height: 30px;
position: relative;
background-color: var(--color-ui);
border-bottom: 1px solid var(--color-border);
margin-left: 8px;
}
div#timeline_time:before, div#timeline_time:after {
content: "";
background-color: var(--color-button);
width: 100%;
height: 2px;
display: block;
position: absolute;
top: 60px;
z-index: 0;
border-bottom: 1px solid var(--color-border);
}
div#timeline_time:after {
top: 90px;
}
.timeline_timecode {
border-left: 2px solid var(--color-border);
padding-left: 4px;
padding-top: 2px;
position: absolute;
pointer-events: none;
}
.timeline_timecode:first-child:before {
content: "";
width: 8px;
margin-left: -14px;
z-index: 1;
top: -28px;
height: 125px;
position: absolute;
background-color: var(--color-ui);
margin-top: 28px;
border-right: 1px solid var(--color-border);
}
/*Keyframe Panel*/
.panel#keyframe .tabs_small label {
font-size: 1em;
Expand Down
Loading

0 comments on commit 2581ce6

Please sign in to comment.