Skip to content

Commit

Permalink
v3.3.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@JannisX11
JannisX11 committed Jan 23, 2020
1 parent 1f4ef9b commit 271a46b
Show file tree
Hide file tree
Showing 48 changed files with 6,330 additions and 1,006 deletions.
8 changes: 8 additions & 0 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,14 @@ matrix:
os: osx
script: electron-builder -w --x64 --publish=always

- name: "Windows 32"
os: osx
script: electron-builder -w --ia32 --publish=always -c.productName='Blockbench_32bit'

- name: "Windows Portable"
os: osx
script: electron-builder --windows portable --x64 --publish=always -c.productName='Blockbench_portable'

- name: "Linux"
os: linux
script:
Expand Down
10 changes: 10 additions & 0 deletions css/dialogs.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,16 @@
dialog .form_bar_file:hover > .material-icons {
opacity: 1;
}
dialog .form_bar_radio {
display: flex;
}
dialog .form_bar_radio:hover {
color: var(--color-light);
}
dialog .form_bar_radio label {
flex-grow: 1;
padding: 3px 5px;
}

/*Settings Dialog*/
dialog#settings {
Expand Down
34 changes: 29 additions & 5 deletions css/general.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,13 +55,13 @@
font-size: 0.94em;
}
.color_x {
color: #d50a0a;
color: var(--color-axis-x);
}
.color_y {
color: #23d400;
color: var(--color-axis-y);
}
.color_z {
color: #0894ed;
color: var(--color-axis-z);
}
.button {
display: inline-block;
Expand Down Expand Up @@ -224,6 +224,28 @@
margin-right: 6px;
}

.annotation {
min-width: 40px;
max-width: 100%;
width: max-content;
position: absolute;
text-align: center;
background-color: var(--color-bright_ui);
color: var(--color-accent_text);
padding: 3px 8px;
pointer-events: none;
}
.annotation.transparent {
background: transparent;
font-weight: normal;
font-size: 1.2em;
padding: 0;
margin: -4px;
min-width: 15px;
color: var(--color-light);
text-shadow: 0 0 5px black;
}

.spinning {
-webkit-animation: spin 2s linear infinite;
-moz-animation: spin 2s linear infinite;
Expand All @@ -239,7 +261,7 @@
}
li.menu_bar_point {
font-size: 17px;
padding: 0 10px;
padding: 0 8px;
padding-top: 2px;
display: inline-block;
height: 100%;
Expand Down Expand Up @@ -380,7 +402,9 @@
width: 100%;
}
.bar_select .bar_select_wrapper::before {
content: "\23F7";
content: "\f0d7";
font-family: 'Font Awesome 5 Free';
font-weight: 900;
display: block;
position: absolute;
height: 12px;
Expand Down
141 changes: 89 additions & 52 deletions css/panels.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,11 +86,13 @@
width: 100%;
overflow: hidden;
position: absolute;
cursor: inherit;
}
.quad_canvas_wrapper {
height: 50%;
width: 50%;
position: absolute;
cursor: inherit;
}
.quad_canvas_wrapper.qcw_x {
border-right: 2px solid var(--color-grid);
Expand Down Expand Up @@ -300,16 +302,14 @@
}
}

/*Displaytabs*/
/*Display*/

.tabs_small input[type="radio"]:checked+label {
border-bottom: 3px solid var(--color-accent);
}

.tabs_small input[type="radio"] {
display: none;
}

.tabs_small label {
display: inline-block;
height: 30px;
Expand All @@ -326,33 +326,72 @@
div.tabs_small:not(.icon_bar) label {
padding-top: 4px;
}

.tabs_small {
background-color: transparent;
height: 30px;
display: flex;
}

.tabs_small label:hover {
color: var(--color-light);
}
#display_sliders p {
margin-top: 6px;
}

/*Bars*/
#display_bar .tool, #display_ref_bar > div {
width: calc(100% / 8 - 2px);
max-width: 52px;
}
#display_ref_bar > div > label {
width: 100%;
}
.bar.slider_input_combo {
position: relative;
display: flex;
}
.bar.slider_input_combo input.tool[type="range"] {
width: calc(100% - 67px);
float: none;
flex-grow: 1;
flex-shrink: 1;
}
.bar.slider_input_combo input.tool[type="number"] {
margin-left: -2px;
width: 60px;
background-color: var(--color-back);
float: none;
flex-grow: 0;
flex-shrink: 0;
}

input#preset_name {
background-color: var(--color-back);
}
#create_preset .dialog_bar > * {
float: left;
margin-left: 8px;
}
#display_settings p {
padding-left: 6px;
}
div#display_crosshair:after {
content: "";
width: 20px;
height: 2px;
background-color: var(--color-grid);
position: absolute;
margin-left: -9px;
margin-top: 9px;
}
div#display_crosshair {
width: 2px;
height: 20px;
background-color: var(--color-grid);
position: absolute;
top: calc(50% - 10px);
margin-left: 50%;
margin-right: auto;
}



/*Outliner*/
#cubes_list {
padding-top: 1px;
Expand Down Expand Up @@ -638,7 +677,7 @@
height: 30px;
width: 25%;
}
.panel#keyframe .bar label {
.panel .bar.flex label {
margin: 3px 8px;
min-width: 20px;
text-align: center;
Expand All @@ -663,7 +702,30 @@
background-color: var(--color-back);
height: calc(100% - 30px);
}
#timeline_marker {
.timeline_marker {
position: absolute;
margin-left: -9px;
z-index: 5;
height: 10px;
width: 20px;
}
.timeline_marker::before {
content: "";
position: absolute;
border-style: solid;
border-bottom-color: transparent !important;
border-left-color: transparent !important;
border-right-color: transparent !important;
border-width: 10px;
border-radius: 3px;
pointer-events: none;
border-color: inherit;
}
.timeline_marker:hover::before {
border-width: 11px;
margin-left: -1px;
}
#timeline_playhead {
position: absolute;
pointer-events: none;
height: 26px;
Expand All @@ -675,7 +737,7 @@
background-color: rgba(0, 0, 0, 0.2);
z-index: 3;
}
#timeline_marker_line {
#timeline_playhead_line {
content: "";
display: block;
position: absolute;
Expand Down Expand Up @@ -865,13 +927,28 @@
margin-bottom: 0;
position: relative;
}

body[mode=paint] #uv_frame {
cursor: crosshair !important;
}
#uv_frame > img {
position: absolute;
pointer-events: none;
width: 100%;
height: 100%;
top: 0;
left: 0;
object-fit: cover;
object-position: 0 0;
}
div#uv_brush_outline {
border: 1px solid white;
width: 0;
height: 0;
border-radius: 50%;
position: absolute;
pointer-events: none;
mix-blend-mode: difference;
}
.uv_mapping_overlay {
position: absolute;
Expand Down Expand Up @@ -1016,46 +1093,6 @@
color: var(--color-light);
}

/*Display*/
#display_bar .tool, #display_ref_bar > div {
width: calc(100% / 8 - 2px);
max-width: 52px;
}
#display_ref_bar > div > label {
width: 100%;
}
.bar .tool.disp_range.scaleRange {
max-width: calc(100% - 109px);
}
input#preset_name {
background-color: var(--color-back);
}
#create_preset .dialog_bar > * {
float: left;
margin-left: 8px;
}
#display_settings p {
padding-left: 6px;
}
div#display_crosshair:after {
content: "";
width: 20px;
height: 2px;
background-color: var(--color-grid);
position: absolute;
margin-left: -9px;
margin-top: 9px;
}
div#display_crosshair {
width: 2px;
height: 20px;
background-color: var(--color-grid);
position: absolute;
top: calc(50% - 10px);
margin-left: 50%;
margin-right: auto;
}

/*Color*/
.panel#color {

Expand Down
35 changes: 35 additions & 0 deletions css/setup.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -309,6 +309,9 @@
--color-checkerboard: #2f3339;

--color-close: #d62e3f;
--color-axis-x: #d50a0a;
--color-axis-y: #23d400;
--color-axis-z: #0894ed;

--font-custom-main: '';
--font-custom-headline: '';
Expand Down Expand Up @@ -412,6 +415,10 @@
padding-left: 16px;
font-weight: normal;
}
button.disabled {
opacity: 0.5;
pointer-events: none;
}
button:hover {
background: var(--color-accent);
color: var(--color-accent_text) !important;
Expand Down Expand Up @@ -495,6 +502,19 @@
input[type=checkbox][disabled=disabled] {
opacity: 0.6;
}
input[type=radio]::before {
content: "\f111";
font-family: 'Font Awesome 5 Free';
font-weight: 300;
font-size: 15pt;
}
input[type=radio]:checked::before {
content: "\f192";
}
input[type=radio][disabled=disabled] {
opacity: 0.6;
}

div.nslide {
height: 28px;
width: 100%;
Expand All @@ -506,6 +526,21 @@
outline: none;
background-color: var(--color-button);
}
.tool.nslide_tool .nslide_overlay {
width: 100%;
position: relative;
pointer-events: none;
}
.color_corner {
position: absolute;
top: 0;
right: 0;
border-width: 4px;
border-style: solid;
border-color: transparent;
border-bottom-color: transparent !important;
border-left-color: transparent !important;
}
#nslide_head {
margin-top: 30px;
color: var(--color-light);
Expand Down
Loading

0 comments on commit 271a46b

Please sign in to comment.