more move move, color, border changes
This commit is contained in:
Stewart Allen
parent
af7d1de2fb
commit
544348b42c
7 changed files with 81 additions and 154 deletions
|
|
@ -10,8 +10,10 @@
|
|||
--holdbar-sf: linear-gradient(to top, rgba(200,200,200,0.1), rgba(255,255,255,1), rgba(200,200,200,0.1)) !important;
|
||||
--highlight: rgba(126,153,183,0.4);
|
||||
--main-color: rgba(126,153,183,1);
|
||||
--main-color-hover: rgb(96, 127, 164);
|
||||
--work-area: rgba(255,255,255,0.75);
|
||||
--main-color-hover: rgb(96,127,164);
|
||||
--row-hover: rgb(126,153,183,0.25);
|
||||
--work-area: rgba(255,255,255,1);
|
||||
--header: rgba(126,153,183,0.5);
|
||||
--menu: #f0f0f0;
|
||||
--menu-text: #222;
|
||||
--menu-border: #555;
|
||||
|
|
@ -99,10 +101,10 @@ button[del] {
|
|||
margin-left: 5px;
|
||||
}
|
||||
input {
|
||||
background-color: #eeeeeed6;
|
||||
background-color: #f8f8ff;
|
||||
margin-bottom: 1px;
|
||||
text-align: right;
|
||||
border: 1px solid #bbb;
|
||||
border: 0.5px solid #bbb;
|
||||
padding-top: 0;
|
||||
padding-bottom: 0;
|
||||
margin-top: 1px;
|
||||
|
|
@ -110,10 +112,8 @@ input {
|
|||
}
|
||||
input:focus {
|
||||
color: #495057;
|
||||
background-color: #fff;
|
||||
border-color: #6C7F94;
|
||||
outline: 0;
|
||||
box-shadow: 0 0 0 0.2rem rgb(0 123 255 / 10%);
|
||||
box-shadow: 0 0 0 0.2rem rgb(0 100 255 / 10%);
|
||||
}
|
||||
input[disabled] {
|
||||
background-color: #ddd;
|
||||
|
|
@ -223,7 +223,7 @@ th, tr, td, label {
|
|||
color: var(--dark-menu-text)
|
||||
}
|
||||
.top-menu svg {
|
||||
color: var(--main-color);
|
||||
color: #555;
|
||||
}
|
||||
.top-menu > span {
|
||||
position: relative;
|
||||
|
|
@ -232,16 +232,16 @@ th, tr, td, label {
|
|||
align-items: center;
|
||||
}
|
||||
.top-menu > span:hover label {
|
||||
color: var(--menu-text);
|
||||
color: var(--menu-hover);
|
||||
}
|
||||
.dark .top-menu > span:hover label {
|
||||
color: var(--dark-menu-text) !important;
|
||||
}
|
||||
.top-menu > span:hover > svg {
|
||||
color: var(--main-color-hover);
|
||||
color: black;
|
||||
}
|
||||
.top-menu > span:hover {
|
||||
background-color: var(--menu);
|
||||
background-color: var(--row-hover);
|
||||
border-left: 1px solid var(--menu-border);
|
||||
border-right: 1px solid var(--menu-border);
|
||||
}
|
||||
|
|
@ -858,6 +858,7 @@ th, tr, td, label {
|
|||
min-width: 200px;
|
||||
}
|
||||
#menu-render {
|
||||
margin: 4px 0 0 0;
|
||||
gap: 3px;
|
||||
flex-direction: row;;
|
||||
}
|
||||
|
|
@ -1926,9 +1927,10 @@ th, tr, td, label {
|
|||
border-right: 3px solid transparent;
|
||||
}
|
||||
.set2-group .var-row:hover {
|
||||
border-left: 3px solid #ddd;
|
||||
border-right: 3px solid #ddd;
|
||||
background-color: #f8f8f8 !important;
|
||||
/* border-left: 3px solid var(--main-color-hover); */
|
||||
border-right: 3px solid var(--main-color-hover);
|
||||
/* background-color: #f8f8f8 !important; */
|
||||
background-color: var(--row-hover) !important;
|
||||
}
|
||||
.set2-group .var-row label {
|
||||
margin-right: 25px;
|
||||
|
|
@ -1950,15 +1952,16 @@ th, tr, td, label {
|
|||
.set-header {
|
||||
white-space: nowrap;
|
||||
border-radius: 2px;
|
||||
justify-content: center;
|
||||
background-color: var(--menu);
|
||||
border-left: 3px solid #ddd;
|
||||
border-right: 3px solid #ddd;
|
||||
justify-content: left;
|
||||
background-color: var(--header);
|
||||
/* /* border-top: 0.5px solid #888; */
|
||||
border-left: 3px solid transparent;
|
||||
border-right: 3px solid var(--main-color-hover);
|
||||
border-bottom: 0.5px solid var(--main-color-hover);
|
||||
padding: 4px;
|
||||
margin: 0 0 4px 0;
|
||||
}
|
||||
.settings .set-header {
|
||||
border-radius: 2px;
|
||||
margin: 0 !important;
|
||||
}
|
||||
.set-header-line {
|
||||
|
|
|
|||
|
|
@ -124,13 +124,6 @@
|
|||
</div>
|
||||
</div>
|
||||
</span>
|
||||
<span id="menu-nozzle">
|
||||
<i class="fas fa-map-marker"></i>
|
||||
<label>tool</label>
|
||||
<div class="top-menu-drop top-menu-right">
|
||||
<div id="pop-nozzle" class="content"></div>
|
||||
</div>
|
||||
</span>
|
||||
<span>
|
||||
<i class="fas fa-eye"></i>
|
||||
<label>view</label>
|
||||
|
|
@ -224,15 +217,6 @@
|
|||
|
||||
<!-- left settings menu -->
|
||||
<div id="panel-left" class="f-col j-left">
|
||||
<!-- ephemeral -->
|
||||
<div id="lt-back" class="lt-menu lt-enabled">
|
||||
<i class="fas fa-arrow-circle-left"></i>
|
||||
</div>
|
||||
<div id="lt-options" class="lt-menu lt-enabled">
|
||||
<div id="lt-trash"><i class="fas fa-trash"></i></div>
|
||||
<div id="lt-w-enable"><i class="fas fa-check-circle"></i></div>
|
||||
<div id="lt-w-disable"><i class="fas fa-times-circle"></i></div>
|
||||
</div>
|
||||
<!-- always up -->
|
||||
<div id="mode-info" class="f-col">
|
||||
<div><label>Mode</label><select id="mode-name">
|
||||
|
|
@ -245,16 +229,14 @@
|
|||
<div><label>Profile</label><span id="mode-profile"></span></div>
|
||||
</div>
|
||||
<div class="line-sep2"></div>
|
||||
<!-- <div class="chonk"></div>
|
||||
<div class="line-sep"></div> -->
|
||||
<div class="f-col grow settings">
|
||||
<!-- FDM -->
|
||||
<div id="fdm-layers" class="set2-group mode-fdm"></div>
|
||||
<div id="fdm-walls" class="set2-group mode-fdm"></div>
|
||||
<div id="fdm-base" class="set2-group mode-fdm"></div>
|
||||
<div id="fdm-fill" class="set2-group mode-fdm"></div>
|
||||
<div id="fdm-heat" class="set2-group mode-fdm"></div>
|
||||
<div id="fdm-cool" class="set2-group mode-fdm"></div>
|
||||
<div id="fdm-base" class="set2-group mode-fdm"></div>
|
||||
<div id="fdm-support" class="set2-group mode-fdm"></div>
|
||||
<div id="fdm-output" class="set2-group mode-fdm"></div>
|
||||
<div id="fdm-expert" class="set2-group mode-fdm"></div>
|
||||
|
|
@ -316,20 +298,7 @@
|
|||
<div class="set-header">
|
||||
<a>workspace</a>
|
||||
</div>
|
||||
<div class="set2-set f-col">
|
||||
<div class="line-sep2"></div>
|
||||
<div class="chonk2"></div>
|
||||
<div class="line-sep2"></div>
|
||||
</div>
|
||||
<div id="ws-widgets" class="f-col"></div>
|
||||
<div class="set-header">
|
||||
<a>render</a>
|
||||
</div>
|
||||
<div class="set2-set f-col">
|
||||
<div class="line-sep2"></div>
|
||||
<div class="chonk2"></div>
|
||||
<div class="line-sep2"></div>
|
||||
</div>
|
||||
<div id="menu-render" class="j-center">
|
||||
<span id="render-solid" class="j-center" title="solid">
|
||||
<i class="fas fa-square"></i>
|
||||
|
|
@ -347,11 +316,6 @@
|
|||
<div class="set-header">
|
||||
<a>ranges</a>
|
||||
</div>
|
||||
<div class="set2-set f-col">
|
||||
<div class="line-sep2"></div>
|
||||
<div class="chonk2"></div>
|
||||
<div class="line-sep2"></div>
|
||||
</div>
|
||||
<div id="fdm-ranges" class="f-col"></div>
|
||||
</div>
|
||||
<div class="set2-group f-col">
|
||||
|
|
@ -399,11 +363,6 @@
|
|||
</div>
|
||||
</div>
|
||||
|
||||
<!-- <div id="end" class="f-col a-center">
|
||||
the end
|
||||
<div id="bottom">the bottom</div>
|
||||
</div> -->
|
||||
|
||||
<!-- ThreeJS container -->
|
||||
<div id="container"></div>
|
||||
|
||||
|
|
@ -436,16 +395,6 @@
|
|||
<!-- device selector / editor -->
|
||||
<div id="mod-setup" class="mdialog f-row">
|
||||
<div class="f-col left a-stretch">
|
||||
<!-- <label class="header" lk="dm_sldt">select a device type</label>
|
||||
<div class="f-col">
|
||||
<table><tr>
|
||||
<th><button id="mode-fdm" class="dev-type"><label>FDM</label></button></th>
|
||||
<th><button id="mode-sla" class="dev-type"><label>SLA</label></button></th>
|
||||
</tr><tr>
|
||||
<th><button id="mode-cam" class="dev-type"><label>CNC</label></button></th>
|
||||
<th><button id="mode-laser" class="dev-type"><label>LASER</label></button></th>
|
||||
</tr></table>
|
||||
</div> -->
|
||||
<div id="dev-header" class="header sub f-col j-center">
|
||||
<label lk="dm_stdd">standard devices</label>
|
||||
<div id="dev-search">
|
||||
|
|
@ -593,8 +542,6 @@
|
|||
<button id="gotit" class="f-col j-center">got it</button>
|
||||
</div>
|
||||
|
||||
<!-- <div id="tool-info" class="noshow"></div> -->
|
||||
|
||||
<!-- right click pop-up menu -->
|
||||
<div id="context-menu">
|
||||
<button id="context-export-workspace" lk="rc_xpws">export workspace</button>
|
||||
|
|
|
|||
|
|
@ -328,22 +328,22 @@ self.kiri.lang['en-us'] = {
|
|||
sl_lbot_l: ["number of solid layers at bottom of the print or under bridge spans"],
|
||||
|
||||
// FDM WALLS
|
||||
sw_menu: "walls",
|
||||
sl_shel_s: "wall count",
|
||||
sw_menu: "shells",
|
||||
sl_shel_s: "shell count",
|
||||
sl_shel_l: ["number of perimeter","walls to generate"],
|
||||
ad_thin_s: "thin wall",
|
||||
ad_thin_l: ["detect and fill gaps","between shell walls"],
|
||||
|
||||
// FDM SHELLS
|
||||
sl_line_s: "wall width",
|
||||
sl_line_s: "shell width",
|
||||
sl_line_l: ["extrusion width in millimeters","0 = nozzle diameter"],
|
||||
sl_ordr_s: "wall order",
|
||||
sl_ordr_s: "shell order",
|
||||
sl_ordr_l: ["output shell order","inside to outside","or outside to inside","affects surface quality"],
|
||||
sl_strt_s: "layer start",
|
||||
sl_strt_l: ["layer starting point","last = last layer end","center = part center","origin = device origin"],
|
||||
|
||||
// FDM FILL
|
||||
fi_menu: "infill",
|
||||
fi_menu: "sparse fill",
|
||||
fi_type: "fill type",
|
||||
fi_pcnt_s: "fill amount",
|
||||
fi_pcnt_l: ["fill density values","0.0 - 1.0"],
|
||||
|
|
|
|||
Loading…
Reference in a new issue