开发:格式化代码

pull/1474/head
ChenX 4 years ago
parent eef957ff27
commit ccdbbf3f8c

@ -115,4 +115,3 @@ describe("相交", () =>
expect(pts7.length).toBe(1);
});
});

@ -7,77 +7,75 @@ describe("多段线凸度测试", () =>
test("多段线1", () =>
{
let f =
[1, "Polyline", 5, 2, 102, false, 1, 7, 0, [1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1], 0, 0, 2, 6, [50.84745762711873, 77.48184019370457], 0, [247.57869249394577, 274.2130750605336], 0, [582.3244552058112, 87.1670702179177], 0, [346.2469733656175, -92.00968523002416], 0, [119.85472154963692, -3.631961259079941], 0, [50.84745762711873, 77.48184019370457], 0, false]
[1, "Polyline", 5, 2, 102, false, 1, 7, 0, [1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1], 0, 0, 2, 6, [50.84745762711873, 77.48184019370457], 0, [247.57869249394577, 274.2130750605336], 0, [582.3244552058112, 87.1670702179177], 0, [346.2469733656175, -92.00968523002416], 0, [119.85472154963692, -3.631961259079941], 0, [50.84745762711873, 77.48184019370457], 0, false];
let pl = LoadCurvesFromFileData(f)[0] as Polyline;
expect(pl.IsBulge).toBeTruthy();
expect(pl.Reverse().IsBulge).toBeTruthy();
})
});
test("多段线2", () =>
{
let f =
[1, "Polyline", 5, 2, 101, false, 1, 7, 0, [1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1], 0, 0, 2, 4, [-645.278450363196, 10.895883777239712], 0, [-267.5544794188862, 10.895883777239712], 0, [-267.5544794188862, 248.18401937046002], 0, [-645.278450363196, 248.18401937046002], 0, true]
[1, "Polyline", 5, 2, 101, false, 1, 7, 0, [1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1], 0, 0, 2, 4, [-645.278450363196, 10.895883777239712], 0, [-267.5544794188862, 10.895883777239712], 0, [-267.5544794188862, 248.18401937046002], 0, [-645.278450363196, 248.18401937046002], 0, true];
let pl = LoadCurvesFromFileData(f)[0] as Polyline;
expect(pl.IsBulge).toBeTruthy();
expect(pl.Reverse().IsBulge).toBeTruthy();
})
});
test("多段线3", () =>
{
let f =
[1, "Polyline", 5, 2, 103, false, 1, 7, 0, [1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1], 0, 0, 2, 7, [964.6004842615014, 91.52542372881355], 0, [1180.5326876513318, 381.0169491525423], 0, [1384.6004842615012, 89.15254237288131], 0, [1545.956416464891, 369.15254237288127], 0, [1643.2445520581118, -231.18644067796595], 0, [1061.8886198547216, -330.8474576271187], 0, [964.6004842615014, 91.52542372881355], 0, false]
[1, "Polyline", 5, 2, 103, false, 1, 7, 0, [1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1], 0, 0, 2, 7, [964.6004842615014, 91.52542372881355], 0, [1180.5326876513318, 381.0169491525423], 0, [1384.6004842615012, 89.15254237288131], 0, [1545.956416464891, 369.15254237288127], 0, [1643.2445520581118, -231.18644067796595], 0, [1061.8886198547216, -330.8474576271187], 0, [964.6004842615014, 91.52542372881355], 0, false];
let pl = LoadCurvesFromFileData(f)[0] as Polyline;
expect(pl.IsBulge).toBeFalsy();
expect(pl.Reverse().IsBulge).toBeFalsy();
})
});
test("多段线4", () =>
{
let f =
[1, "Polyline", 5, 2, 109, false, 1, 7, 0, [1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1], 0, 0, 2, 7, [2764.373573094752, 78.02271311095797], 0, [3928.7352569216746, 78.02271311095797], 0, [5000.233738970991, 78.02271311095797], 0, [5000.233738970991, -793.4627189558191], 0, [3985.8818426309717, -1136.3422332116], 0, [4107.3183372632275, -422.0099118453894], 0, [2764.373573094752, 78.02271311095797], 0, false]
[1, "Polyline", 5, 2, 109, false, 1, 7, 0, [1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1], 0, 0, 2, 7, [2764.373573094752, 78.02271311095797], 0, [3928.7352569216746, 78.02271311095797], 0, [5000.233738970991, 78.02271311095797], 0, [5000.233738970991, -793.4627189558191], 0, [3985.8818426309717, -1136.3422332116], 0, [4107.3183372632275, -422.0099118453894], 0, [2764.373573094752, 78.02271311095797], 0, false];
let pl = LoadCurvesFromFileData(f)[0] as Polyline;
expect(pl.IsBulge).toBeFalsy();
expect(pl.Reverse().IsBulge).toBeFalsy();
})
});
test("多段线5", () =>
{
let f =
[1, "Polyline", 6, 2, 101, false, 1, 1, 0, [1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, -129.5912740248159, 469.63460268545, 0, 1], 0, 0, true, 2, 7, [-50.619121903376026, -47.47742379906265], -0.9844157985538912, [49.10300899457479, 49.04381490609535], -0.8478171566452227, [149.19015915639648, 6.942320328602818], -0.9667128487795215, [197.7928852001328, -103.76551963369957], -0.8868998721515904, [142.07655502392345, -192.71770334928226], -0.6984434005122749, [67.67670179730408, -219.99685004135756], -1.5805804792006357, [-50.619121903376026, -47.47742379906265], 0, false]
[1, "Polyline", 6, 2, 101, false, 1, 1, 0, [1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, -129.5912740248159, 469.63460268545, 0, 1], 0, 0, true, 2, 7, [-50.619121903376026, -47.47742379906265], -0.9844157985538912, [49.10300899457479, 49.04381490609535], -0.8478171566452227, [149.19015915639648, 6.942320328602818], -0.9667128487795215, [197.7928852001328, -103.76551963369957], -0.8868998721515904, [142.07655502392345, -192.71770334928226], -0.6984434005122749, [67.67670179730408, -219.99685004135756], -1.5805804792006357, [-50.619121903376026, -47.47742379906265], 0, false];
let pl = LoadCurvesFromFileData(f)[0] as Polyline;
expect(pl.IsBulge).toBeFalsy();
expect(pl.Reverse().IsBulge).toBeFalsy();
})
});
test("多段线6", () =>
{
let f =
[1, "Polyline", 6, 2, 100, false, 1, 1, 0, [1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, -1210.270699862136, -541.9634834389516, 0, 1], 0, 0, true, 2, 5, [896.401913875598, 343.41626794258354], 0, [1300.1244019138753, 343.41626794258354], 0.9999999999999997, [1300.1244019138753, 495.3397129186602], 0, [896.401913875598, 495.3397129186602], 1.0000000000000002, [896.401913875598, 343.41626794258354], 0, false]
[1, "Polyline", 6, 2, 100, false, 1, 1, 0, [1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, -1210.270699862136, -541.9634834389516, 0, 1], 0, 0, true, 2, 5, [896.401913875598, 343.41626794258354], 0, [1300.1244019138753, 343.41626794258354], 0.9999999999999997, [1300.1244019138753, 495.3397129186602], 0, [896.401913875598, 495.3397129186602], 1.0000000000000002, [896.401913875598, 343.41626794258354], 0, false];
let pl = LoadCurvesFromFileData(f)[0] as Polyline;
expect(pl.IsBulge).toBeTruthy();
expect(pl.Reverse().IsBulge).toBeTruthy();
})
});
test("多段线7", () =>
{
let f =
[1, "Polyline", 6, 2, 106, false, 1, 7, 0, [1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1], 0, 0, true, 2, 3, [2250.54489975216, -384.30088235874064], 1.7704294517701693, [2338.029348647192, 40.623583702842495], 1.8751658801449689, [2250.54489975216, -384.30088235874064], 0, false]
[1, "Polyline", 6, 2, 106, false, 1, 7, 0, [1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1], 0, 0, true, 2, 3, [2250.54489975216, -384.30088235874064], 1.7704294517701693, [2338.029348647192, 40.623583702842495], 1.8751658801449689, [2250.54489975216, -384.30088235874064], 0, false];
let pl = LoadCurvesFromFileData(f)[0] as Polyline;
expect(pl.IsBulge).toBeFalsy();
expect(pl.Reverse().IsBulge).toBeFalsy();
})
});
test("多段线8", () =>
{
let f =
[1, "Polyline", 6, 2, 100, false, 1, 1, 0, [1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1], 0, 0, true, 2, 4, [-52.05811138014525, -73.43607691883707], 0.36387790102474465, [85.9564164648911, 232.44552058111378], 0.1015665592498786, [384.9878934624697, 16.949152542372893], 0.06768033499064963, [-52.05811138014525, -73.43607691883707], 0, false]
[1, "Polyline", 6, 2, 100, false, 1, 1, 0, [1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1], 0, 0, true, 2, 4, [-52.05811138014525, -73.43607691883707], 0.36387790102474465, [85.9564164648911, 232.44552058111378], 0.1015665592498786, [384.9878934624697, 16.949152542372893], 0.06768033499064963, [-52.05811138014525, -73.43607691883707], 0, false];
let pl = LoadCurvesFromFileData(f)[0] as Polyline;
expect(pl.IsBulge).toBeFalsy();
expect(pl.Reverse().IsBulge).toBeFalsy();
})
})
});
});

@ -1,51 +1,63 @@
#arrayModal .bp3-dialog {
font-size: 16px;
}
#arrayModal .bp3-tab-panel {
margin-top: 0;
}
#arrayModal .array-type {
align-items: center;
height : 30px;
&>span {
width: 6rem;
}
}
#arrayModal .flexWrap {
display : flex;
flex-wrap: wrap;
width : unset;
&>div
{
&>div {
width : unset;
line-height: 30px;
}
}
#arrayModal .flexWrap>div .bp3-input,#modal .small-input input{
#arrayModal .flexWrap>div .bp3-input,
#modal .small-input input {
padding: 0px 8px;
}
#modal .ar-set>span:first-child {
display : inline-block;
width : 2rem;
white-space: nowrap;
}
#arrayModal .bp3-dialog>.bp3-dialog-body {
margin: 2px 10px;
}
#arrayModal .bp3-dialog>.bp3-dialog-footer {
justify-content: flex-end;
padding : 0px 10px 10px 10px;
button {
min-height: 20px;
}
}
#arrayModal .bp3-dialog>.bp3-dialog-body>div {
margin: 5px 0;
}
#arrayModal .array-tab .arrayMethod-value {
margin-top: 5px;
padding : 0 5px;
&>div>span {
width: 8rem;
}

@ -1,28 +1,32 @@
#commandPanel
{
#commandPanel {
.bp3-input {
margin : 10px;
font-size: initial;
}
.bp3-dialog {
margin-bottom: 0;
>div>.bp3-input {
border-radius: unset;
width : -webkit-fill-available;
}
.bp3-dialog-body {
display : flex;
width : 50vw;
min-width: 651px;
.bp3-tabs {
min-width : 86px;
justify-content: center;
> .bp3-tab-list
{
>.bp3-tab-list {
text-align : center;
margin-left: 10px;
}
}
.bp3-card {
width : 100%;
height : 55vh;
@ -30,14 +34,16 @@
overflow : auto;
padding : 0 10px 10px 10px;
margin : 10px;
>ul {
>ul>div>h1
{
>ul>div>h1 {
font-size : 2.5rem !important;
padding-left: 30px;
margin : 25px 0px;
}
>li,>ul>li{
>li,
>ul>li {
border-bottom : 1px solid #5C7080;
padding : 5px;
display : flex;
@ -45,37 +51,46 @@
outline : none;
align-items : center;
justify-content: space-around;
>li {
height : 36px;
margin-right: 12px;
font-size : large;
display : flex;
align-items : center;
&:first-child {
width: 4%;
}
&:nth-child(2) {
width: 17%;
}
&:nth-child(4) {
width: 20%;
}
&:nth-child(5) {
width: 10%;
}
>a {
text-align: center;
}
>span>span>input {
height : 2.0rem !important;
width : 100%;
border-radius: 3px;
}
}
>ul {
margin-right: 12px;
width : 25%;
font-size : smaller;
>li:nth-child(2) {
color: #8A9BA8;
}

@ -2,23 +2,31 @@
#entityModal {
min-width: 200px;
select,button,label{
select,
button,
label {
line-height: @inputHeight;
height : @inputHeight;
min-height : @inputHeight;
}
.bp3-button {
padding: 0 10px;
width : 100%;
}
.bp3-html-select {
width: 100%;
}
.props {
width : 100%;
margin-top: 5px;
&>li>ul>li {
position: relative;
ul {
position : absolute;
top : @inputHeight;
@ -26,33 +34,41 @@
}
}
}
.props-color {
display : flex;
justify-content: space-between;
border : 1px ridge transparent;
}
.props-color:hover {
border: 1px ridge @darkHeaderColor;
}
.props-color-list {
margin-top: 5px;
outline : none;
}
.props-color-list>li {
padding: 5px;
}
.props-color-list>li:hover {
background: @darkhovercolor;
}
.props>li {
display : flex;
align-items : center;
justify-content: flex-start;
padding : 5px 0;
}
.props>li>label {
width: 20%;
}
.props>li>ul {
width: 80%;
}

@ -1,6 +1,7 @@
#lightModal .bp3-dialog {
font-size: 16px;
}
#lightModal .bp3-dialog-body>.twoCol>label {
display : inline-block;
vertical-align: super;
@ -8,26 +9,32 @@
margin-right : 10px;
width : 30%;
}
#lightModal .bp3-dialog-body ul>.twoCol>label {
display : inline-block;
vertical-align: super;
text-align : left;
margin-right : 10px;
}
#lightModal .bp3-dialog-body>.twoCol>input {
vertical-align: super;
width : 70%;
}
#lightModal .bp3-dialog-body>.twoCol ul input {
width: 80%;
}
#lightModal .bp3-dialog-body>.twoCol {
width : 14rem;
display: flex;
}
#lightModal .bp3-dialog-body .twoCol {
display: flex;
}
#lightModal ul {
display : inline-block;
list-style : none;
@ -36,6 +43,7 @@
width : 70%;
margin : 0;
}
#lightModal li {
display: inline-block;
}

@ -1,12 +1,13 @@
/*---参照切割---*/
#referenceCuttingModal .bp3-dialog>.bp3-dialog-footer {
justify-content: flex-end;
padding : 0px 10px 10px 10px;
button {
min-height: 20px;
}
}
#referenceCuttingModal .bp3-dialog>.bp3-dialog-body {
margin: 10px;
}

@ -1,46 +1,46 @@
#snapModal
{
#snapModal {
width: 315px;
}
#snapModal .snap-set
{
#snapModal .snap-set {
margin-bottom: 3px;
padding-left : 9px;
}
#snapModal .bp3-dialog-body>div>div
{
#snapModal .bp3-dialog-body>div>div {
display : flex;
padding-top : 10px;
justify-content: space-evenly;
}
#snapModal .bp3-card
{
#snapModal .bp3-card {
flex-direction: column;
height : 20rem;
padding-bottom: 0px;
>h5 {
padding-top: 10px;
}
}
#snapModal .flexCheckbox
{
#snapModal .flexCheckbox {
display : flex;
flex-direction: column;
flex-wrap : wrap;
height : 100%;
}
#snapModal .flexCheckbox button
{
#snapModal .flexCheckbox button {
width : 70px;
min-height : 20px;
font-size : 12px;
margin-left: 9px;
}
#snapModal .flexCheckbox button ~ button
{
#snapModal .flexCheckbox button~button {
margin-top: 5px;
}
#snapModal .bp3-dialog-footer
{
#snapModal .bp3-dialog-footer {
justify-content: flex-end;
}

@ -2,18 +2,22 @@
.br-set>span:first-child {
width: 4.5rem;
}
.bespread-type {
display : flex;
flex-wrap: wrap;
&>label {
width: 50%;
}
}
.full-type {
&>div:first-child {
padding-right: 10px;
box-shadow : 1px 0 0 0 #27343e;
}
&>div:last-child {
margin-left: 10px;
}

@ -1,43 +1,55 @@
#boardPropsCom .br-name {
width: 12rem;
}
#boardPropsCom .bp3-input {
height: 1.5rem;
}
#boardPropsCom .bp3-html-select>select {
height: 1.5rem;
}
#boardPropsCom .bp3-label {
line-height : 1.5rem;
margin-bottom: 0.5rem;
}
#boardPropsCom .flexWrap>div,#boardPropsCom .flexWrap>label{
#boardPropsCom .flexWrap>div,
#boardPropsCom .flexWrap>label {
width : 50%;
line-height: 15px;
display : flex;
}
#boardPropsCom .br-set {
margin-bottom: 10px;
white-space : nowrap;
}
#boardPropsCom .flexWrap>div .bp3-input {
padding: 0 0 0 5px;
width : 5rem;
}
#boardPropsCom select {
font-size: 8px;
}
#boardPropsCom input {
font-size: 8px;
padding : 0 5px;
}
#boardPropsCom .board-info {
.br-mat {
margin-bottom: 0.5rem;
// justify-content: space-between;
button {
width: 2rem;
}
input {
width: 6.5rem;
}
@ -47,48 +59,62 @@
margin-bottom: 0;
}
}
#boardPropsCom .board-info .br-set input {
margin-left: 5px;
}
#boardPropsCom .board-config .flexWrap {
width: 250px;
}
#boardPropsCom .br-set>span:first-child {
display : inline-block;
width : 3.5rem;
white-space: nowrap;
}
#boardPropsCom .board-info select,#boardPropsCom .board-info .br-set input{
#boardPropsCom .board-info select,
#boardPropsCom .board-info .br-set input {
width: 9rem;
}
#boardPropsCom {
.boardSize {
min-width: 151px;
}
.select-drillType {
flex: 1;
}
}
#boardPropsCom .board-info .boardSize .bp3-input {
width: 30px;
}
#boardPropsCom .boardSize .bp3-inline {
line-height: 15px;
}
#boardPropsCom .boardSize .bp3-label>.bp3-input {
display : block;
padding : 0;
padding-left: 5px;
line-height : 15px;
}
#boardPropsCom .boardSize .bp3-label,#commonModal .behind-board .board-info .boardSize .bp3-input{
#boardPropsCom .boardSize .bp3-label,
#commonModal .behind-board .board-info .boardSize .bp3-input {
display: inline-block;
margin : 0 5px;
}
#boardPropsCom .bp3-label>span {
display: inline-block;
width : 3.5rem;
}
#boardPropsCom .boardModel {
display : inline-block;
width : 35px;
@ -97,16 +123,20 @@
vertical-align: middle;
margin : 10px;
}
#boardPropsCom .bp3-html-select .bp3-icon {
right: 1px;
top : 2.5px;
}
#boardPropsCom>div {
margin-bottom: 30px;
}
#boardPropsCom .cf-select .bp3-input {
height: unset;
}
#boardPropsCom>div:last-child {
float: right;
}

@ -1,14 +1,19 @@
#templateParam {
height: 100%;
.template-tree {
height: 30%;
.bp3-tree {
height : 100%;
overflow: auto;
.bp3-tree-node-list {
width: fit-content;
.bp3-tree-node-content {
height: 20px;
.bp3-tree-node-label {
overflow: unset;
}
@ -16,31 +21,39 @@
}
}
}
.template-detail {
width: 100%;
.bp3-input {
width: 5rem;
}
.basePtExpress {
display : flex;
justify-content: space-around;
}
.rotateExpress {
display : flex;
justify-content: space-around;
}
.bp3-numeric-input {
padding : 0;
height : unset;
line-height: unset;
.bp3-button-group.bp3-vertical>.bp3-button {
width: 20px;
}
.bp3-input {
padding-left: 10px;
width : 4rem;
}
}
&>div {
input {
height: 30px;
@ -88,6 +101,7 @@
}
}
}
.attach-info {
margin-top: 10px;
font-size : 14px;

@ -1,49 +1,62 @@
.properties {
width: 170px;
.bp3-card {
padding: 5px;
height : 100%;
.header {
span {
font-size : 12px;
font-weight: 600;
}
margin : 10px 0;
display : flex;
justify-content: space-between;
padding : 0 5px;
align-items : center;
}
.select {
.bp3-html-select {
width: 100%;
select {
height : 2.0rem;
line-height: 2.0rem;
min-height : 2.0rem;
}
>span {
top: 2px;
}
}
}
>ul>li {
margin: 5px 0 0 0 !important;
}
ul{//.props
ul {
//.props
width: 100% !important;
.li-title {
padding: 5px;
margin : 5px 0 0 0;
width : 100%;
}
>li {
width: 100% !important;
}
.color {
margin : 5px 0 0 0 !important;
width : 100% !important;
display: flex;
>label {
width : 20%;
display : flex;
@ -52,30 +65,39 @@
flex-direction : column;
justify-content: end;
}
>ul {
width: 100% !important;
.props-color {
display : flex;
justify-content: space-between;
border : 1px ridge transparent;
&:hover {
border : 1px ridge #8A9BA8;
background: #BFCCD6;
cursor : pointer;
}
>li {
pointer-events: none;
}
}
>li {
>label {
width: 100%;
}
>ul{//.props-color-list
>ul {
//.props-color-list
outline : none;
background: none !important;
>li {
padding: 5px 0 0 0 !important;
&:hover {
background: #BFCCD6 !important;
}
@ -84,10 +106,12 @@
}
}
}
.dal-editor {
>ul>li {
padding: 5px 0 0 0;
}
.outline {
div {
width : 100%;
@ -96,23 +120,29 @@
align-items : center;
}
}
.text-editor {
>div {
>span {
margin: auto 0;
}
>.numeric_input {
width: 60%;
.bp3-input-group {
width: 60%;
}
}
display : flex;
justify-content: space-between;
}
}
.leadout-editor {
display: flex;
>span {
width : 70%;
margin : auto 0;
@ -123,14 +153,15 @@
}
}
}
#PropertiesBtn {
>div {
background : #fff;
transform : perspective(3em) rotateY(40deg);
border-radius: 0 10px 10px 0;
}
.bp3-button.bp3-small
{
.bp3-button.bp3-small {
&.iconTransBtn {
>span {
transform : rotate(-90deg);
@ -140,9 +171,11 @@
transition : transform .25s linear;
}
}
border-radius: 0 3px 3px 0;
min-height : 30px;
padding : 5px 5px 5px 0;
>span {
transform : rotate(90deg);
-webkit-transition: transform .25s linear;

@ -1,52 +1,63 @@
#modal .batchCurtailModal {
padding: 0;
header {
font-size: 16px;
height : 60px;
padding : 20px;
}
.batchCurtailModal-body {
padding: 0 20px 20px 20px;
.radio {
margin: 10px;
}
&>div
{
&>div {
input {
width : 5rem;
height : 20px;
line-height: 20px;
}
>div:not(class) {
display : flex;
justify-content: center;
&>.bp3-label {
width : 50%;
text-align : right;
padding-right: 10px;
line-height : normal;
}
&>.bp3-label>input {
vertical-align: middle;
}
}
}
footer {
text-align: right;
button {
margin-left: 10px;
}
.cf-select {
label {
display : block;
text-align : left;
margin-left: 5px;
}
.bp3-popover-content {
// height: 90px;
overflow: auto;
}
}
.bp3-divider {
margin-top: 10px;
}

@ -63,12 +63,15 @@
:nth-child(1) {
flex: 1;
}
:nth-child(2) {
width: 160px;
}
:nth-child(3) {
width: 100px;
}
:nth-child(4) {
width: 100px;
}
@ -87,15 +90,19 @@
:nth-child(1) {
flex: 1;
}
:nth-child(2) {
width: 160px;
}
:nth-child(3) {
width: 100px;
}
:nth-child(4) {
width: 100px;
}
// &>div {
// flex: 1;
// text-align: left;

@ -1,9 +1,7 @@
//因为某些样式被蓝图破坏,所以修正它.
//用于切换主题色 本文件在switchTheme.less中被引用
//配色方案见https://blueprintjs.com/docs/#core/colors
.changeGoldenTheme(
@lm_content_bg:#2C343A,
.changeGoldenTheme(@lm_content_bg: #2C343A,
@standrad_shadow: #000,
@text_color_unactive: #76838E,
@text_color_active: #fff,
@ -45,6 +43,7 @@
#toolbar {
background: @toolbar_bg !important;
}
#toolbar ul li:hover {
background: @topToolBar_li_hover;
cursor : pointer;
@ -55,10 +54,12 @@
color : @command_result_text;
background: @lm_content_bg;
}
.terminal-pusher {
background: @lm_content_bg;
box-shadow: inset 0px 14px 16px -15px @standrad_shadow;
}
#TerminalOutputArea .terminal-output {
background: @lm_content_bg;
}
@ -72,6 +73,7 @@
color : @text_color_active;
background-color: @recommand_cmd_bg;
}
#input-hint .recommend-command>li.hover {
background-color: @recommand_cmd_bg_hover;
}
@ -85,71 +87,94 @@
#TopToolBar {
background: @topToolBar_bg;
}
#TopToolBar .tool-block>div>.bp3-button {
background: @topToolsBlock_btn_bg;
&:hover {
background: @topToolsBlock_btn_bg_hover;
}
}
#TopToolBar .ul-unstyle {
background: @topToolBar_ul_bg;
}
#TopToolBar .small-iconlist>.bp3-button {
background: @topToolBar_smallIconList_btn_bg;
&:hover {
background: @topToolBar_smallIconList_btn_bg_hover;
}
}
#TopToolBar .ul-unstyle>li:hover {
background: @topToolBar_li_hover;
}
.tabs-unstyle .bp3-tab-list {
background: @topToolBar_tablist_bg;
}
.tabs-unstyle .bp3-tab[aria-selected="true"], .tabs-unstyle .bp3-tab:not([aria-disabled="true"]):hover {
.tabs-unstyle .bp3-tab[aria-selected="true"],
.tabs-unstyle .bp3-tab:not([aria-disabled="true"]):hover {
color : @topToolBar_tablist_color;
background: @topToolBar_tablist_bg_hover;
}
.bp3-tabs.bp3-vertical>.bp3-tab-list .bp3-tab.tab-unstyle[aria-selected="true"] {
background: @verticalTab_selected_bg;
}
#TopToolBar .tabs-unstyle .bp3-tab.tab-unstyle {
border-color: @tabUnstyle_border;
}
#RightPanel .bp3-tab-panel.tab-unstyle .bp3-tab.tab-unstyle {
border-color: @rightPanel_tabs_border;
}
/*----------浮动命令栏-----------*/
#CommandInput .react-draggable {
.terminal-output-area, .command-input-area{
.terminal-output-area,
.command-input-area {
background: @commandInput_bg;
}
.drag-area {
background: @commandInput_dragArea_bg;
}
}
#TransTerminal .terminal-commandResult span {
background: @terminalCommandResult_bg;
}
/*----------F1面板-----------*/
#commandPanel .bp3-card>ul>li:hover,#commandPanel .bp3-card>ul>ul>li:hover
{
#commandPanel .bp3-card>ul>li:hover,
#commandPanel .bp3-card>ul>ul>li:hover {
background-color: @commandPanel_li_bg_hover;
cursor : pointer;
}
/*-----------BBS-------------*/
#modal .br-lookover .react-draggable {
>div {
background-color: @fileName_bg
}
}
/*---------特性面板----------*/
.properties {
.bp3-card {
.header {
background: @properties_header_bg;
}
ul{//.props
ul {
//.props
.li-title {
background: @properties_li_title_bg;
}

@ -1,42 +1,53 @@
#modal .rotateLyModal {
padding: 0;
header {
padding : 20px;
font-size: 16px;
}
.select-type {
.bp3-radio {
margin-right: 10px;
}
.br-set>span {
width: 3.1rem;
}
input {
margin-right: 10px;
}
}
&>div {
padding: 0 20px 20px 20px;
>div:not(class) {
display: flex;
&>.bp3-label {
width : 50%;
text-align : right;
padding-right: 10px;
line-height : normal;
}
&>.bp3-label>input {
vertical-align: middle;
}
}
}
input {
width : 5rem;
height : 20px;
line-height: 20px;
}
footer {
text-align: right;
button {
margin-right: 10px;
}

@ -192,7 +192,8 @@ body {
font-size: 11px
}
.terminal-output-area, .terminal-output-area-transparent{
.terminal-output-area,
.terminal-output-area-transparent {
flex: 1;
}
@ -278,6 +279,7 @@ input[type=radio] {
#TopPanel .info {
margin: 0;
}
// 工具栏样式
#toolbar {
ul {
@ -286,10 +288,12 @@ input[type=radio] {
flex-wrap : wrap;
margin : 0;
width : 80px;
>li {
width : 40px;
margin : 0;
padding: 0;
img {
width : 30px;
height: 30px;
@ -297,12 +301,14 @@ input[type=radio] {
}
}
}
// 媒体查询 ToolBar
@media screen and (max-height:1148px) {
#toolbar ul {
width: 80px;
}
}
@media screen and (max-height:699px) {
#toolbar ul {
width : 90px;
@ -312,23 +318,28 @@ input[type=radio] {
overflow : auto;
}
}
/*----------TopToolBar开始-----------*/
//顶部工具栏样式
#TopToolBar img {
width: auto;
}
#TopToolBar .bp3-tab-list {
>div {
font-size: 14px;
}
}
//分类工具块
#TopToolBar .tool-block {
display : flex;
flex-direction: row;
&>div {
display : flex;
flex-direction: column;
>ul {
overflow : hidden;
height : 55px;
@ -338,6 +349,7 @@ input[type=radio] {
flex-wrap : wrap;
justify-content: space-around;
align-items : baseline;
li {
float : left;
text-align : center;
@ -345,6 +357,7 @@ input[type=radio] {
cursor : pointer;
}
}
&>.bp3-button {
min-height : 20px;
font-size : 10px;
@ -358,31 +371,37 @@ input[type=radio] {
}
}
}
//图标工具
#TopToolBar {
.tabs-unstyle .bp3-tab-panel.tab-unstyle {
padding: 5px 0 0 0;
}
// overflow: hidden;
p {
margin: 0px;
}
.rc-autoresponsive-container
{
.rc-autoresponsive-container {
overflow: hidden;
>li {
border-radius: 3px;
width : 55px;
height : 55px;
text-align : center;
>img {
height: 30px;
width : 30px;
}
&:hover {
cursor : pointer;
background: #d8d8d8;
}
>p {
text-align: center;
margin-top: 5px;
@ -390,31 +409,35 @@ input[type=radio] {
}
}
}
//隐藏缩略图标按钮
#TopToolBar .small-iconlist
{
#TopToolBar .small-iconlist {
width : 100%;
position : absolute;
margin-top : 55px;
display : flex;
flex-direction: column;
outline : none;
// flex-flow: column wrap;
ul {
margin : 0;
display : flex;
flex-flow: row wrap;
>li {
height : 25px;
width : 50px;
text-align: center;
cursor : pointer;
>img {
height: 20px;
width : 20px;
}
}
}
&>.bp3-button {
width : 100%;
min-height : 20px;
@ -425,6 +448,7 @@ input[type=radio] {
padding : 0;
border-radius: 0px;
background : #2d3a46;
&:hover {
background: #202b33;
}
@ -434,31 +458,31 @@ input[type=radio] {
/*----------TopToolBar结束-----------*/
/*----------浮动命令栏开始-----------*/
#CommandInput .drag-area
{
#CommandInput .drag-area {
width: 10px;
}
#TerminalOutputArea .terminal-commandResult
{
#TerminalOutputArea .terminal-commandResult {
word-break: break-all;
}
//透明历史命令
#TransTerminal
{
#TransTerminal {
height: 100px;
.terminal-pusher {
background: transparent;
}
}
#TransTerminal .terminal-commandResult
{
#TransTerminal .terminal-commandResult {
margin: 5px;
span {
padding : 0 3px 0 3px;
border-radius: 3px;
}
animation-name : fade-out;
animation : fade-out 5s ease-in;
animation-fill-mode : forwards;
@ -466,18 +490,24 @@ input[type=radio] {
opacity : 1;
animation-delay : 1.5s;
}
//fade out 动画
@keyframes fade-out {
100% {opacity: 0;}
100% {
opacity: 0;
}
}
/*----------浮动命令栏结束-----------*/
// 媒体查询
@media screen and (max-width: 599px) {//当宽度为599或者更小时
@media screen and (max-width: 599px) {
//当宽度为599或者更小时
#TopPanel .menu {
display: flex;
}
#TopPanel .info {
overflow : hidden;
flex-direction: column;
@ -486,6 +516,7 @@ input[type=radio] {
top : 50px;
background : #394b59;
}
#TopPanel .hidden {
display: none;
}
@ -509,16 +540,18 @@ input[type=radio] {
border : 1px solid transparent;
padding : 0 0px;
}
.text-input:focus {
border-color: #fff;
background : #444;
}
/**********自定义通用样式*****************/
.flex
{
.flex {
display: flex;
}
.flexCol {
display : flex;
flex-direction: column;
@ -534,41 +567,51 @@ div {
float: right;
;
}
.inline {
display: inline-block
}
.flexWrap {
display : flex;
flex-wrap: wrap
}
.ul-unstyle {
list-style: none;
padding : 0;
}
.flex-arround {
.flex();
justify-content: space-around;
}
.flex-between {
.flex();
justify-content: space-between;
}
.flex-col {
.flex();
flex-direction: column;
}
.flex-center {
.flex();
justify-content: center;
}
.flex-end {
.flex();
justify-content: flex-end;
}
.flex-wrap {
display : flex;
flex-wrap: wrap
}
.half {
width: 50%;
}
@ -585,9 +628,11 @@ img {
.center {
text-align: center;
}
.widthHalf {
width: 50%;
}
.arrow {
display: block;
border : 10px solid transparent;
@ -595,13 +640,16 @@ img {
height : 0px;
margin : 0 auto;
}
.arrowtop {
border-bottom: 10px solid #000;
margin-top : -3px;
}
.arrowbottom {
border-top: 10px solid #000;
}
.line {
display: block;
border : 2px solid #000;
@ -624,9 +672,11 @@ img {
#matContent canvas {
border-left: 1px solid #30404d;
}
.right {
text-align: right;
}
.flex-wrap {
.flex();
flex-wrap: wrap;

@ -1,11 +1,12 @@
@charset "utf-8";
@import (less) "golden.less";
.dark-golden {
.changeGoldenTheme(); //黑夜
}
.light-golden {
.changeGoldenTheme(
#cbd7e7,//@lm_content_bg
.changeGoldenTheme(#cbd7e7, //@lm_content_bg
#394B59, //@standrad_shadow
#999999, //@text_color_unactive
#10161A, //@text_color_active

@ -14,7 +14,8 @@
background: #ee7813;
}
html, body{
html,
body {
margin : 0;
height : 100%;
background: #000;
@ -26,6 +27,7 @@ html, body{
width : 100%;
position: absolute;
}
.btnContainer {
width : 300px;
margin : 0 auto;
@ -33,6 +35,7 @@ html, body{
top : 50%;
margin-top: -30px;
}
button {
-moz-box-shadow : inset 0px 1px 0px 0px #777;
-webkit-box-shadow : inset 0px 1px 0px 0px #777;
@ -63,6 +66,7 @@ button {
width : 100px;
}
button:hover {
background : -webkit-gradient(linear, left top, left bottom, color-stop(0.05, #1f1f1f), color-stop(1, #403f40));
background : -moz-linear-gradient(top, #1f1f1f 5%, #403f40 100%);
@ -73,8 +77,8 @@ button:hover {
filter : progid:DXImageTransform.Microsoft.gradient(startColorstr='#1f1f1f', endColorstr='#403f40', GradientType=0);
background-color: #1f1f1f;
}
button:active {
position: relative;
top : 1px;
}

Loading…
Cancel
Save