From ccdbbf3f8c9756bbd8565dc719341330e6443396 Mon Sep 17 00:00:00 2001 From: ChenX Date: Tue, 13 Apr 2021 13:45:33 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E5=8F=91:=E6=A0=BC=E5=BC=8F=E5=8C=96?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- __test__/Polyline/Intersect.test.ts | 1 - __test__/Polyline/PolylineBulge.test.ts | 36 +- src/Add-on/twoD2threeD/Modals/Curve2Rec.less | 4 +- src/Add-on/twoD2threeD/Modals/Rec2Br.less | 12 +- .../Components/MainContent/MainContent.less | 320 +++++------ .../Modal/ModalStyle/ArrayModal.less | 70 ++- .../Modal/ModalStyle/BoardFind.less | 72 +-- .../Modal/ModalStyle/BoardModal.less | 42 +- .../Modal/ModalStyle/BoardProcessModal.less | 2 +- .../Modal/ModalStyle/CommandModal.less | 123 +++-- .../Components/Modal/ModalStyle/Config.less | 6 +- .../Modal/ModalStyle/DoorModal.less | 152 +++--- .../Modal/ModalStyle/EntityModal.less | 84 +-- .../Modal/ModalStyle/FrameManage.less | 6 +- .../Modal/ModalStyle/LightModal.less | 54 +- .../Modal/ModalStyle/LookOverBoardInfos.less | 62 +-- src/UI/Components/Modal/ModalStyle/Modal.less | 92 ++-- .../Modal/ModalStyle/OptionModal.less | 18 +- .../Components/Modal/ModalStyle/Recycle.less | 18 +- .../ModalStyle/ReferenceCuttingModal.less | 13 +- .../Components/Modal/ModalStyle/SaveAs.less | 10 +- .../Modal/ModalStyle/SmoothEdge.less | 2 +- .../Modal/ModalStyle/SnapModal.less | 56 +- .../Modal/ModalStyle/UpdateBoardInfo.less | 40 +- .../Components/Modal/ModalStyle/WineRack.less | 22 +- src/UI/Components/RightPanel/BoardProps.less | 136 +++-- src/UI/Components/RightPanel/Modeling.less | 92 ++-- src/UI/Components/RightPanel/RightPanel.less | 130 ++--- .../Components/RightPanel/TemplateParam.less | 146 +++--- .../Components/SourceManage/TexturePanel.less | 260 ++++----- src/UI/Components/Template/Template.less | 228 ++++---- src/UI/Components/Template/Topline.less | 12 +- .../Components/ToolBar/PropertiesPanel.less | 195 ++++--- src/UI/Css/ProcessingGroupModal.less | 64 +-- src/UI/Css/batchCurtailModal.less | 65 ++- src/UI/Css/blue.less | 92 ++-- src/UI/Css/common.less | 32 +- src/UI/Css/dataList.less | 111 ++-- src/UI/Css/golden.less | 333 ++++++------ src/UI/Css/rotateLyModal.less | 53 +- src/UI/Css/style.less | 496 ++++++++++-------- src/UI/Css/switchTheme.less | 71 +-- src/UI/Css/test.less | 134 ++--- src/UI/MaterialEditor/Material.less | 94 ++-- 44 files changed, 2150 insertions(+), 1911 deletions(-) diff --git a/__test__/Polyline/Intersect.test.ts b/__test__/Polyline/Intersect.test.ts index 42bd5cc19..507a1ecf0 100644 --- a/__test__/Polyline/Intersect.test.ts +++ b/__test__/Polyline/Intersect.test.ts @@ -115,4 +115,3 @@ describe("相交", () => expect(pts7.length).toBe(1); }); }); - diff --git a/__test__/Polyline/PolylineBulge.test.ts b/__test__/Polyline/PolylineBulge.test.ts index d929b0c21..14b415077 100644 --- a/__test__/Polyline/PolylineBulge.test.ts +++ b/__test__/Polyline/PolylineBulge.test.ts @@ -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(); - }) -}) - - + }); +}); diff --git a/src/Add-on/twoD2threeD/Modals/Curve2Rec.less b/src/Add-on/twoD2threeD/Modals/Curve2Rec.less index e27aeb3bc..1aee8969a 100644 --- a/src/Add-on/twoD2threeD/Modals/Curve2Rec.less +++ b/src/Add-on/twoD2threeD/Modals/Curve2Rec.less @@ -1,6 +1,6 @@ .curve2rec { .bp3-input { - width: 100px; + width : 100px; height: 25px; } @@ -28,7 +28,7 @@ width: 100px !important; >input { - width: inherit !important; + width : inherit !important; height: inherit !important; } } diff --git a/src/Add-on/twoD2threeD/Modals/Rec2Br.less b/src/Add-on/twoD2threeD/Modals/Rec2Br.less index 52e7369a9..7ff1c89c1 100644 --- a/src/Add-on/twoD2threeD/Modals/Rec2Br.less +++ b/src/Add-on/twoD2threeD/Modals/Rec2Br.less @@ -40,7 +40,7 @@ } >label { - height: @noteInputHeight; + height : @noteInputHeight; line-height: @noteInputHeight; } } @@ -48,12 +48,12 @@ } .boardModel { - display: inline-block; - width: 35px; - height: 50px; - border: 1px solid #000; + display : inline-block; + width : 35px; + height : 50px; + border : 1px solid #000; vertical-align: middle; - margin: 10px; + margin : 10px; } } diff --git a/src/UI/Components/MainContent/MainContent.less b/src/UI/Components/MainContent/MainContent.less index 25ca7e8ef..bc86bed64 100644 --- a/src/UI/Components/MainContent/MainContent.less +++ b/src/UI/Components/MainContent/MainContent.less @@ -12,66 +12,66 @@ } &>div { - position: fixed; - top: 0; - left: 0; - width: 100%; - height: 100%; - padding: 0; + position : fixed; + top : 0; + left : 0; + width : 100%; + height : 100%; + padding : 0; background-size: cover; } .login { - position: absolute; - left: 0; - right: 0; - top: 0; - bottom: 0; - width: 997px; - height: 482px; - margin: auto; - padding: 0; + position : absolute; + left : 0; + right : 0; + top : 0; + bottom : 0; + width : 997px; + height : 482px; + margin : auto; + padding : 0; box-shadow: none; - display: flex; + display : flex; &>div:first-child { - width: 552px; - opacity: 0.9; - position: relative; + width : 552px; + opacity : 0.9; + position : relative; border-radius: 20px 0 0 20px; button { - position: absolute; - right: 10%; - bottom: 8%; - background: linear-gradient(to right, rgb(102, 142, 180), rgb(65, 112, 180)); - box-shadow: none; - width: 100px; + position : absolute; + right : 10%; + bottom : 8%; + background : linear-gradient(to right, rgb(102, 142, 180), rgb(65, 112, 180)); + box-shadow : none; + width : 100px; border-radius: 16px; } } &>div:last-child { - padding: 20px; - background: #fff; - width: 445px; + padding : 20px; + background : #fff; + width : 445px; border-radius: 0 20px 20px 0; - position: relative; + position : relative; h2 { - margin-top: 70px; - text-align: center; - font-size: 22px; + margin-top : 70px; + text-align : center; + font-size : 22px; font-weight: 520; - color: #000; - height: 60px; + color : #000; + height : 60px; line-height: 60px; img { - width: 60px; - height: auto; + width : 60px; + height : auto; vertical-align: middle; - margin-right: 10px; + margin-right : 10px; } span:last-child { @@ -99,10 +99,10 @@ } input { - background: #fff; - color: #000; + background : #fff; + color : #000; line-height: 40px; - height: 40px; + height : 40px; } } @@ -110,22 +110,22 @@ padding: 0 40px; button { - height: 40px; + height : 40px; background: linear-gradient(to right, rgb(110, 177, 255), rgb(11, 97, 255)); } } &>div:nth-child(4) { //暂时隐藏其他登录方式 待改 - display: none; - padding: 0 40px; - margin-top: 20px; + display : none; + padding : 0 40px; + margin-top : 20px; // display: flex; - color: @color1; + color : @color1; align-items: center; .line { - width: 30%; + width : 30%; height: 0; border: 1px solid @color1; } @@ -133,42 +133,42 @@ &>div:nth-child(5) { //暂时隐藏其他登录方式 待改 - display: none; + display : none; margin-top: 20px; text-align: center; a { - display: inline-block; - width: 50px; - height: 50px; + display : inline-block; + width : 50px; + height : 50px; margin-right: 20px; img { - width: 100%; + width : 100%; height: 100%; } } } &>div:nth-child(6) { - padding: 0 40px; + padding : 0 40px; margin-top: 20px; a { font-size: 14px; - color: @color2; + color : @color2; } - display: flex; + display : flex; justify-content: space-between; } &>div:nth-child(7) { - position: absolute; - width: 100%; + position : absolute; + width : 100%; text-align: center; - bottom: 0; - left: 0; + bottom : 0; + left : 0; a { color: #106ba3; @@ -178,43 +178,43 @@ } .regist { - overflow: auto; - min-width: 600px; - width: 620px; - height: 100%; - margin: 0 auto; + overflow : auto; + min-width : 600px; + width : 620px; + height : 100%; + margin : 0 auto; letter-spacing: 2.5px; .regist-content { - position: relative; + position : relative; background: #fff; - padding: 10px; - top: 38%; - transform: translateY(-30%); + padding : 10px; + top : 38%; + transform : translateY(-30%); .regist-header { background: #48aff0; - display: flex; - height: 72px; - position: relative; + display : flex; + height : 72px; + position : relative; img { - position: absolute; - top: 12%; - width: 55px; - height: auto; + position : absolute; + top : 12%; + width : 55px; + height : auto; vertical-align: middle; - margin-right: 10px; - margin-left: 65px; + margin-right : 10px; + margin-left : 65px; } .regist-slogan { text-align: center; - width: 100%; + width : 100%; span { - color: #fff; - font-size: 26px; + color : #fff; + font-size : 26px; line-height: 72px; } } @@ -222,25 +222,25 @@ .regist-title { text-align: center; - height: 48px; + height : 48px; span { - color: #48aff0; - font-size: x-large; + color : #48aff0; + font-size : x-large; line-height: 48px; } } .info-block { - width: 70%; - margin: 10px auto; - padding: 5px 20px; + width : 70%; + margin : 10px auto; + padding : 5px 20px; min-width: 480px; >div { - width: 60%; + width : 60%; min-width: 330px; - margin: 0 auto; + margin : 0 auto; } .item { @@ -269,66 +269,66 @@ .center { justify-content: center; - margin-top: 10px; + margin-top : 10px; } a { text-decoration: none; - color: #48aff0; + color : #48aff0; } .bp3-button { background: #48aff0; - color: #fff; + color : #fff; } .bp3-disabled { background: #D1D1D1; - color: #9BA4AC; + color : #9BA4AC; } } .content { - position: absolute; - left: 0; - right: 0; - top: 0; - bottom: 0; - width: 1218px; + position : absolute; + left : 0; + right : 0; + top : 0; + bottom : 0; + width : 1218px; // height: 589px; - height: 660px; - margin: auto; - padding: 0; - box-shadow: none; - display: flex; + height : 660px; + margin : auto; + padding : 0; + box-shadow : none; + display : flex; border-radius: 20px; &>div:first-child { - width: 30%; - background: linear-gradient(to top, rgb(155, 185, 236), rgb(221, 235, 252)); + width : 30%; + background : linear-gradient(to top, rgb(155, 185, 236), rgb(221, 235, 252)); border-radius: 10px 0 0 10px; - padding: 30px; - position: relative; - font-family: Source Han Sans CN, Arial, Helvetica, sans-serif; + padding : 30px; + position : relative; + font-family : Source Han Sans CN, Arial, Helvetica, sans-serif; h2 { - text-align: center; - font-size: 31px; + text-align : center; + font-size : 31px; font-weight: 600; img { - width: 60px; - height: auto; + width : 60px; + height : auto; vertical-align: middle; - margin-right: 4px; + margin-right : 4px; } } p { - font-size: 16px; - font-weight: 550; - text-align: center; - color: #000; + font-size : 16px; + font-weight : 550; + text-align : center; + color : #000; letter-spacing: 3px; } @@ -356,70 +356,70 @@ padding-left: 30px; li { - display: flex; - font-size: 15px; + display : flex; + font-size : 15px; padding-bottom: 5px; } } &>div:last-child { - width: 80%; + width : 80%; text-align: center; - position: absolute; - bottom: 5%; + position : absolute; + bottom : 5%; button { - width: 115px; + width : 115px; border-radius: 15px; - background: linear-gradient(to right, rgb(100, 169, 255), rgb(24, 107, 255)); + background : linear-gradient(to right, rgb(100, 169, 255), rgb(24, 107, 255)); } } } &>div:last-child { border-radius: 0 10px 10px 0; - width: 70%; - background: #fff; - padding: 30px; - position: relative; + width : 70%; + background : #fff; + padding : 30px; + position : relative; &>button:first-child { position: absolute; - right: 0; - top: 0; + right : 0; + top : 0; } .carousel { // width: 620px; // height: 200px; - width: 100%; - margin: 30px auto; + width : 100%; + margin : 30px auto; position: relative; overflow: hidden; &>div>div { - position: absolute; - top: 0; - width: 100%; - height: 100%; + position : absolute; + top : 0; + width : 100%; + height : 100%; transition: all 0.5s; - cursor: pointer; + cursor : pointer; } &>ul { - display: flex; - height: 10px; - position: absolute; - bottom: 10px; - width: 100%; + display : flex; + height : 10px; + position : absolute; + bottom : 10px; + width : 100%; justify-content: center; li { - width: 40px; - background: #fff; + width : 40px; + background : #fff; margin-right: 10px; - cursor: pointer; + cursor : pointer; } li.active { @@ -428,20 +428,20 @@ } .show_phone { - position: absolute; - bottom: 5px; - right: 5px; - font-size: 17px; + position : absolute; + bottom : 5px; + right : 5px; + font-size : 17px; background: #fff; } .show_text { - position: absolute; - left: 5px; - top: 5px; - font-size: 20px; + position : absolute; + left : 5px; + top : 5px; + font-size : 20px; font-weight: bold; - background: #fff; + background : #fff; } } @@ -453,22 +453,22 @@ display: flex; &>div { - cursor: pointer; - width: 20%; + cursor : pointer; + width : 20%; margin-right: 5%; } } &>div:last-child { - width: 90%; + width : 90%; text-align: center; - position: absolute; - bottom: 30px; + position : absolute; + bottom : 30px; button { - width: 115px; + width : 115px; border-radius: 15px; - background: linear-gradient(to right, rgb(100, 169, 255), rgb(24, 107, 255)); + background : linear-gradient(to right, rgb(100, 169, 255), rgb(24, 107, 255)); } } } diff --git a/src/UI/Components/Modal/ModalStyle/ArrayModal.less b/src/UI/Components/Modal/ModalStyle/ArrayModal.less index e9378a186..5716ac782 100644 --- a/src/UI/Components/Modal/ModalStyle/ArrayModal.less +++ b/src/UI/Components/Modal/ModalStyle/ArrayModal.less @@ -1,52 +1,64 @@ - -#arrayModal .bp3-dialog{ +#arrayModal .bp3-dialog { font-size: 16px; } -#arrayModal .bp3-tab-panel{ + +#arrayModal .bp3-tab-panel { margin-top: 0; } -#arrayModal .array-type{ + +#arrayModal .array-type { align-items: center; - height: 30px; - &>span{ + height : 30px; + + &>span { width: 6rem; } } -#arrayModal .flexWrap{ - display: flex; + +#arrayModal .flexWrap { + display : flex; flex-wrap: wrap; - width: unset; - &>div - { - width: unset; - line-height: 30px; + width : unset; + + &>div { + width : unset; + line-height: 30px; } } -#arrayModal .flexWrap>div .bp3-input,#modal .small-input input{ - padding:0px 8px; + +#arrayModal .flexWrap>div .bp3-input, +#modal .small-input input { + padding: 0px 8px; } -#modal .ar-set>span:first-child{ - display: inline-block; - width: 2rem; + +#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-body { + margin: 2px 10px; } -#arrayModal .bp3-dialog>.bp3-dialog-footer{ + +#arrayModal .bp3-dialog>.bp3-dialog-footer { justify-content: flex-end; - padding: 0px 10px 10px 10px; - button{ + padding : 0px 10px 10px 10px; + + button { min-height: 20px; } } -#arrayModal .bp3-dialog>.bp3-dialog-body>div{ - margin:5px 0; + +#arrayModal .bp3-dialog>.bp3-dialog-body>div { + margin: 5px 0; } -#arrayModal .array-tab .arrayMethod-value{ - margin-top: 5px; - padding: 0 5px; - &>div>span{ + +#arrayModal .array-tab .arrayMethod-value { + margin-top: 5px; + padding : 0 5px; + + &>div>span { width: 8rem; } } diff --git a/src/UI/Components/Modal/ModalStyle/BoardFind.less b/src/UI/Components/Modal/ModalStyle/BoardFind.less index 31c7510c5..3cbd74c1c 100644 --- a/src/UI/Components/Modal/ModalStyle/BoardFind.less +++ b/src/UI/Components/Modal/ModalStyle/BoardFind.less @@ -1,12 +1,12 @@ #modal .br-find { @selectWidth: 50px; - @width: 70px; - @inputWidth: 75px; + @width : 70px; + @inputWidth : 75px; @buttonWidth: 90px; .bp3-dialog-body { &>div:first-child { - width: 390px; + width : 390px; padding-right: 10px; } @@ -15,31 +15,31 @@ } .br-find-item { - display: flex; - align-items: center; + display : flex; + align-items : center; margin-bottom: 5px; &>label { - width: 100px; + width : 100px; margin: 0; } &>input, &>div { margin: 0 5px; - width: 20%; + width : 20%; } &>.bp3-html-select:nth-child(2) { - width: @selectWidth; + width : @selectWidth; margin: 0 5px; } &>button { - height: 20px; + height : 20px; line-height: 20px; - min-height: 20px; - padding: 0 10px; + min-height : 20px; + padding : 0 10px; } } @@ -57,31 +57,31 @@ } &>.select-name { - flex: 1; - display: flex; + flex : 1; + display : flex; justify-content: space-between; - margin: 0; + margin : 0; &>span { height: 20px; - width: 40px; + width : 40px; } &>button, & .bp3-popover-target>button { - width: 40px; + width : 40px; white-space: nowrap; - height: 20px; + height : 20px; line-height: 20px; - min-height: 20px; - padding: 0 10px; + min-height : 20px; + padding : 0 10px; } & .bp3-popover-content input { display: block; - width: 100%; - height: 30px; - margin: 10px 0; + width : 100%; + height : 30px; + margin : 10px 0; } } } @@ -91,8 +91,8 @@ .search-shop { position: absolute; - right: 0; - top: 10px; + right : 0; + top : 10px; input { width: 100%; @@ -105,22 +105,22 @@ &>label { margin: 0; - width: @width; + width : @width; } &>span { padding-left: 26px; - width: @width; + width : @width; } &>input { - width: @inputWidth; + width : @inputWidth; margin: 0 5px; } &>.bp3-html-select { - width: @selectWidth; - margin-left: 5px; + width : @selectWidth; + margin-left : 5px; margin-right: 5px; } } @@ -133,11 +133,11 @@ } .select-ent { - display: flex; + display : flex; flex-wrap: wrap; &>label { - width: 20%; + width : 20%; margin: 0; } } @@ -154,7 +154,7 @@ } &>div:last-child { - flex: 1; + flex : 1; margin-left: 10px; } } @@ -166,8 +166,8 @@ &>div label { margin-right: 0; - margin-left: 10px; - position: relative; + margin-left : 10px; + position : relative; } &>div:first-child, @@ -180,8 +180,8 @@ &>div>input, &>div>div>input { - width: 30px; - padding: 0 2px; + width : 30px; + padding : 0 2px; margin-right: 5px; } diff --git a/src/UI/Components/Modal/ModalStyle/BoardModal.less b/src/UI/Components/Modal/ModalStyle/BoardModal.less index 0e14e7572..102a94cd0 100644 --- a/src/UI/Components/Modal/ModalStyle/BoardModal.less +++ b/src/UI/Components/Modal/ModalStyle/BoardModal.less @@ -41,18 +41,18 @@ /* 板件模型设置 */ #commonModal .boardModel { - display: inline-block; - width: 35px; - height: 50px; - border: 1px solid #000; + display : inline-block; + width : 35px; + height : 50px; + border : 1px solid #000; vertical-align: middle; - margin: 10px; + margin : 10px; } #commonModal .boardSize .bp3-label, #commonModal .behind-board .board-info .boardSize .bp3-input { display: inline-block; - margin: 0 5px; + margin : 0 5px; } #commonModal { @@ -74,10 +74,10 @@ } #commonModal .boardSize .bp3-label>.bp3-input { - display: block; - padding: 0; + display : block; + padding : 0; padding-left: 5px; - line-height: 15px; + line-height : 15px; } #commonModal .input-select>input, @@ -113,7 +113,7 @@ } #commonModal .hole>label { - display: inline-block; + display : inline-block; margin-right: 1rem; } @@ -127,7 +127,7 @@ } #commonModal .notes>div>label { - height: @noteInputHeight; + height : @noteInputHeight; line-height: @noteInputHeight; } @@ -148,7 +148,7 @@ //选择材质 #commonModal .bp3-dialog-body .board-info { .br-mat { - position: relative; + position : relative; margin-bottom: 0.5rem; // justify-content: space-between; @@ -162,8 +162,8 @@ .search-shop { position: absolute; - right: 0; - top: 20px; + right : 0; + top : 20px; input { width: 100%; @@ -191,17 +191,17 @@ } #commonModal .edge-sealing span>button { - height: 14px; - font-size: 7px; - width: 6rem; - padding-top: 0px; + height : 14px; + font-size : 7px; + width : 6rem; + padding-top : 0px; padding-bottom: 0px; - min-height: 14px; + min-height : 14px; } #commonModal .edge-sealing { - display: flex; - margin-top: 10px; + display : flex; + margin-top : 10px; align-items: center; ul { diff --git a/src/UI/Components/Modal/ModalStyle/BoardProcessModal.less b/src/UI/Components/Modal/ModalStyle/BoardProcessModal.less index 817b0dee4..fa846127d 100644 --- a/src/UI/Components/Modal/ModalStyle/BoardProcessModal.less +++ b/src/UI/Components/Modal/ModalStyle/BoardProcessModal.less @@ -7,6 +7,6 @@ span.bp3-tag.br-process-modal-alert-tags { } .bp3-alert-footer { - flex-direction: row !important; + flex-direction : row !important; justify-content: flex-end !important; } diff --git a/src/UI/Components/Modal/ModalStyle/CommandModal.less b/src/UI/Components/Modal/ModalStyle/CommandModal.less index bcc1140fc..4b92367e7 100644 --- a/src/UI/Components/Modal/ModalStyle/CommandModal.less +++ b/src/UI/Components/Modal/ModalStyle/CommandModal.less @@ -1,82 +1,97 @@ -#commandPanel -{ - .bp3-input{ - margin: 10px; +#commandPanel { + .bp3-input { + margin : 10px; font-size: initial; } - .bp3-dialog{ + + .bp3-dialog { margin-bottom: 0; - >div >.bp3-input{ + + >div>.bp3-input { border-radius: unset; - width:-webkit-fill-available; + width : -webkit-fill-available; } - .bp3-dialog-body{ - display: flex; - width: 50vw; + + .bp3-dialog-body { + display : flex; + width : 50vw; min-width: 651px; - .bp3-tabs{ - min-width: 86px; + + .bp3-tabs { + min-width : 86px; justify-content: center; - > .bp3-tab-list - { - text-align: center; + + >.bp3-tab-list { + text-align : center; margin-left: 10px; } } - .bp3-card{ - width: 100%; - height: 55vh; + + .bp3-card { + width : 100%; + height : 55vh; min-height: 300px; - overflow: auto; - padding: 0 10px 10px 10px; - margin: 10px; - >ul{ - >ul>div>h1 - { - font-size: 2.5rem !important; + overflow : auto; + padding : 0 10px 10px 10px; + margin : 10px; + + >ul { + >ul>div>h1 { + font-size : 2.5rem !important; padding-left: 30px; - margin: 25px 0px; + margin : 25px 0px; } - >li,>ul>li{ - border-bottom: 1px solid #5C7080; - padding: 5px; - display: flex; - flex-direction:row; - outline: none; - align-items: center; + + >li, + >ul>li { + border-bottom : 1px solid #5C7080; + padding : 5px; + display : flex; + flex-direction : row; + outline : none; + align-items : center; justify-content: space-around; - >li{ - height: 36px; + + >li { + height : 36px; margin-right: 12px; - font-size: large; - display: flex; - align-items: center; - &:first-child{ - width:4%; + font-size : large; + display : flex; + align-items : center; + + &:first-child { + width: 4%; } - &:nth-child(2){ - width:17%; + + &:nth-child(2) { + width: 17%; } - &:nth-child(4){ - width:20%; + + &:nth-child(4) { + width: 20%; } - &:nth-child(5){ - width:10%; + + &:nth-child(5) { + width: 10%; } - >a{ + + >a { text-align: center; } - >span>span>input{ - height: 2.0rem !important; - width: 100%; + + >span>span>input { + height : 2.0rem !important; + width : 100%; border-radius: 3px; } } - >ul{ + + >ul { margin-right: 12px; - width:25%; - font-size: smaller; - >li:nth-child(2){ + width : 25%; + font-size : smaller; + + >li:nth-child(2) { color: #8A9BA8; } } diff --git a/src/UI/Components/Modal/ModalStyle/Config.less b/src/UI/Components/Modal/ModalStyle/Config.less index c7e9d6038..50fae2753 100644 --- a/src/UI/Components/Modal/ModalStyle/Config.less +++ b/src/UI/Components/Modal/ModalStyle/Config.less @@ -18,16 +18,16 @@ } .sealingList { - height: 220px; + height : 220px; overflow-x: hidden; overflow-y: auto; - padding: 2px; + padding : 2px; &>li { display: flex; &>span { - outline: 1px #ccc solid; + outline : 1px #ccc solid; text-align: center; } diff --git a/src/UI/Components/Modal/ModalStyle/DoorModal.less b/src/UI/Components/Modal/ModalStyle/DoorModal.less index 256714ff9..1dd15a6fc 100644 --- a/src/UI/Components/Modal/ModalStyle/DoorModal.less +++ b/src/UI/Components/Modal/ModalStyle/DoorModal.less @@ -36,26 +36,26 @@ } .pre-canvas { - position: relative; - margin: 4rem auto 0 auto; - width: 350px; - height: 350px; - max-height: 500px; - display: flex; + position : relative; + margin : 4rem auto 0 auto; + width : 350px; + height : 350px; + max-height : 500px; + display : flex; justify-content: flex-start; - align-content: flex-end; - flex-wrap: wrap; - background: #fff; - text-align: center; - color: #000; - font-weight: 500; - background: #5c5c5c; + align-content : flex-end; + flex-wrap : wrap; + background : #fff; + text-align : center; + color : #000; + font-weight : 500; + background : #5c5c5c; &>ul { - position: absolute; - top: -20px; - left: 0; - display: flex; + position : absolute; + top : -20px; + left : 0; + display : flex; text-align: center; &>li:nth-child(n+2) { @@ -87,27 +87,27 @@ } .pre-item { - outline: none; + outline : none; position: relative; &>span.opendir { - position: absolute; + position : absolute; font-size: 16px; - left: 0; - right: 0; - top: 0; - bottom: 0; - margin: auto; - width: 20px; - height: 16px; + left : 0; + right : 0; + top : 0; + bottom : 0; + margin : auto; + width : 20px; + height : 16px; } } .pre-set { - padding: 20px 10px; - outline: none; - display: flex; + padding : 20px 10px; + outline : none; + display : flex; justify-content: space-between; &>div:first-child { @@ -116,24 +116,24 @@ } .bp3-input-action { - top: -4px; + top : -4px; right: 0; svg { - width: 14px; + width : 14px; height: 14px; } } .row-input { width: 80%; - left: 10%; - top: -25px; + left : 10%; + top : -25px; .bp3-input-action .bp3-checkbox { position: absolute; - top: 6px; - left: 32px; + top : 6px; + left : 32px; } input { @@ -142,24 +142,24 @@ } .col-input { - position: absolute; - top: -8px; - text-align: left; + position : absolute; + top : -8px; + text-align : left; transform-origin: 0% 100%; - transform: rotateZ(90deg) translateY(18px); + transform : rotateZ(90deg) translateY(18px); .bp3-input-action .bp3-checkbox { position: absolute; - top: 6px; + top : 6px; } } .col-span { - position: absolute; - top: calc(~'50% - 28px'); - left: 0; + position : absolute; + top : calc(~'50% - 28px'); + left : 0; transform-origin: 0% 100%; - transform: rotateZ(90deg); + transform : rotateZ(90deg); } @@ -170,21 +170,21 @@ .row-check { position: absolute; - right: -20px; - top: -20px; - padding: 0; + right : -20px; + top : -20px; + padding : 0; } .col-check { position: absolute; - left: 8px; - bottom: -20px; - padding: 0; + left : 8px; + bottom : -20px; + padding : 0; } .row-check-new { padding: 0; - width: 18px; + width : 18px; .bp3-control-indicator { margin-left: 0; @@ -193,21 +193,21 @@ .col-list { transform-origin: 0 100%; - top: -18px; - transform: rotateZ(90deg) translateY(18px); - justify-content: flex-end; - left: 0; + top : -18px; + transform : rotateZ(90deg) translateY(18px); + justify-content : flex-end; + left : 0; } .bp3-html-select { position: absolute; - top: 0; - bottom: 0; - left: 15px; - right: 0; - margin: auto; - width: 80%; - height: 18px; + top : 0; + bottom : 0; + left : 15px; + right : 0; + margin : auto; + width : 80%; + height : 18px; .bp3-icon { top: 3px; @@ -215,12 +215,12 @@ } .temp-name { - list-style: none; - position: absolute; - left: 30%; - top: 30px; - padding: 0; - margin: 0; + list-style : none; + position : absolute; + left : 30%; + top : 30px; + padding : 0; + margin : 0; white-space: nowrap; } @@ -242,7 +242,7 @@ } .tb-offset { - position: relative; + position : relative; align-items: center; &>span { @@ -258,17 +258,17 @@ @height: 20px; .lkbtn { - min-height: @height; - height: @height; + min-height : @height; + height : @height; line-height: @height; - padding: 0; + padding : 0; } .slk, .xlk { position: absolute; - left: 47px; - top: 20px; + left : 47px; + top : 20px; } } } @@ -277,8 +277,8 @@ width: 550px; .bp3-input { - width: 50px; - height: 20px; + width : 50px; + height : 20px; line-height: 20px; } } diff --git a/src/UI/Components/Modal/ModalStyle/EntityModal.less b/src/UI/Components/Modal/ModalStyle/EntityModal.less index 2582c205a..12ef5686d 100644 --- a/src/UI/Components/Modal/ModalStyle/EntityModal.less +++ b/src/UI/Components/Modal/ModalStyle/EntityModal.less @@ -1,66 +1,82 @@ -@darkhovercolor:#5C7080; +@darkhovercolor: #5C7080; -#entityModal{ +#entityModal { min-width: 200px; - select,button,label{ + + select, + button, + label { line-height: @inputHeight; - height: @inputHeight; - min-height: @inputHeight; + height : @inputHeight; + min-height : @inputHeight; } - .bp3-button{ + + .bp3-button { padding: 0 10px; - width: 100%; + width : 100%; } - .bp3-html-select{ + + .bp3-html-select { width: 100%; } - .props{ - width: 100%; + + .props { + width : 100%; margin-top: 5px; - &>li>ul>li{ + + &>li>ul>li { position: relative; - ul{ - position: absolute; - top: @inputHeight; + + ul { + position : absolute; + top : @inputHeight; transition: all 0.3s; } } } - .props-color{ - display: flex; + + .props-color { + display : flex; justify-content: space-between; - border: 1px ridge transparent; + border : 1px ridge transparent; } - .props-color:hover{ - border: 1px ridge @darkHeaderColor; + + .props-color:hover { + border: 1px ridge @darkHeaderColor; } - .props-color-list{ + + .props-color-list { margin-top: 5px; - outline: none; + outline : none; } - .props-color-list>li{ + + .props-color-list>li { padding: 5px; } - .props-color-list>li:hover{ + + .props-color-list>li:hover { background: @darkhovercolor; } - .props>li{ - display: flex; - align-items: center; + + .props>li { + display : flex; + align-items : center; justify-content: flex-start; - padding: 5px 0; + padding : 5px 0; } - .props>li>label{ + + .props>li>label { width: 20%; } - .props>li>ul{ + + .props>li>ul { width: 80%; } } -.i-color{ - display: inline-block; - height: 8px; - width: 8px; - margin-right:5px; +.i-color { + display : inline-block; + height : 8px; + width : 8px; + margin-right: 5px; } diff --git a/src/UI/Components/Modal/ModalStyle/FrameManage.less b/src/UI/Components/Modal/ModalStyle/FrameManage.less index f177e30fe..5341db236 100644 --- a/src/UI/Components/Modal/ModalStyle/FrameManage.less +++ b/src/UI/Components/Modal/ModalStyle/FrameManage.less @@ -1,6 +1,6 @@ #commonModal .frame-manage { - max-width: 900px; - width: 60vw; - height: 80vh; + max-width : 900px; + width : 60vw; + height : 80vh; min-height: 760px; } diff --git a/src/UI/Components/Modal/ModalStyle/LightModal.less b/src/UI/Components/Modal/ModalStyle/LightModal.less index e951d7674..41db24589 100644 --- a/src/UI/Components/Modal/ModalStyle/LightModal.less +++ b/src/UI/Components/Modal/ModalStyle/LightModal.less @@ -1,41 +1,49 @@ -#lightModal .bp3-dialog{ +#lightModal .bp3-dialog { font-size: 16px; } -#lightModal .bp3-dialog-body>.twoCol>label{ - display: inline-block; + +#lightModal .bp3-dialog-body>.twoCol>label { + display : inline-block; vertical-align: super; - text-align: left; - margin-right: 10px; - width: 30%; + text-align : left; + margin-right : 10px; + width : 30%; } -#lightModal .bp3-dialog-body ul>.twoCol>label{ - display: inline-block; + +#lightModal .bp3-dialog-body ul>.twoCol>label { + display : inline-block; vertical-align: super; - text-align: left; - margin-right: 10px; + text-align : left; + margin-right : 10px; } -#lightModal .bp3-dialog-body>.twoCol>input{ + +#lightModal .bp3-dialog-body>.twoCol>input { vertical-align: super; - width: 70%; + width : 70%; } -#lightModal .bp3-dialog-body>.twoCol ul input{ + +#lightModal .bp3-dialog-body>.twoCol ul input { width: 80%; } -#lightModal .bp3-dialog-body>.twoCol{ - width: 14rem; + +#lightModal .bp3-dialog-body>.twoCol { + width : 14rem; display: flex; } -#lightModal .bp3-dialog-body .twoCol{ + +#lightModal .bp3-dialog-body .twoCol { display: flex; } -#lightModal ul{ - display: inline-block; - list-style: none; - padding-left: 0; + +#lightModal ul { + display : inline-block; + list-style : none; + padding-left : 0; vertical-align: top; - width: 70%; - margin: 0; + width : 70%; + margin : 0; } -#lightModal li{ + +#lightModal li { display: inline-block; } diff --git a/src/UI/Components/Modal/ModalStyle/LookOverBoardInfos.less b/src/UI/Components/Modal/ModalStyle/LookOverBoardInfos.less index 4212cdcaa..120892533 100644 --- a/src/UI/Components/Modal/ModalStyle/LookOverBoardInfos.less +++ b/src/UI/Components/Modal/ModalStyle/LookOverBoardInfos.less @@ -1,6 +1,6 @@ #modal .br-lookover { height: 100%; - width: 100%; + width : 100%; .bp3-dialog-body { flex-direction: column; @@ -17,14 +17,14 @@ } .bp3-dialog-footer { - display: flex; + display : flex; flex-wrap: wrap; } .bp3-dialog-footer-actions { - display: flex; + display : flex; flex-wrap: nowrap; - width: 100%; + width : 100%; .bp3-label { margin-right: 20px; @@ -47,12 +47,12 @@ overflow: auto; .bp3-card { - width: 100%; - overflow: hidden; - padding-top: 5px; - height: 100%; - padding-right: 0px; - padding-left: 0px; + width : 100%; + overflow : hidden; + padding-top : 5px; + height : 100%; + padding-right : 0px; + padding-left : 0px; padding-bottom: 0px; .react-draggable { @@ -66,14 +66,14 @@ .bbs-list, .bbs-list * { - margin: 0 auto; - padding: 0; + margin : 0 auto; + padding : 0; font-size: 14px; } .bbs-list { // display: table; - width: 100%; + width : 100%; border-collapse: collapse; } @@ -82,31 +82,31 @@ padding-left: 5px; >span { - width: 25px; + width : 25px; text-align: center; } - display: flex; + display : flex; flex-wrap: nowrap; } .bbs-list-th { - display: table-cell; - font-weight: bold; - text-align: center; + display : table-cell; + font-weight : bold; + text-align : center; vertical-align: middle; } .bbs-list-td { - display: table-cell; - text-align: center; + display : table-cell; + text-align : center; vertical-align: middle; } .bbs-td { line-height: 22px; - height: 22px; - min-width: 62px; + height : 22px; + min-width : 62px; &:nth-child(1) { min-width: 40px; @@ -117,18 +117,18 @@ } .sort-btn { - height: 18px !important; - padding: 0 !important; + height : 18px !important; + padding : 0 !important; font-weight: bold; - width: 100%; - display: -webkit-inline-box; + width : 100%; + display : -webkit-inline-box; .bp3-button-text { margin: 0; } .bp3-icon svg { - width: 12px; + width : 12px; height: 12px; } } @@ -149,10 +149,10 @@ flex: 1; &>ul { - outline: 1px solid #ccc; + outline : 1px solid #ccc; padding-left: 5px; - overflow: auto; - height: calc(100% - 20px); + overflow : auto; + height : calc(100% - 20px); li { padding: 5px 0; @@ -160,7 +160,7 @@ li:hover { background: rgb(65, 200, 209); - color: #fff; + color : #fff; } li.enter { diff --git a/src/UI/Components/Modal/ModalStyle/Modal.less b/src/UI/Components/Modal/ModalStyle/Modal.less index f3641085b..982c0a642 100644 --- a/src/UI/Components/Modal/ModalStyle/Modal.less +++ b/src/UI/Components/Modal/ModalStyle/Modal.less @@ -1,12 +1,12 @@ -@darkBgColor: #444444; +@darkBgColor : #444444; @darkHeaderColor: #394b59; -@darkFontColor: #CCCCCC; +@darkFontColor : #CCCCCC; // 输入框高度 -@inputHeight: 1.5rem; +@inputHeight : 1.5rem; @noteInputHeight: 2.5rem; -@selectWidth: 10rem; -@inputWidth: 5rem; -@nameInput: 12rem; +@selectWidth : 10rem; +@inputWidth : 5rem; +@nameInput : 12rem; @infoSelectWidth: 9rem; .bp3-portal { @@ -14,11 +14,11 @@ } #modal { - position: fixed; - outline: none; + position : fixed; + outline : none; font-size: 8px; - left: 0; - top: 0; + left : 0; + top : 0; // overflow: hidden; //影响到DisplayConfigPanel 的ColorPick select { @@ -27,7 +27,7 @@ .modal-container { position: fixed; - outline: none; + outline : none; .bp3-dialog-container { outline: none; @@ -41,12 +41,12 @@ #modal .bp3-dialog { margin: 0; - width: 100%; + width : 100%; } #modal .dark-body { background: @darkBgColor; - color: @darkFontColor; + color : @darkFontColor; h4, h5, @@ -57,16 +57,16 @@ #modal input { font-size: 8px; - padding: 0 5px; + padding : 0 5px; } #modal h5 { - font-size: 10px; + font-size : 10px; font-weight: bold; } #modal .bp3-dialog>.behind-board>div { - margin: 10px 0; + margin : 10px 0; text-align: right; } @@ -76,13 +76,13 @@ /* 板件input样式调整 */ #modal .bp3-dialog-body .bp3-label { - line-height: @inputHeight; + line-height : @inputHeight; margin-bottom: 0.5rem; } #modal .bp3-dialog-body .bp3-label>span { display: inline-block; - width: 3.5rem; + width : 3.5rem; } #modal .bp3-dialog-body .bp3-input:not([type=search]), @@ -91,7 +91,7 @@ } #modal .boardRadio { - display: flex; + display : flex; justify-content: flex-start; } @@ -109,25 +109,25 @@ #modal .flexWrap>div, #modal .flexWrap>label { - width: 50%; + width : 50%; line-height: 15px; - display: flex; + display : flex; } #modal .flexWrap>div .bp3-input, #modal .small-input input { padding: 0 0 0 5px; - width: @inputWidth; + width : @inputWidth; } #modal .br-set { margin-bottom: 10px; - white-space: nowrap; + white-space : nowrap; } #modal .br-set>span:first-child { - display: inline-block; - width: 3.5rem; + display : inline-block; + width : 3.5rem; white-space: nowrap; } @@ -138,12 +138,12 @@ // 配置信息 #modal .bp3-dialog-footer { - margin: 0; - padding: 10px 20px; - border-radius: 0 0 6px 6px; - display: flex; + margin : 0; + padding : 10px 20px; + border-radius : 0 0 6px 6px; + display : flex; justify-content: space-between; - align-items: center; + align-items : center; } #modal .bp3-dialog-footer .bp3-label { @@ -156,19 +156,19 @@ #modal .bp3-dialog-footer .cf-select { vertical-align: bottom; - display: inline-block; + display : inline-block; } #modal .input-select { - display: inline-block; - width: @selectWidth; + display : inline-block; + width : @selectWidth; vertical-align: bottom; } //select高度改变,调整切换符号位置 #modal .bp3-html-select .bp3-icon { right: 1px; - top: 2.5px; + top : 2.5px; } .input-select { @@ -176,39 +176,39 @@ } #modal .newDir>label { - display: flex; + display : flex; align-items: center; input { - width: 100px; + width : 100px; height: 30px !important; } } #modal .max { height: 100vh !important; - width: 100vw !important; - left: 0 !important; - top: 0 !important; + width : 100vw !important; + left : 0 !important; + top : 0 !important; &>div { - max-width: unset !important; + max-width : unset !important; max-height: unset !important; - min-width: unset !important; + min-width : unset !important; min-height: unset !important; - width: 100% !important; - height: 100% !important; + width : 100% !important; + height : 100% !important; &>div { min-height: unset; - height: 100%; + height : 100%; } } } #modal #optionModal .kjl-config { &>label { - width: 50%; + width : 50%; display: flex; &>span:first-child { @@ -220,7 +220,7 @@ width: 70%; input { - width: 100%; + width : 100%; margin: 0; } } diff --git a/src/UI/Components/Modal/ModalStyle/OptionModal.less b/src/UI/Components/Modal/ModalStyle/OptionModal.less index 7a6fd39de..722e64f9e 100644 --- a/src/UI/Components/Modal/ModalStyle/OptionModal.less +++ b/src/UI/Components/Modal/ModalStyle/OptionModal.less @@ -1,34 +1,34 @@ #optionModal { - min-width: 350px; + min-width : 350px; min-height: 360px; } #optionModal .bp3-dialog { position: absolute; - height: 100%; + height : 100%; } #optionModal .bp3-dialog-body { - display: flex; + display : flex; flex-direction: column; - padding: 10px; - overflow: hidden; + padding : 10px; + overflow : hidden; &>.bp3-card { padding: 10px; } &>.bp3-tabs { - flex: 1 1 auto; + flex : 1 1 auto; overflow: hidden; .bp3-tab-panel { - margin: 0; + margin : 0; padding: 1px; - height: 85%; + height : 85%; &>.bp3-card { - height: 100%; + height : 100%; overflow: auto; } } diff --git a/src/UI/Components/Modal/ModalStyle/Recycle.less b/src/UI/Components/Modal/ModalStyle/Recycle.less index 23fe72073..2dc15ab9a 100644 --- a/src/UI/Components/Modal/ModalStyle/Recycle.less +++ b/src/UI/Components/Modal/ModalStyle/Recycle.less @@ -1,17 +1,17 @@ #commonModal .recycle { - width: 800px; - height: 680px; + width : 800px; + height : 680px; overflow: hidden; ul.file-list { - display: flex; - flex-wrap: wrap; + display : flex; + flex-wrap : wrap; list-style: none; - padding: 0 10px; + padding : 0 10px; li { - padding: 5px; - width: 20%; + padding : 5px; + width : 20%; text-align: center; img { @@ -24,8 +24,8 @@ li.selected { background-color: #7ecef1; - color: #000; - outline: 1px solid #15abeb; + color : #000; + outline : 1px solid #15abeb; } } diff --git a/src/UI/Components/Modal/ModalStyle/ReferenceCuttingModal.less b/src/UI/Components/Modal/ModalStyle/ReferenceCuttingModal.less index fac63a22e..6aca691d4 100644 --- a/src/UI/Components/Modal/ModalStyle/ReferenceCuttingModal.less +++ b/src/UI/Components/Modal/ModalStyle/ReferenceCuttingModal.less @@ -1,12 +1,13 @@ - /*---参照切割---*/ -#referenceCuttingModal .bp3-dialog>.bp3-dialog-footer{ +#referenceCuttingModal .bp3-dialog>.bp3-dialog-footer { justify-content: flex-end; - padding: 0px 10px 10px 10px; - button{ + padding : 0px 10px 10px 10px; + + button { min-height: 20px; } } -#referenceCuttingModal .bp3-dialog>.bp3-dialog-body{ - margin:10px; + +#referenceCuttingModal .bp3-dialog>.bp3-dialog-body { + margin: 10px; } diff --git a/src/UI/Components/Modal/ModalStyle/SaveAs.less b/src/UI/Components/Modal/ModalStyle/SaveAs.less index aa89df9dd..78beb6cfd 100644 --- a/src/UI/Components/Modal/ModalStyle/SaveAs.less +++ b/src/UI/Components/Modal/ModalStyle/SaveAs.less @@ -1,16 +1,16 @@ #modal .saveAs { - width: 300px; + width : 300px; padding: 5px; .saveAs-body { max-height: 600px; - overflow: auto; + overflow : auto; } .saveAs-footer { - text-align: right; - padding: 10px 0; - display: flex; + text-align : right; + padding : 10px 0; + display : flex; justify-content: space-between; } } diff --git a/src/UI/Components/Modal/ModalStyle/SmoothEdge.less b/src/UI/Components/Modal/ModalStyle/SmoothEdge.less index aa1ed0a8c..6bca30be0 100644 --- a/src/UI/Components/Modal/ModalStyle/SmoothEdge.less +++ b/src/UI/Components/Modal/ModalStyle/SmoothEdge.less @@ -9,7 +9,7 @@ } &>ul { - height: 100px; + height : 100px; overflow: auto; li { diff --git a/src/UI/Components/Modal/ModalStyle/SnapModal.less b/src/UI/Components/Modal/ModalStyle/SnapModal.less index 07e8f06bc..489e7c7f6 100644 --- a/src/UI/Components/Modal/ModalStyle/SnapModal.less +++ b/src/UI/Components/Modal/ModalStyle/SnapModal.less @@ -1,46 +1,46 @@ -#snapModal -{ +#snapModal { width: 315px; } -#snapModal .snap-set -{ + +#snapModal .snap-set { margin-bottom: 3px; - padding-left: 9px; + padding-left : 9px; } -#snapModal .bp3-dialog-body>div>div -{ - display: flex; - padding-top: 10px; + +#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; + height : 20rem; padding-bottom: 0px; - >h5{ + + >h5 { padding-top: 10px; } } -#snapModal .flexCheckbox -{ - display: flex; + +#snapModal .flexCheckbox { + display : flex; flex-direction: column; - flex-wrap: wrap; - height: 100%; -} -#snapModal .flexCheckbox button -{ - width: 70px; - min-height: 20px; - font-size: 12px; + flex-wrap : wrap; + height : 100%; +} + +#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; } diff --git a/src/UI/Components/Modal/ModalStyle/UpdateBoardInfo.less b/src/UI/Components/Modal/ModalStyle/UpdateBoardInfo.less index 204af7d0d..dd32ea63c 100644 --- a/src/UI/Components/Modal/ModalStyle/UpdateBoardInfo.less +++ b/src/UI/Components/Modal/ModalStyle/UpdateBoardInfo.less @@ -7,12 +7,12 @@ } .u-header { - width: 100%; + width : 100%; padding: 5px 10px; .inputSelect { - width: 40%; - display: inline-flex; + width : 40%; + display : inline-flex; vertical-align: middle; .selectList { @@ -20,7 +20,7 @@ } .bp3-input { - width: 100%; + width : 100%; height: 30px; } @@ -37,13 +37,13 @@ } .info-item { - display: flex; + display : flex; align-items: center; - margin: 5px 0; + margin : 5px 0; .bp3-control { margin: 0; - width: 70px; + width : 70px; } @@ -53,10 +53,10 @@ } .bp3-button { - height: 20px; - min-height: 20px; + height : 20px; + min-height : 20px; line-height: 20px; - padding: 0 10px; + padding : 0 10px; } } @@ -64,8 +64,8 @@ margin-top: 50px; .bp3-control { - margin: 0; - padding-left: 20px; + margin : 0; + padding-left : 20px; vertical-align: bottom; } @@ -84,7 +84,7 @@ .mat-color { margin-bottom: 10px; - position: relative; + position : relative; &>div:first-child { flex: 1; @@ -95,7 +95,7 @@ &>span { padding-left: 27px; - width: 70px; + width : 70px; } input { @@ -108,17 +108,17 @@ } button { - width: 40px; - height: 54px; - padding: 0; + width : 40px; + height : 54px; + padding : 0; text-align: center; } .search-shop { position: absolute; - left: 0; - top: 0; - right: auto; + left : 0; + top : 0; + right : auto; input { width: 100%; diff --git a/src/UI/Components/Modal/ModalStyle/WineRack.less b/src/UI/Components/Modal/ModalStyle/WineRack.less index 4c2746dbc..7155e60fe 100644 --- a/src/UI/Components/Modal/ModalStyle/WineRack.less +++ b/src/UI/Components/Modal/ModalStyle/WineRack.less @@ -1,20 +1,24 @@ -#modal .winerack{ - .br-set > span:first-child{ +#modal .winerack { + .br-set>span:first-child { width: 4.5rem; } - .bespread-type{ - display: flex; + + .bespread-type { + display : flex; flex-wrap: wrap; - &>label{ + + &>label { width: 50%; } } - .full-type{ - &>div:first-child{ + + .full-type { + &>div:first-child { padding-right: 10px; - box-shadow:1px 0 0 0 #27343e; + box-shadow : 1px 0 0 0 #27343e; } - &>div:last-child{ + + &>div:last-child { margin-left: 10px; } } diff --git a/src/UI/Components/RightPanel/BoardProps.less b/src/UI/Components/RightPanel/BoardProps.less index f753fd54d..11c3ea9da 100644 --- a/src/UI/Components/RightPanel/BoardProps.less +++ b/src/UI/Components/RightPanel/BoardProps.less @@ -1,112 +1,142 @@ -#boardPropsCom .br-name{ +#boardPropsCom .br-name { width: 12rem; } -#boardPropsCom .bp3-input{ + +#boardPropsCom .bp3-input { height: 1.5rem; } -#boardPropsCom .bp3-html-select>select{ + +#boardPropsCom .bp3-html-select>select { height: 1.5rem; } -#boardPropsCom .bp3-label{ - line-height: 1.5rem; + +#boardPropsCom .bp3-label { + line-height : 1.5rem; margin-bottom: 0.5rem; } -#boardPropsCom .flexWrap>div,#boardPropsCom .flexWrap>label{ - width: 50%; + +#boardPropsCom .flexWrap>div, +#boardPropsCom .flexWrap>label { + width : 50%; line-height: 15px; - display: flex; + display : flex; } -#boardPropsCom .br-set{ + +#boardPropsCom .br-set { margin-bottom: 10px; - white-space: nowrap; + white-space : nowrap; } -#boardPropsCom .flexWrap>div .bp3-input{ + +#boardPropsCom .flexWrap>div .bp3-input { padding: 0 0 0 5px; - width: 5rem; + width : 5rem; } -#boardPropsCom select{ + +#boardPropsCom select { font-size: 8px; } -#boardPropsCom input{ + +#boardPropsCom input { font-size: 8px; - padding: 0 5px; + padding : 0 5px; } + #boardPropsCom .board-info { - .br-mat{ - margin-bottom:0.5rem; + .br-mat { + margin-bottom: 0.5rem; + // justify-content: space-between; - button{ + button { width: 2rem; } - input{ + + input { width: 6.5rem; } } - - .br-mat>div>div:last-child{ + + .br-mat>div>div:last-child { margin-bottom: 0; } } -#boardPropsCom .board-info .br-set input{ + +#boardPropsCom .board-info .br-set input { margin-left: 5px; } -#boardPropsCom .board-config .flexWrap{ + +#boardPropsCom .board-config .flexWrap { width: 250px; } -#boardPropsCom .br-set>span:first-child{ - display: inline-block; - width: 3.5rem; + +#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{ + +#boardPropsCom { + .boardSize { min-width: 151px; } - .select-drillType{ + + .select-drillType { flex: 1; } } -#boardPropsCom .board-info .boardSize .bp3-input{ + +#boardPropsCom .board-info .boardSize .bp3-input { width: 30px; } -#boardPropsCom .boardSize .bp3-inline{ + +#boardPropsCom .boardSize .bp3-inline { line-height: 15px; } -#boardPropsCom .boardSize .bp3-label>.bp3-input{ - display: block; - padding: 0; + +#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{ - display: inline-block; - margin: 0 5px; + line-height : 15px; } -#boardPropsCom .bp3-label>span{ + +#boardPropsCom .boardSize .bp3-label, +#commonModal .behind-board .board-info .boardSize .bp3-input { display: inline-block; - width: 3.5rem; + margin : 0 5px; } -#boardPropsCom .boardModel{ + +#boardPropsCom .bp3-label>span { display: inline-block; - width: 35px; - height: 50px; - border: 1px solid #000; + width : 3.5rem; +} + +#boardPropsCom .boardModel { + display : inline-block; + width : 35px; + height : 50px; + border : 1px solid #000; vertical-align: middle; - margin: 10px; + margin : 10px; } -#boardPropsCom .bp3-html-select .bp3-icon{ + +#boardPropsCom .bp3-html-select .bp3-icon { right: 1px; - top: 2.5px; + top : 2.5px; } -#boardPropsCom>div{ + +#boardPropsCom>div { margin-bottom: 30px; } -#boardPropsCom .cf-select .bp3-input{ + +#boardPropsCom .cf-select .bp3-input { height: unset; } -#boardPropsCom>div:last-child{ - float: right; + +#boardPropsCom>div:last-child { + float: right; } diff --git a/src/UI/Components/RightPanel/Modeling.less b/src/UI/Components/RightPanel/Modeling.less index ce7f480a4..7bf53349c 100644 --- a/src/UI/Components/RightPanel/Modeling.less +++ b/src/UI/Components/RightPanel/Modeling.less @@ -2,21 +2,21 @@ // height: 90%; // } #RightPanel .bp3-card { - padding: 0; + padding : 0; border-radius: 0px; } #RightPanel .bp3-tab-panel { - width: 100%; + width : 100%; overflow: auto; - padding: 5px; + padding : 5px; } #RightPanel .bp3-tab-panel.tab-unstyle { .bp3-tab.tab-unstyle { - width: calc(100% * 0.33333); + width : calc(100% * 0.33333); // border-width: 0; - outline: none; + outline : none; // background: #293742;//背景色待更改 且可随主题变化 } @@ -31,7 +31,7 @@ &>li>label { text-align: center; - width: 50%; + width : 50%; box-shadow: 0 0 0 0 rgba(19, 124, 189, 0), 0 0 0 0 rgba(19, 124, 189, 0), 0 0 0 0 rgba(19, 124, 189, 0), @@ -40,7 +40,7 @@ } &>li { - display: flex; + display : flex; justify-content: space-between; &:first-child>label { @@ -50,7 +50,7 @@ label, input, &>div { - width: 50%; + width : 50%; margin: 0; } } @@ -74,10 +74,10 @@ &>span:first-child, &>label:first-child { line-height: 2; - width: 10%; - padding: 0; - text-align: center; - display: inline-block; + width : 10%; + padding : 0; + text-align : center; + display : inline-block; } } } @@ -93,7 +93,7 @@ .modeling2 { max-height: 94%; - overflow: auto; + overflow : auto; &>li:first-child { justify-content: start; @@ -111,28 +111,28 @@ } label:last-child { - width: 8.5%; //n - outline: none; + width : 8.5%; //n + outline : none; box-shadow: none; } } &>li { - width: 100%; - display: flex; + width : 100%; + display : flex; justify-content: start; .temp-span { - display: inline-block; - width: 0; - height: 100%; + display : inline-block; + width : 0; + height : 100%; vertical-align: middle; } &>span { - width: 15%; - height: auto; - text-align: center; + width : 15%; + height : auto; + text-align : center; vertical-align: middle; } @@ -140,7 +140,7 @@ width: 17%; select { - width: 100%; + width : 100%; height: 30px; } } @@ -150,7 +150,7 @@ &>div { display: flex; - width: 100%; + width : 100%; &>span, &>input, @@ -166,7 +166,7 @@ } &>button:last-child { - width: 12.5%; + width : 12.5%; min-width: 12.5%; } } @@ -182,7 +182,7 @@ .modeling3 { max-height: 94%; - overflow: auto; + overflow : auto; &>li:first-child { justify-content: start; @@ -197,20 +197,20 @@ } &>li { - width: 100%; - display: flex; + width : 100%; + display : flex; justify-content: start; &>span { - width: 15%; - height: auto; - text-align: center; + width : 15%; + height : auto; + text-align : center; vertical-align: middle; span { - display: inline-block; - width: 0; - height: 100%; + display : inline-block; + width : 0; + height : 100%; vertical-align: middle; } } @@ -219,7 +219,7 @@ width: 42.5%; select { - width: 100%; + width : 100%; height: 100%; } } @@ -229,7 +229,7 @@ &>div { display: flex; - width: 100%; + width : 100%; &>span, &>input, @@ -253,12 +253,12 @@ ::-webkit-scrollbar-track-piece { background-color: #fff; /*滚动条的背景颜色*/ - border-radius: 0; + border-radius : 0; /*滚动条的圆角宽度*/ } ::-webkit-scrollbar { - width: 10px; + width : 10px; /*滚动条的宽度*/ height: 8px; /*滚动条的高度*/ @@ -266,17 +266,17 @@ ::-webkit-scrollbar-thumb:vertical { /*垂直滚动条的样式*/ - height: 50px; + height : 50px; background-color: #999; - border-radius: 4px; - outline: 2px solid #fff; - outline-offset: -2px; - border: 2px solid #fff; + border-radius : 4px; + outline : 2px solid #fff; + outline-offset : -2px; + border : 2px solid #fff; } ::-webkit-scrollbar-thumb:hover { /*滚动条的hover样式*/ - height: 50px; + height : 50px; background-color: #9f9f9f; - border-radius: 4px; + border-radius : 4px; } diff --git a/src/UI/Components/RightPanel/RightPanel.less b/src/UI/Components/RightPanel/RightPanel.less index 716d89a8e..0028c0b90 100644 --- a/src/UI/Components/RightPanel/RightPanel.less +++ b/src/UI/Components/RightPanel/RightPanel.less @@ -1,10 +1,10 @@ @height: 27px; #RightPanel .lg-target .bp3-input-group { - cursor: pointer; - width: 10rem; - height: @height; - line-height: @height; + cursor : pointer; + width : 10rem; + height : @height; + line-height : @height; vertical-align: baseline; .bp3-input-action { @@ -22,46 +22,46 @@ #RightPanelBtn { >div { - background: #fff; - transform: perspective(3em) rotateY(-40deg); + background : #fff; + transform : perspective(3em) rotateY(-40deg); border-radius: 10px 0 0 10px; } .bp3-button.bp3-small { &.iconTransBtn { >span { - transform: rotate(90deg); + transform : rotate(90deg); -webkit-transition: transform .25s linear; - -moz-transition: transform .25s linear; - -o-transition: transform .25s linear; - transition: transform .25s linear; + -moz-transition : transform .25s linear; + -o-transition : transform .25s linear; + transition : transform .25s linear; } } border-radius: 3px 0 0 3px; - min-height: 30px; - padding: 5px 0 5px 5px; + min-height : 30px; + padding : 5px 0 5px 5px; >span { - transform: rotate(-90deg); + transform : rotate(-90deg); -webkit-transition: transform .25s linear; - -moz-transition: transform .25s linear; - -o-transition: transform .25s linear; - transition: transform .25s linear; + -moz-transition : transform .25s linear; + -o-transition : transform .25s linear; + transition : transform .25s linear; } } } #RightPanel .lg { - display: flex; - flex-wrap: wrap; + display : flex; + flex-wrap : wrap; justify-content: space-between; - align-items: center; + align-items : center; &>div { - margin-top: 0; + margin-top : 0; margin-bottom: 15px; - padding-top: 7px; + padding-top : 7px; } &>div, @@ -71,30 +71,30 @@ &>div>span, &>.bp3-label>span { - display: inline-block; - width: 2.5rem; + display : inline-block; + width : 2.5rem; vertical-align: middle; } input { - height: @height; + height : @height; line-height: @height; - width: @inputWidth; + width : @inputWidth; } label.bp3-label.bp3-inline { - line-height: @height; + line-height : @height; margin-bottom: 10px; } .lg-pos { - width: 100%; + width : 100%; margin-bottom: 0; ul { - display: flex; + display : flex; justify-content: space-between; - flex-wrap: wrap; + flex-wrap : wrap; li { width: 50%; @@ -107,7 +107,7 @@ } .bp3-input-group { - height: @height; + height : @height; line-height: @height; margin-left: 0; } @@ -132,7 +132,7 @@ } .bp3-control.bp3-large { - font-size: 14px; + font-size : 14px; font-weight: 600; .bp3-control-indicator { @@ -145,9 +145,9 @@ #modal { .metal-root { .cf-select { - width: calc(100% + 20px); + width : calc(100% + 20px); margin-left: -10px; - margin-top: 20px; + margin-top : 20px; .input-select { vertical-align: bottom; @@ -157,7 +157,7 @@ .metals { input { - height: 20px; + height : 20px; line-height: 20px; } @@ -168,7 +168,7 @@ .common-matal { &>label { - display: flex; + display : flex; align-items: center; &>span { @@ -181,12 +181,12 @@ } .k-v { - display: flex; - text-align: center; + display : flex; + text-align : center; padding-right: 10px; &>span { - width: 50%; + width : 50%; outline: 1px solid #444; } } @@ -195,7 +195,7 @@ margin-bottom: 6px; input { - width: 20%; + width : 20%; margin-right: 5px; } @@ -209,11 +209,11 @@ } .metal-other { - list-style: none; - padding: 0; - margin: 0; - height: 200px; - overflow: auto; + list-style : none; + padding : 0; + margin : 0; + height : 200px; + overflow : auto; margin-bottom: 30px; &>li { @@ -227,27 +227,27 @@ } & .metal-type { - display: flex; - flex-wrap: wrap; + display : flex; + flex-wrap : wrap; justify-content: space-between; &>label { - width: 45%; - display: flex; + width : 45%; + display : flex; align-items: center; &>span:first-child { - flex: 1; + flex : 1; white-space: nowrap; } &>span:last-child:not(.bp3-control-indicator) { - width: 70%; + width : 70%; margin: 0; input, span { - width: 100%; + width : 100%; margin: 0; } } @@ -266,23 +266,23 @@ #RightPanel { .tabs-unstyle .bp3-tabs.bp3-vertical>.bp3-tab-list { flex-direction: column; - writing-mode: inherit; - width: 20px; - align-items: center; - justify-items: center; + writing-mode : inherit; + width : 20px; + align-items : center; + justify-items : center; .bp3-tab { - overflow: auto; - white-space: unset; - line-height: 1.25; - text-align: center; - justify-self: center; - align-self: stretch; - align-items: stretch; - justify-items: center; - display: flex; + overflow : auto; + white-space : unset; + line-height : 1.25; + text-align : center; + justify-self : center; + align-self : stretch; + align-items : stretch; + justify-items : center; + display : flex; justify-content: center; - flex-direction: column; + flex-direction : column; } } } diff --git a/src/UI/Components/RightPanel/TemplateParam.less b/src/UI/Components/RightPanel/TemplateParam.less index 9ee2e4d8c..374d637e8 100644 --- a/src/UI/Components/RightPanel/TemplateParam.less +++ b/src/UI/Components/RightPanel/TemplateParam.less @@ -1,96 +1,110 @@ -#templateParam{ +#templateParam { height: 100%; - .template-tree{ + + .template-tree { height: 30%; - .bp3-tree{ - height: 100%; + + .bp3-tree { + height : 100%; overflow: auto; - .bp3-tree-node-list{ + + .bp3-tree-node-list { width: fit-content; - .bp3-tree-node-content{ + + .bp3-tree-node-content { height: 20px; - .bp3-tree-node-label{ + + .bp3-tree-node-label { overflow: unset; } } } } } + .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; - } + 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; } - &>div { - input { - height: 30px; - } - align-items: flex-start; + .bp3-input { + padding-left: 10px; + width : 4rem; } + } - &>div:last-child { - text-align: right; + &>div { + input { + height: 30px; } - &>ul { - list-style: none; - padding: 0; - text-align: center; - box-shadow: 1px 0 0 0 rgba(16, 22, 26, 0.15); + align-items: flex-start; + } - &>li { - display: flex; - justify-content: space-between; - height: 25px; - align-items: center; + &>div:last-child { + text-align: right; + } - &>span { - width: 50%; - } + &>ul { + list-style: none; + padding : 0; + text-align: center; + box-shadow: 1px 0 0 0 rgba(16, 22, 26, 0.15); + + &>li { + display : flex; + justify-content: space-between; + height : 25px; + align-items : center; + + &>span { + width: 50%; } + } - &>li:first-child { - span { - background: #ccc; - } + &>li:first-child { + span { + background: #ccc; } + } - &>li:not(:first-child) { - box-shadow: 0 1px 0 0 rgba(16, 22, 26, 0.15); + &>li:not(:first-child) { + box-shadow: 0 1px 0 0 rgba(16, 22, 26, 0.15); - span { - box-shadow: 1px 0 0 0 rgba(16, 22, 26, 0.15); - } + span { + box-shadow: 1px 0 0 0 rgba(16, 22, 26, 0.15); + } - input { - height: 25px; - } + input { + height: 25px; } } - .attach-info{ - margin-top: 10px; - font-size: 14px; - } } + + .attach-info { + margin-top: 10px; + font-size : 14px; + } + } } diff --git a/src/UI/Components/SourceManage/TexturePanel.less b/src/UI/Components/SourceManage/TexturePanel.less index e3e0fcdb3..36fbcbff9 100644 --- a/src/UI/Components/SourceManage/TexturePanel.less +++ b/src/UI/Components/SourceManage/TexturePanel.less @@ -1,9 +1,9 @@ .texturePanel { - height: 100%; + height : 100%; padding: 0; &>div:first-child { - display: flex; + display : flex; justify-content: space-between; .bp3-align-right { @@ -12,23 +12,23 @@ } &>div:last-child { - height: calc(~"100% - 50px"); - display: flex; + height : calc(~"100% - 50px"); + display : flex; justify-content: space-between; - padding: 0; + padding : 0; .img-tree { - width: 25%; - padding: 0; + width : 25%; + padding : 0; overflow: auto; .bp3-tree { - height: 100%; + height : 100%; box-shadow: none; &>ul { max-height: 95%; - overflow: auto; + overflow : auto; } .bp3-tree-node-content-1 { @@ -38,11 +38,11 @@ } .img-lib { - width: 75%; - padding: 0 10px; - overflow: visible; - position: relative; - display: flex; + width : 75%; + padding : 0 10px; + overflow : visible; + position : relative; + display : flex; flex-direction: column; &>.bp3-control { @@ -50,19 +50,19 @@ } &>ul:first-child { - list-style: none; - display: flex; - flex-wrap: wrap; - padding: 0; - flex: 1; + list-style : none; + display : flex; + flex-wrap : wrap; + padding : 0; + flex : 1; align-content: start; - margin: 0; - overflow: visible; + margin : 0; + overflow : visible; &>li { - width: 20%; - padding: 5px; - position: relative; + width : 20%; + padding : 5px; + position : relative; // height: 32%; .bp3-transition-container { @@ -71,59 +71,59 @@ &>.look-img .bp3-popover-target, .look-mat { - width: 100%; - height: 0px; + width : 100%; + height : 0px; padding-bottom: 100%; - overflow: hidden; - margin: 0; - position: relative; + overflow : hidden; + margin : 0; + position : relative; div { position: absolute; - left: 0; - width: 100%; - height: 100%; + left : 0; + width : 100%; + height : 100%; } img { position: absolute; - left: 0; + left : 0; } .apply-img-hint:hover:before { - content: "双击应用图片"; + content : "双击应用图片"; position: absolute; - left: 0; - right: 0; - bottom: 0; - top: 0; - margin: auto; - width: max-content; - height: 20px; - opacity: 0.5; + left : 0; + right : 0; + bottom : 0; + top : 0; + margin : auto; + width : max-content; + height : 20px; + opacity : 0.5; } } &>p { - width: 70%; - overflow: hidden; - padding: 0; - margin: 0; - white-space: nowrap; + width : 70%; + overflow : hidden; + padding : 0; + margin : 0; + white-space : nowrap; text-overflow: ellipsis } &>.bp3-control { - display: none; - position: absolute; - top: 5px; - margin: 0; - padding: 0; - height: 16px; + display : none; + position : absolute; + top : 5px; + margin : 0; + padding : 0; + height : 16px; line-height: 16px; .bp3-control-indicator { - margin: 0; + margin : 0; vertical-align: baseline; } } @@ -134,8 +134,8 @@ &>.bp3-popover-wrapper:not(:first-child) { position: absolute; - top: 0; - right: 0px; + top : 0; + right : 0px; .bp3-button { display: none; @@ -186,11 +186,11 @@ &>.bp3-control { left: 10px; - top: 10; + top : 10; } &>p { - width: 100%; + width : 100%; bottom: -10px; } } @@ -198,13 +198,13 @@ .bp3-dialog-container { position: fixed; - left: 0; - top: 0; - z-index: 30; + left : 0; + top : 0; + z-index : 30; .bp3-dialog { - width: unset; - margin: 0; + width : unset; + margin : 0; padding: 0; } } @@ -216,29 +216,29 @@ .upload { .thumbnail { min-height: 200px; - position: relative; - padding: 20px; + position : relative; + padding : 20px; .thumbnail-list { - list-style: none; - display: flex; - flex-wrap: wrap; + list-style : none; + display : flex; + flex-wrap : wrap; justify-content: flex-start; - margin-right: 10px; - margin-bottom: 10px; - max-height: 400px; - overflow: auto; + margin-right : 10px; + margin-bottom : 10px; + max-height : 400px; + overflow : auto; li { - width: 110px; - height: 110px; - padding: 10px; + width : 110px; + height : 110px; + padding : 10px; position: relative; button { position: absolute; - right: 0; - top: 0; + right : 0; + top : 0; svg { color: #ff7373; @@ -250,24 +250,24 @@ .thumbnail>div.border { display: block; - width: 100%; - height: 180px; - border: 2px dashed #ccc; + width : 100%; + height : 180px; + border : 2px dashed #ccc; } .uploadBtn { - width: 100px; - height: 50px; - line-height: 50px; + width : 100px; + height : 50px; + line-height : 50px; border-radius: 5px; - text-align: center; - position: absolute; - left: 0; - right: 0; - top: 0; - bottom: 0; - margin: auto; - background: #137cbd; + text-align : center; + position : absolute; + left : 0; + right : 0; + top : 0; + bottom : 0; + margin : auto; + background : #137cbd; } .bp3-dialog-footer-actions { @@ -280,20 +280,20 @@ .bp3-dialog-body { h5 { - padding-left: 20px; - padding-top: 20px; - overflow: hidden; + padding-left : 20px; + padding-top : 20px; + overflow : hidden; text-overflow: ellipsis; - white-space: nowrap; + white-space : nowrap; } } } .newDir { position: fixed; - top: 10%; - left: 33%; - z-index: 25; + top : 10%; + left : 33%; + z-index : 25; label.bp3-label { margin-bottom: 0 @@ -301,31 +301,31 @@ } .pagination { - display: flex; + display : flex; justify-content: center; - align-items: center; - width: 100%; - padding: 10px 0; - height: 60px; + align-items : center; + width : 100%; + padding : 10px 0; + height : 60px; ul { - margin: 0; - list-style: none; - display: flex; + margin : 0; + list-style : none; + display : flex; // width: calc(~"100% - 20px"); justify-content: center; - padding-left: 0; - flex-wrap: wrap; + padding-left : 0; + flex-wrap : wrap; li { - border: 1px solid #137cbd; + border : 1px solid #137cbd; border-radius: 5px; - height: 36px; - width: 36px; - cursor: pointer; - text-align: center; - line-height: 36px; - margin-right: 5px; + height : 36px; + width : 36px; + cursor : pointer; + text-align : center; + line-height : 36px; + margin-right : 5px; } li.active { @@ -333,20 +333,20 @@ } li.disabled { - cursor: not-allowed; - color: #ccc; + cursor : not-allowed; + color : #ccc; border-color: #ccc; } } .bp3-label { - display: flex; + display : flex; justify-content: center; - align-items: center; - margin: 0; + align-items : center; + margin : 0; input { - width: 35px; + width : 35px; margin: 0 5px; } } @@ -354,7 +354,7 @@ .new-mat { position: fixed; - outline: none; + outline : none; .link-shop { &>div { @@ -365,11 +365,11 @@ } ul { - font-size: 16px; - position: absolute; - top: 36px; - left: 0; - width: 100%; + font-size : 16px; + position : absolute; + top : 36px; + left : 0; + width : 100%; background: rgb(48, 64, 77); li:hover { @@ -380,7 +380,7 @@ } &>div:last-child { - display: flex; + display : flex; justify-content: flex-end; .bp3-button { @@ -391,7 +391,7 @@ .search-dir { max-height: 300px; - overflow: auto; + overflow : auto; li { padding: 5px 0; @@ -399,6 +399,6 @@ li:hover { background-color: #ccc; - color: #fff + color : #fff } } diff --git a/src/UI/Components/Template/Template.less b/src/UI/Components/Template/Template.less index 1bd5e3224..fb6c75330 100644 --- a/src/UI/Components/Template/Template.less +++ b/src/UI/Components/Template/Template.less @@ -10,9 +10,9 @@ #commonModal .template, #commonModal .template-select { - max-width: 900px; - width: 60vw; - height: 80vh; + max-width : 900px; + width : 60vw; + height : 80vh; min-height: 750px; max-height: 1000px; @@ -29,34 +29,34 @@ } .template-right { - flex: 1; + flex : 1; overflow: auto; .template-list { - padding: 0; - list-style: none; - display: flex; - flex-wrap: wrap; - width: 60%; - box-shadow: 1px 0 0 0 rgba(16, 22, 26, 0.15); + padding : 0; + list-style : none; + display : flex; + flex-wrap : wrap; + width : 60%; + box-shadow : 1px 0 0 0 rgba(16, 22, 26, 0.15); align-content: flex-start; - text-align: center; + text-align : center; &>li { padding: 5px 10px 0 10px; &>div { - width: 80%; + width : 80%; margin: 0 auto; } &>p { - width: 100px; + width : 100px; // overflow: hidden; // white-space: nowrap; // text-overflow: ellipsis; - margin: 0; - line-height: 1; + margin : 0; + line-height : 1; } } } @@ -78,22 +78,22 @@ &>ul { list-style: none; - padding: 0; + padding : 0; text-align: center; box-shadow: 1px 0 0 0 rgba(16, 22, 26, 0.15); max-height: 40%; - overflow: auto; + overflow : auto; &>li { - display: flex; + display : flex; justify-content: space-between; - height: 25px; - align-items: center; - white-space: nowrap; + height : 25px; + align-items : center; + white-space : nowrap; &>span { - width: 25%; - overflow: hidden; + width : 25%; + overflow : hidden; text-overflow: ellipsis; } } @@ -107,10 +107,10 @@ &>div { &>label { - display: flex; + display : flex; align-items: center; - text-align: left; - flex: 1; + text-align : left; + flex : 1; } &>label:first-child { @@ -131,17 +131,17 @@ position: relative; &>.bp3-control { - display: none; - position: absolute; - top: 5px; - left: 10px; - margin: 0; - padding: 0; - height: 16px; + display : none; + position : absolute; + top : 5px; + left : 10px; + margin : 0; + padding : 0; + height : 16px; line-height: 16px; .bp3-control-indicator { - margin: 0; + margin : 0; vertical-align: baseline; } } @@ -152,8 +152,8 @@ &>.bp3-popover-wrapper:not(:first-child) { position: absolute; - top: 0px; - right: 0px; + top : 0px; + right : 0px; .bp3-button { display: none; @@ -174,10 +174,10 @@ } .tag-list { - border-right: 1px solid #ccc; - display: flex; - width: 50%; - flex-wrap: wrap; + border-right : 1px solid #ccc; + display : flex; + width : 50%; + flex-wrap : wrap; align-content: start; .pagination { @@ -185,42 +185,42 @@ } &>.tag-img { - width: 25%; - outline: 1px solid #ccc; - height: 0; - text-align: center; + width : 25%; + outline : 1px solid #ccc; + height : 0; + text-align : center; padding-bottom: calc(25% + 20px); - position: relative; + position : relative; } &>.tag-img:hover:after, &>.tag-img.active:after { - content: ""; - position: absolute; - left: 0; - top: 0; - width: 100%; - height: 100%; + content : ""; + position : absolute; + left : 0; + top : 0; + width : 100%; + height : 100%; background-color: rgb(30, 152, 209); - opacity: 0.5; + opacity : 0.5; } } .tag-name-list { - list-style: none; - width: 100px; - text-align: left; - padding: 0; - max-height: 100%; - overflow: auto; - border-right: 1px solid #ccc; + list-style : none; + width : 100px; + text-align : left; + padding : 0; + max-height : 100%; + overflow : auto; + border-right : 1px solid #ccc; padding-right: 5px; - width: 20%; + width : 20%; li { border-bottom: 1px solid #ccc; - padding: 5px; - cursor: pointer; + padding : 5px; + cursor : pointer; } li:hover { @@ -229,7 +229,7 @@ li.active { background-color: rgba(19, 124, 189); - color: #fff; + color : #fff; } } @@ -237,7 +237,7 @@ #commonModal .template-detail { &>.add-tag { - display: flex; + display : flex; align-items: center; padding-top: 10px; @@ -246,10 +246,10 @@ } button { - height: 20px; - min-height: 20px; + height : 20px; + min-height : 20px; line-height: 20px; - padding: 0 5px; + padding : 0 5px; } } @@ -267,21 +267,21 @@ &>ul { list-style: none; - padding: 0; + padding : 0; text-align: center; box-shadow: 1px 0 0 0 rgba(16, 22, 26, 0.15); max-height: 40%; - overflow: auto; + overflow : auto; &>li { - display: flex; + display : flex; justify-content: space-between; - height: 25px; - align-items: center; + height : 25px; + align-items : center; &>span { - width: 25%; - overflow: hidden; + width : 25%; + overflow : hidden; text-overflow: ellipsis; } } @@ -315,9 +315,9 @@ } #commonModal .template-design { - width: 40vw; - height: 61vh; - min-width: 768px; + width : 40vw; + height : 61vh; + min-width : 768px; min-height: 590px; .bp3-dialog-body { @@ -348,7 +348,7 @@ .buttons { &>button { - margin-right: 3px; + margin-right : 3px; margin-bottom: 3px; border-radius: 5px; } @@ -371,21 +371,21 @@ .params-list { list-style: none; - padding: 0; + padding : 0; text-align: center; box-shadow: 1px 0 0 0 rgba(16, 22, 26, 0.15); - flex: 1; - overflow: auto; + flex : 1; + overflow : auto; &>li { - display: flex; + display : flex; justify-content: space-between; - height: 25px; - align-items: center; + height : 25px; + align-items : center; &>span { line-height: 25px; - box-shadow: @boxShadow; + box-shadow : @boxShadow; } &>label { @@ -395,9 +395,9 @@ &>span, &>input, label { - width: 20% !important; - height: 100% !important; - overflow: hidden; + width : 20% !important; + height : 100% !important; + overflow : hidden; text-overflow: ellipsis; } } @@ -405,7 +405,7 @@ .action-list { overflow: auto; - flex: 1; + flex : 1; .bp3-tree-node-content { height: 20px; @@ -413,18 +413,18 @@ } #modal .action-dialog { - position: absolute; - left: 0; - right: 0; - top: 0; - bottom: 0; - margin: auto; - width: 200px; - height: 200px; - z-index: 35; - display: flex; + position : absolute; + left : 0; + right : 0; + top : 0; + bottom : 0; + margin : auto; + width : 200px; + height : 200px; + z-index : 35; + display : flex; flex-direction: column; - box-shadow: 0 0 0 1px rgba(16, 22, 26, 0.15), + box-shadow : 0 0 0 1px rgba(16, 22, 26, 0.15), 0 0 0 rgba(16, 22, 26, 0), 0 0 0 rgba(16, 22, 26, 0); padding: 10px; @@ -435,10 +435,10 @@ .bp3-dialog-body { &>.bp3-label { - display: flex; - width: 100%; + display : flex; + width : 100%; justify-content: space-between; - margin: 5px 0 !important; + margin : 5px 0 !important; &>input, &>.bp3-html-select { @@ -448,16 +448,16 @@ } .bp3-dialog-footer { - padding: 0; + padding : 0; justify-content: flex-end; } } #commonModal .template-select { position: absolute; - left: 5%; - top: -17%; - z-index: 30; + left : 5%; + top : -17%; + z-index : 30; .show-temp { &>h5 { @@ -465,12 +465,12 @@ } &>div>div { - width: 50%; - outline: 1px solid #ccc; + width : 50%; + outline : 1px solid #ccc; text-align: center; &>img { - width: 100px; + width : 100px; height: 100px; } @@ -485,15 +485,15 @@ padding: 0; ul { - width: 100px; + width : 100px; text-align: center; - padding: 5px; + padding : 5px; max-height: 200px; - overflow: auto; + overflow : auto; li { border-bottom: 1px solid #ccc; - padding: 2px 0; + padding : 2px 0; } li:hover { diff --git a/src/UI/Components/Template/Topline.less b/src/UI/Components/Template/Topline.less index 5a6391d10..f20a4e0c6 100644 --- a/src/UI/Components/Template/Topline.less +++ b/src/UI/Components/Template/Topline.less @@ -1,7 +1,7 @@ #commonModal .topline { - max-width: 900px; - width: 60vw; - height: 80vh; + max-width : 900px; + width : 60vw; + height : 80vh; min-height: 750px; .bp3-dialog-body { @@ -18,8 +18,8 @@ .bp3-navbar { input { - width: 150px; - height: 30px; + width : 150px; + height : 30px; margin-right: 20px; } } @@ -34,7 +34,7 @@ #commonModal { .knife-props { padding: 10px; - width: 15%; + width : 15%; .bp3-popover-wrapper { width: 57px !important; diff --git a/src/UI/Components/ToolBar/PropertiesPanel.less b/src/UI/Components/ToolBar/PropertiesPanel.less index fb8874f26..9b4f52be3 100644 --- a/src/UI/Components/ToolBar/PropertiesPanel.less +++ b/src/UI/Components/ToolBar/PropertiesPanel.less @@ -1,82 +1,104 @@ -.properties{ +.properties { width: 170px; - .bp3-card{ + + .bp3-card { padding: 5px; - height: 100%; - .header{ - span{ - font-size: 12px; + height : 100%; + + .header { + span { + font-size : 12px; font-weight: 600; } - margin: 10px 0; - display: flex; + + margin : 10px 0; + display : flex; justify-content: space-between; - padding: 0 5px; - align-items: center; + padding : 0 5px; + align-items : center; } - .select{ - .bp3-html-select{ + + .select { + .bp3-html-select { width: 100%; - select{ - height: 2.0rem; + + select { + height : 2.0rem; line-height: 2.0rem; - min-height: 2.0rem; + min-height : 2.0rem; } - >span{ + + >span { top: 2px; } } } - >ul>li{ + + >ul>li { margin: 5px 0 0 0 !important; } - ul{//.props + + ul { + //.props width: 100% !important; - .li-title{ + + .li-title { padding: 5px; - margin: 5px 0 0 0; - width: 100%; + margin : 5px 0 0 0; + width : 100%; } - >li{ + + >li { width: 100% !important; } - .color{ - margin: 5px 0 0 0 !important; - width: 100% !important; + + .color { + margin : 5px 0 0 0 !important; + width : 100% !important; display: flex; - >label{ - width: 20%; - display: flex; - align-items: center; + + >label { + width : 20%; + display : flex; + align-items : center; justify-content: space-around; - flex-direction: column; + flex-direction : column; justify-content: end; } - >ul{ + + >ul { width: 100% !important; - .props-color{ - display: flex; + + .props-color { + display : flex; justify-content: space-between; - border: 1px ridge transparent; - &:hover{ - border: 1px ridge #8A9BA8; + border : 1px ridge transparent; + + &:hover { + border : 1px ridge #8A9BA8; background: #BFCCD6; - cursor: pointer; + cursor : pointer; } - >li{ - pointer-events: none; + + >li { + pointer-events: none; } } - >li{ - >label{ + + >li { + >label { width: 100%; } - >ul{//.props-color-list - outline: none; + + >ul { + //.props-color-list + outline : none; background: none !important; - >li{ + + >li { padding: 5px 0 0 0 !important; - &:hover{ + + &:hover { background: #BFCCD6 !important; } } @@ -84,38 +106,46 @@ } } } - .dal-editor{ - >ul>li{ + + .dal-editor { + >ul>li { padding: 5px 0 0 0; } - .outline{ - div{ - width: 100%; - display: flex; + + .outline { + div { + width : 100%; + display : flex; justify-content: space-between; - align-items: center; + align-items : center; } } - .text-editor{ - >div{ - >span{ + + .text-editor { + >div { + >span { margin: auto 0; } - >.numeric_input{ + + >.numeric_input { width: 60%; - .bp3-input-group{ + + .bp3-input-group { width: 60%; } } - display: flex; + + display : flex; justify-content: space-between; } } - .leadout-editor{ + + .leadout-editor { display: flex; - >span{ - width: 70%; - margin: auto 0; + + >span { + width : 70%; + margin : auto 0; align-items: center; } } @@ -123,32 +153,35 @@ } } } -#PropertiesBtn{ - >div{ - background: #fff; - transform: perspective(3em) rotateY(40deg); + +#PropertiesBtn { + >div { + background : #fff; + transform : perspective(3em) rotateY(40deg); border-radius: 0 10px 10px 0; } - .bp3-button.bp3-small - { - &.iconTransBtn{ - >span{ - transform: rotate(-90deg); + + .bp3-button.bp3-small { + &.iconTransBtn { + >span { + transform : rotate(-90deg); -webkit-transition: transform .25s linear; - -moz-transition: transform .25s linear; - -o-transition: transform .25s linear; - transition: transform .25s linear; + -moz-transition : transform .25s linear; + -o-transition : transform .25s linear; + transition : transform .25s linear; } } + border-radius: 0 3px 3px 0; - min-height: 30px; - padding: 5px 5px 5px 0; - >span{ - transform: rotate(90deg); + min-height : 30px; + padding : 5px 5px 5px 0; + + >span { + transform : rotate(90deg); -webkit-transition: transform .25s linear; - -moz-transition: transform .25s linear; - -o-transition: transform .25s linear; - transition: transform .25s linear; + -moz-transition : transform .25s linear; + -o-transition : transform .25s linear; + transition : transform .25s linear; } } } diff --git a/src/UI/Css/ProcessingGroupModal.less b/src/UI/Css/ProcessingGroupModal.less index 6836396ce..612f0c4f8 100644 --- a/src/UI/Css/ProcessingGroupModal.less +++ b/src/UI/Css/ProcessingGroupModal.less @@ -7,32 +7,32 @@ .processGroup-overlay { left: calc(~"50% - 194px"); - top: calc(~"50% - 50px"); + top : calc(~"50% - 50px"); } .bp3-card.newDir.style2 { position: absolute; - top: 40%; - left: 10%; - z-index: 25; + top : 40%; + left : 10%; + z-index : 25; .bp3-label.bp3-inline { - display: flex; - align-items: center; + display : flex; + align-items : center; justify-content: space-evenly; } } #processingGroup { .bp3-dialog-body { - display: flex; + display : flex; flex-direction: column; - width: 430px; - padding: 10px; + width : 430px; + padding : 10px; >div { - display: flex; - flex-direction: row; + display : flex; + flex-direction : row; // justify-content: space-evenly; } @@ -40,23 +40,23 @@ width: 120px; .title { - text-align: center; + text-align : center; line-height: 30px; - height: 30px; + height : 30px; } .list { width: 100%; .bp3-tree { - min-height: 222px; - max-height: 222px; - height: 100%; - overflow: auto; + min-height : 222px; + max-height : 222px; + height : 100%; + overflow : auto; // height: 100%; - border: 1px solid #c3c3c3; + border : 1px solid #c3c3c3; border-radius: 5px; - padding: 5px 0 0 5px; + padding : 5px 0 0 5px; .bp3-tree-node-label { flex: unset; @@ -70,28 +70,28 @@ } .right { - padding-left: 10px; + padding-left : 10px; // width: calc(~"100% - 120px"); - width: 284px; - display: flex; + width : 284px; + display : flex; flex-direction: column; .right { - display: flex; - flex-direction: row; - margin-top: 10px; + display : flex; + flex-direction : row; + margin-top : 10px; // max-width: 60px; - width: 100%; + width : 100%; justify-content: space-between; - padding: 0; + padding : 0; } .left { - width: 100%; + width : 100%; height: 100%; .list { - height: calc(~"100% - 30px"); + height : calc(~"100% - 30px"); // height: 100%; .bp3-tree { @@ -102,10 +102,10 @@ } .add-del-btn { - display: flex; - flex-direction: column; + display : flex; + flex-direction : column; justify-content: space-around; - margin-top: 10px; + margin-top : 10px; } .bp3-tree-node-content { diff --git a/src/UI/Css/batchCurtailModal.less b/src/UI/Css/batchCurtailModal.less index 20dc73a7e..3815bfd44 100644 --- a/src/UI/Css/batchCurtailModal.less +++ b/src/UI/Css/batchCurtailModal.less @@ -1,53 +1,64 @@ -#modal .batchCurtailModal{ +#modal .batchCurtailModal { padding: 0; - header{ + + header { font-size: 16px; - height: 60px; - padding: 20px; + height : 60px; + padding : 20px; } - .batchCurtailModal-body{ + + .batchCurtailModal-body { padding: 0 20px 20px 20px; - .radio{ + + .radio { margin: 10px; } - &>div - { - input{ - width: 5rem; - height: 20px; + + &>div { + input { + width : 5rem; + height : 20px; line-height: 20px; } - >div:not(class){ - display: flex; + + >div:not(class) { + display : flex; justify-content: center; - &>.bp3-label{ - width: 50%; - text-align: right; - padding-right:10px; - line-height: normal; + + &>.bp3-label { + width : 50%; + text-align : right; + padding-right: 10px; + line-height : normal; } - &>.bp3-label>input{ + + &>.bp3-label>input { vertical-align: middle; } } } - footer{ + + footer { text-align: right; - button{ + + button { margin-left: 10px; } - .cf-select{ - label{ - display: block; - text-align: left; + + .cf-select { + label { + display : block; + text-align : left; margin-left: 5px; } - .bp3-popover-content{ + + .bp3-popover-content { // height: 90px; overflow: auto; } } - .bp3-divider{ + + .bp3-divider { margin-top: 10px; } } diff --git a/src/UI/Css/blue.less b/src/UI/Css/blue.less index 9c85c3675..4af8a8406 100644 --- a/src/UI/Css/blue.less +++ b/src/UI/Css/blue.less @@ -7,13 +7,13 @@ .bp3-tabs, .bp3-tab-panel { - width: 100%; + width : 100%; // overflow: hidden; } } .bp3-portal .ul-unstyle>li { - display: inline-block; + display : inline-block; margin-right: 12px; } @@ -30,22 +30,22 @@ /****************文件资源管理器*********************/ #bp3-tab-panel_Tabs_fl li[id] input { - width: 14rem; - padding: 4px; - border: 1px solid transparent; - outline: none; + width : 14rem; + padding : 4px; + border : 1px solid transparent; + outline : none; background-color: #30404d; - color: #ffffff; - font-size: 1.7rem; - font-weight: bold; + color : #ffffff; + font-size : 1.7rem; + font-weight : bold; } #bp3-tab-panel_Tabs_fl li[id] input:focus { - padding: 4px; + padding : 4px; border-radius: 4px; - border: 1px solid #03a9f4; - box-shadow: 0 0 10px #03a9f4; - background: #2D3B46; + border : 1px solid #03a9f4; + box-shadow : 0 0 10px #03a9f4; + background : #2D3B46; } #bp3-tab-panel_Tabs_fl .ul-unstyle { @@ -77,17 +77,17 @@ /**********魔改蓝图 工具栏tabs专用样式*****************/ #TopToolBar .tabs-unstyle .bp3-tab.tab-unstyle { - border: 1px solid; + border : 1px solid; border-width: 0 1px 0 0; } .bp3-tab.tab-unstyle { - border: 1px solid #25313a; + border : 1px solid #25313a; border-width: 0 0 0 1px; - line-height: 20px; - width: 95px; - text-align: center; - font-size: 10px; + line-height : 20px; + width : 95px; + text-align : center; + font-size : 10px; &:hover { background: #394b59; @@ -102,25 +102,25 @@ //去掉选中项的下box-shadow .bp3-dark .tabs-unstyle .bp3-tab[aria-selected="true"] { -webkit-box-shadow: none; - box-shadow: none; - outline: none; + box-shadow : none; + outline : none; } .tabs-unstyle .bp3-tab[aria-selected="true"] { -webkit-box-shadow: none; - box-shadow: none; - outline: none; + box-shadow : none; + outline : none; } .bp3-dark .tabs-unstyle .bp3-tab[aria-selected="true"], .tabs-unstyle .bp3-tab:not([aria-disabled="true"]):hover { - color: #f5f8fa; + color : #f5f8fa; background: #394b59; } .bp3-dark .tabs-unstyle .bp3-tab[aria-selected="true"], .bp3-dark .tabs-unstyle .bp3-tab:not([aria-disabled="true"]):hover { - color: #f5f8fa; + color : #f5f8fa; background: #394b59; } @@ -130,20 +130,20 @@ /******************Vertical bp3-tabs*********************/ .tabs-unstyle .bp3-tabs.bp3-vertical { - height: 100%; + height : 100%; // width: 280px; } .tabs-unstyle .bp3-tabs.bp3-vertical>.bp3-tab-list { - writing-mode: vertical-rl; + writing-mode : vertical-rl; flex-direction: row; .bp3-tab { - padding: 0; - flex: 1; + padding : 0; + flex : 1; border-radius: 0px; - border-width: 0; - outline: none; + border-width : 0; + outline : none; } } @@ -158,11 +158,11 @@ } #TopPanel .bp3-navbar-group { - display: flex; + display : flex; -webkit-box-align: center; - -ms-flex-align: center; - align-items: center; - height: 18px; + -ms-flex-align : center; + align-items : center; + height : 18px; // padding-top: 5px; &.bp3-align-left { @@ -190,20 +190,20 @@ margin-left: 20px; button { - padding: 0; - font-size: 11px; - height: 18px; - min-height: 18px; + padding : 0; + font-size : 11px; + height : 18px; + min-height : 18px; line-height: 1; } } } .space-process { - transition: all 0.2s; - height: 100%; + transition : all 0.2s; + height : 100%; background-color: #428bca; - border-radius: 5; + border-radius : 5; } .bp3-tree-node-content.moveenter { @@ -212,16 +212,16 @@ .bp3-tree-node-content.push-up { border-top: 3px solid #3DCC91; - opacity: 0.4; + opacity : 0.4; } .bp3-tree-node-content.push-down { border-bottom: 3px solid #3DCC91; - opacity: 0.4; + opacity : 0.4; } .button-20 { - height: 20px; + height : 20px; line-height: 20px; - min-height: 20px; + min-height : 20px; } diff --git a/src/UI/Css/common.less b/src/UI/Css/common.less index c2ace3b14..8693fb317 100644 --- a/src/UI/Css/common.less +++ b/src/UI/Css/common.less @@ -1,11 +1,11 @@ .inputSelect { - display: flex; + display : flex; align-items: center; - margin: 10px 0; - position: relative; + margin : 10px 0; + position : relative; &>span:first-child { - width: max-content; + width : max-content; margin-right: 10px; } @@ -13,22 +13,22 @@ flex: 1; .bp3-button { - margin: 0; + margin : 0; padding: 0; } } .selectList { position: absolute; - right: 0; - top: 20px; - width: 85%; - z-index: 1; - padding: 10px; + right : 0; + top : 20px; + width : 85%; + z-index : 1; + padding : 10px; li { - padding: 2px 0; - overflow: hidden; + padding : 2px 0; + overflow : hidden; text-overflow: ellipsis; } @@ -39,9 +39,9 @@ } .select-box { - position: absolute; - width: 0; - height: 0; + position : absolute; + width : 0; + height : 0; background: rgb(19, 124, 189, 0.3); - opacity: 0.5; + opacity : 0.5; } diff --git a/src/UI/Css/dataList.less b/src/UI/Css/dataList.less index 0e8f47953..4276351b1 100644 --- a/src/UI/Css/dataList.less +++ b/src/UI/Css/dataList.less @@ -1,6 +1,6 @@ #data-list ul { list-style: none; - padding: 0; + padding : 0; &>li { outline: 1px solid #ccc; @@ -9,16 +9,16 @@ &>li.selected { background-color: #52aee7; - color: #000; + color : #000; } .look-mat { - width: 100%; - height: 0px; + width : 100%; + height : 0px; padding-bottom: 100%; - overflow: hidden; - margin: 0; - position: relative; + overflow : hidden; + margin : 0; + position : relative; } &>li.actived { @@ -27,30 +27,30 @@ } #data-list .fileList { - display: flex; - flex-wrap: wrap; - padding: 0; - flex: 1; + display : flex; + flex-wrap : wrap; + padding : 0; + flex : 1; align-content: start; - margin: 0; - overflow: visible; + margin : 0; + overflow : visible; &>li { - display: flex; + display : flex; flex-direction: column; } &>li { - outline: 1px solid #ccc; - width: 20%; - padding: 5px; + outline : 1px solid #ccc; + width : 20%; + padding : 5px; position: relative; .look-mat img { position: absolute; - left: 0; + left : 0; } } } @@ -60,42 +60,49 @@ display: flex; padding: 5px 0; - :nth-child(1){ - flex:1; + :nth-child(1) { + flex: 1; } - :nth-child(2){ + + :nth-child(2) { width: 160px; } - :nth-child(3){ + + :nth-child(3) { width: 100px; } - :nth-child(4){ + + :nth-child(4) { width: 100px; } } overflow: auto; - height: 100%; + height : 100%; .data-list-info { &>li { - display: flex; + display : flex; align-items: center; - :nth-child(1){ - flex:1; + :nth-child(1) { + flex: 1; } - :nth-child(2){ + + :nth-child(2) { width: 160px; } - :nth-child(3){ + + :nth-child(3) { width: 100px; } - :nth-child(4){ + + :nth-child(4) { width: 100px; } + // &>div { // flex: 1; // text-align: left; @@ -105,8 +112,8 @@ // } img { - height: 40px; - width: 40px; + height : 40px; + width : 40px; vertical-align: middle; } @@ -122,34 +129,34 @@ } .apply-img-hint:hover:before { - content: "双击应用图片"; - position: absolute; - left: 0; - right: 0; - bottom: 0; - top: 0; - margin: auto; - width: max-content; - height: 20px; - opacity: 1; + content : "双击应用图片"; + position : absolute; + left : 0; + right : 0; + bottom : 0; + top : 0; + margin : auto; + width : max-content; + height : 20px; + opacity : 1; font-weight: bold; } .hint:hover::before { - content: "双击编辑材质 拖至绘图区应用"; + content : "双击编辑材质 拖至绘图区应用"; position: absolute; - left: 20%; - top: 10px; - margin: auto; - width: 55%; - height: 30px; - opacity: 1; - z-index: 1; + left : 20%; + top : 10px; + margin : auto; + width : 55%; + height : 30px; + opacity : 1; + z-index : 1; } } .data-title { - overflow: hidden; - white-space: nowrap; + overflow : hidden; + white-space : nowrap; text-overflow: ellipsis; } diff --git a/src/UI/Css/golden.less b/src/UI/Css/golden.less index 8eebc35fa..ac65786c9 100644 --- a/src/UI/Css/golden.less +++ b/src/UI/Css/golden.less @@ -1,182 +1,207 @@ - //因为某些样式被蓝图破坏,所以修正它. //用于切换主题色 本文件在switchTheme.less中被引用 //配色方案见https://blueprintjs.com/docs/#core/colors -.changeGoldenTheme( - @lm_content_bg:#2C343A, - @standrad_shadow:#000, - @text_color_unactive:#76838E, - @text_color_active:#fff, - @toolbar_bg:#5C7080, +.changeGoldenTheme(@lm_content_bg: #2C343A, + @standrad_shadow: #000, + @text_color_unactive: #76838E, + @text_color_active: #fff, + @toolbar_bg: #5C7080, @fileName_bg: #30404d, @downpanel_bg: #4B6070, - @command_result_text:#C4E1A4, - @recommand_cmd_bg:#5C7080, - @recommand_cmd_bg_hover:#8A9BA8, - @topToolsBlock_btn_bg:#394b59, - @topToolsBlock_btn_bg_hover:#4B6070, - @topToolBar_bg:#5C7080, - @topToolBar_ul_bg:#5C7080, - @topToolBar_smallIconList_btn_bg:#394b59, - @topToolBar_smallIconList_btn_bg_hover:#4B6070, - @topToolBar_tablist_bg:#4B6070, - @topToolBar_tablist_bg_hover:#5C7080, - @topToolBar_tablist_color:#f5f8fa, - @topToolBar_li_hover:#738694, - @verticalTab_selected_bg:#394b59, - @tabUnstyle_border:#999, - @rightPanel_tabs_border:#25313a, - @commandInput_bg:#2c343a, - @commandInput_dragArea_bg:#394b59, - @terminalCommandResult_bg:#5C7080, - @commandPanel_li_bg_hover:#8A9BA8, - @properties_header_bg:#202B33, - @properties_li_title_bg:#293742, - @templateParam_detail_title_bg:#394b59, -){ - -/*-----FileItem文件名-----*/ -#bp3-tab-panel_Tabs_fl li[id] input { - background-color: @fileName_bg; - color: @text_color_active; -} + @command_result_text: #C4E1A4, + @recommand_cmd_bg: #5C7080, + @recommand_cmd_bg_hover: #8A9BA8, + @topToolsBlock_btn_bg: #394b59, + @topToolsBlock_btn_bg_hover: #4B6070, + @topToolBar_bg: #5C7080, + @topToolBar_ul_bg: #5C7080, + @topToolBar_smallIconList_btn_bg: #394b59, + @topToolBar_smallIconList_btn_bg_hover: #4B6070, + @topToolBar_tablist_bg: #4B6070, + @topToolBar_tablist_bg_hover: #5C7080, + @topToolBar_tablist_color: #f5f8fa, + @topToolBar_li_hover: #738694, + @verticalTab_selected_bg: #394b59, + @tabUnstyle_border: #999, + @rightPanel_tabs_border: #25313a, + @commandInput_bg: #2c343a, + @commandInput_dragArea_bg: #394b59, + @terminalCommandResult_bg: #5C7080, + @commandPanel_li_bg_hover: #8A9BA8, + @properties_header_bg: #202B33, + @properties_li_title_bg: #293742, + @templateParam_detail_title_bg: #394b59, +) { -/*-----工具条-----*/ -#toolbar{ - background: @toolbar_bg !important; -} -#toolbar ul li:hover{ - background: @topToolBar_li_hover; - cursor: pointer; -} + /*-----FileItem文件名-----*/ + #bp3-tab-panel_Tabs_fl li[id] input { + background-color: @fileName_bg; + color : @text_color_active; + } -/*-----命令栏-----*/ -#commands .content { - 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; -} + /*-----工具条-----*/ + #toolbar { + background: @toolbar_bg !important; + } -#TerminalTransparent .terminal-pusher { - box-shadow: unset; -} + #toolbar ul li:hover { + background: @topToolBar_li_hover; + cursor : pointer; + } -/*-----命令提示-----*/ -#input-hint .recommend-command { - color: @text_color_active; - background-color: @recommand_cmd_bg; -} -#input-hint .recommend-command>li.hover { - background-color: @recommand_cmd_bg_hover; -} + /*-----命令栏-----*/ + #commands .content { + color : @command_result_text; + background: @lm_content_bg; + } -/*-----DownPanel-----*/ -#DownPanel{ - background: @downpanel_bg !important; -} + .terminal-pusher { + background: @lm_content_bg; + box-shadow: inset 0px 14px 16px -15px @standrad_shadow; + } -/*-------TopToolsBlock--------*/ -#TopToolBar { - background: @topToolBar_bg; -} -#TopToolBar .tool-block>div>.bp3-button{ - background: @topToolsBlock_btn_bg; - &:hover{ - background: @topToolsBlock_btn_bg_hover; + #TerminalOutputArea .terminal-output { + background: @lm_content_bg; } -} -#TopToolBar .ul-unstyle{ - background: @topToolBar_ul_bg; -} -#TopToolBar .small-iconlist >.bp3-button{ - background: @topToolBar_smallIconList_btn_bg; - &:hover{ - background: @topToolBar_smallIconList_btn_bg_hover; + + #TerminalTransparent .terminal-pusher { + box-shadow: unset; } -} -#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 { - 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{ - background: @commandInput_bg; + + /*-----命令提示-----*/ + #input-hint .recommend-command { + color : @text_color_active; + background-color: @recommand_cmd_bg; } - .drag-area{ - background: @commandInput_dragArea_bg; + + #input-hint .recommend-command>li.hover { + background-color: @recommand_cmd_bg_hover; } -} -#TransTerminal .terminal-commandResult span{ - background: @terminalCommandResult_bg; -} -/*----------F1面板-----------*/ -#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 - } + + /*-----DownPanel-----*/ + #DownPanel { + background: @downpanel_bg !important; + } + + /*-------TopToolsBlock--------*/ + #TopToolBar { + background: @topToolBar_bg; + } + + #TopToolBar .tool-block>div>.bp3-button { + background: @topToolsBlock_btn_bg; + + &:hover { + background: @topToolsBlock_btn_bg_hover; } -/*---------特性面板----------*/ -.properties{ - .bp3-card{ - .header{ - background: @properties_header_bg; + } + + #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 { + 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 { + 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 { + background-color: @commandPanel_li_bg_hover; + cursor : pointer; + } + + /*-----------BBS-------------*/ + #modal .br-lookover .react-draggable { + >div { + background-color: @fileName_bg } - ul{//.props - .li-title{ - background: @properties_li_title_bg; + } + + /*---------特性面板----------*/ + .properties { + .bp3-card { + .header { + background: @properties_header_bg; + } + + ul { + + //.props + .li-title { + background: @properties_li_title_bg; + } } } } -} -/*-----GoldenLayout-CSS-----*/ -.lm_header{ - background: @properties_header_bg; -} + /*-----GoldenLayout-CSS-----*/ + .lm_header { + background: @properties_header_bg; + } -.lm_tab { - color: @text_color_active; - background: @properties_header_bg; -} + .lm_tab { + color : @text_color_active; + background: @properties_header_bg; + } -/*-------右侧模板参数--------*/ -#templateParam{ - .template-detail{ - &>ul{ - &>li:first-child{ - span { - background: @templateParam_detail_title_bg; + /*-------右侧模板参数--------*/ + #templateParam { + .template-detail { + &>ul { + &>li:first-child { + span { + background: @templateParam_detail_title_bg; + } } } } } } -} diff --git a/src/UI/Css/rotateLyModal.less b/src/UI/Css/rotateLyModal.less index 385a96a7e..b313f4583 100644 --- a/src/UI/Css/rotateLyModal.less +++ b/src/UI/Css/rotateLyModal.less @@ -1,43 +1,54 @@ -#modal .rotateLyModal{ +#modal .rotateLyModal { padding: 0; - header{ - padding: 20px; + + header { + padding : 20px; font-size: 16px; } - .select-type{ - .bp3-radio{ + + .select-type { + .bp3-radio { margin-right: 10px; } - .br-set>span{ + + .br-set>span { width: 3.1rem; } - input{ - margin-right:10px; + + input { + margin-right: 10px; } } - &>div{ + + &>div { padding: 0 20px 20px 20px; - >div:not(class){ + + >div:not(class) { display: flex; - &>.bp3-label{ - width: 50%; - text-align: right; - padding-right:10px; - line-height: normal; + + &>.bp3-label { + width : 50%; + text-align : right; + padding-right: 10px; + line-height : normal; } - &>.bp3-label>input{ + + &>.bp3-label>input { vertical-align: middle; } } } - input{ - width: 5rem; - height: 20px; + + input { + width : 5rem; + height : 20px; line-height: 20px; } - footer{ + + footer { text-align: right; - button{ + + button { margin-right: 10px; } } diff --git a/src/UI/Css/style.less b/src/UI/Css/style.less index c6d908cca..bc98f1a35 100644 --- a/src/UI/Css/style.less +++ b/src/UI/Css/style.less @@ -1,15 +1,15 @@ body { .sans-serif; font-size: 11px; - overflow: hidden; + overflow : hidden; } html, body { background: #5C7080; - height: 100%; - padding: 0; - margin: 0; + height : 100%; + padding : 0; + margin : 0; } .helvetica { @@ -26,19 +26,19 @@ body { .panel { background: #444; - border: 0px solid black; + border : 0px solid black; } .btn:hover { background-color: #808080; - border-color: #ccc; + border-color : #ccc; } .btn { - border: 1px solid #808080; - background: #606060 no-repeat center; - border-radius: 4px; - color: white; + border : 1px solid #808080; + background : #606060 no-repeat center; + border-radius : 4px; + color : white; vertical-align: top; } @@ -47,12 +47,12 @@ body { } .dock-btn { - padding: 1px 5px 1px 5px; - border: 0 solid black; - background: #606060 no-repeat center; + padding : 1px 5px 1px 5px; + border : 0 solid black; + background : #606060 no-repeat center; border-radius: 4px; - cursor: pointer; - margin: 1px 4px 1px 4px; + cursor : pointer; + margin : 1px 4px 1px 4px; } .dock-btn:hover { @@ -65,46 +65,46 @@ body { .selected { background-color: #333; - color: #ccc; + color : #ccc; } .sbtn { - min-width: 20px; - height: 20px; - line-height: 1.1; + min-width : 20px; + height : 20px; + line-height : 1.1; border-color: #999; - padding: 1px 3px; - font-size: 14px; + padding : 1px 3px; + font-size : 14px; } .rbtn { - width: 37px; - height: 37px; - margin: 2px 6px; - font-size: 22px; + width : 37px; + height : 37px; + margin : 2px 6px; + font-size : 22px; line-height: 1.1; } .tbtn { - width: 31px; - height: 31px; - margin: 2px 2px; + width : 31px; + height : 31px; + margin : 2px 2px; font-size: 20px; - padding: 0; + padding : 0; } .tlist { list-style-type: none; - padding: 0px; - margin: 0; - color: #fff; - font-size: 13px; + padding : 0px; + margin : 0; + color : #fff; + font-size : 13px; } .tlist li { border-bottom: 1px solid #777; - padding: 2px 3px 2px 15px; - cursor: pointer; + padding : 2px 3px 2px 15px; + cursor : pointer; } .tlist li:hover { @@ -113,9 +113,9 @@ body { .tool-caption { font-weight: bold; - color: #fff; - padding: 2px 0 2px 3px; - background: #333; + color : #fff; + padding : 2px 0 2px 3px; + background : #333; user-select: none; } @@ -124,11 +124,11 @@ body { } .tool-caption .btn { - width: 14px; - height: 14px; - font-size: 10px; + width : 14px; + height : 14px; + font-size : 10px; line-height: 11px; - margin-top: -1px; + margin-top : -1px; } .tool-caption .fa { @@ -141,12 +141,12 @@ body { .tlist .btn { font-size: 11px; - border: 0; + border : 0; } .tlist .rm { visibility: hidden; - padding: 0 5px 0 5px; + padding : 0 5px 0 5px; } .tlist li:hover .rm { @@ -180,7 +180,7 @@ body { #layersList { background-color: #ddd; - margin: 10px; + margin : 10px; } #commands { @@ -188,11 +188,12 @@ body { } #commands .content { - color: #C4E1A4; + color : #C4E1A4; font-size: 11px } -.terminal-output-area, .terminal-output-area-transparent{ +.terminal-output-area, +.terminal-output-area-transparent { flex: 1; } @@ -209,19 +210,19 @@ body { } .terminal-input input { - color: #C4E1A4; - background: inherit; - outline: none; - border: 0; - margin-top: 4px; - padding: 3px; - width: 100%; - box-sizing: border-box; + color : #C4E1A4; + background : inherit; + outline : none; + border : 0; + margin-top : 4px; + padding : 3px; + width : 100%; + box-sizing : border-box; padding-left: 0; } .terminal-input input::-webkit-input-placeholder { - color: #777777; + color : #777777; font-style: italic; } @@ -240,28 +241,28 @@ input[type=radio] { #status { .helvetica; - color: #fff; - font-size: 11px; + color : #fff; + font-size : 11px; padding-top: 4px; } #status .coordinates-info { font-style: italic; - color: #fff; + color : #fff; } .status-item { padding-right: 5px; - padding-left: 5px; - float: right; - color: #bbb; + padding-left : 5px; + float : right; + color : #bbb; } #viewer-container .tool-hint { .helvetica; - color: #000; - font-size: 11px; - cursor: default; + color : #000; + font-size : 11px; + cursor : default; pointer-events: none; } @@ -271,86 +272,98 @@ input[type=radio] { } #TopPanel .menu { - display: none; + display : none; transition: all .5s; } #TopPanel .info { margin: 0; } + // 工具栏样式 -#toolbar{ - ul{ - display: flex; +#toolbar { + ul { + display : flex; flex-direction: column; - flex-wrap: wrap; - margin: 0; - width: 80px; - >li{ - width: 40px; - margin: 0; + flex-wrap : wrap; + margin : 0; + width : 80px; + + >li { + width : 40px; + margin : 0; padding: 0; - img{ - width: 30px; + + img { + width : 30px; height: 30px; } } } } + // 媒体查询 ToolBar @media screen and (max-height:1148px) { - #toolbar ul{ + #toolbar ul { width: 80px; } } + @media screen and (max-height:699px) { - #toolbar ul{ - width: 90px; - overflow: auto; - display: flex; + #toolbar ul { + width : 90px; + overflow : auto; + display : flex; flex-flow: wrap; - overflow: auto; + overflow : auto; } } + /*----------TopToolBar开始-----------*/ //顶部工具栏样式 -#TopToolBar img{ +#TopToolBar img { width: auto; } -#TopToolBar .bp3-tab-list{ - >div{ + +#TopToolBar .bp3-tab-list { + >div { font-size: 14px; } } + //分类工具块 -#TopToolBar .tool-block{ - display: flex; +#TopToolBar .tool-block { + display : flex; flex-direction: row; - &>div{ - display: flex; + + &>div { + display : flex; flex-direction: column; + >ul { - overflow: hidden; - height: 55px; - margin: 0; - padding: 0; - display: flex; - flex-wrap: wrap; + overflow : hidden; + height : 55px; + margin : 0; + padding : 0; + display : flex; + flex-wrap : wrap; justify-content: space-around; - align-items: baseline; + align-items : baseline; + li { - float: left; - text-align: center; + float : left; + text-align : center; padding-bottom: 10px; - cursor: pointer; + cursor : pointer; } } + &>.bp3-button { - min-height: 20px; - font-size: 10px; - padding: 0; + min-height : 20px; + font-size : 10px; + padding : 0; border-radius: 0px; - outline: none; + outline : none; // position: absolute; // width: 470px; // margin-top: 180px; @@ -358,75 +371,86 @@ input[type=radio] { } } } + //图标工具 #TopToolBar { - .tabs-unstyle .bp3-tab-panel.tab-unstyle{ + .tabs-unstyle .bp3-tab-panel.tab-unstyle { padding: 5px 0 0 0; } + // overflow: hidden; - p{ + p { margin: 0px; } - .rc-autoresponsive-container - { + + .rc-autoresponsive-container { overflow: hidden; - >li{ + + >li { border-radius: 3px; - width: 55px; - height: 55px; - text-align: center; - >img{ + width : 55px; + height : 55px; + text-align : center; + + >img { height: 30px; - width: 30px; + width : 30px; } - &:hover{ - cursor: pointer; + + &:hover { + cursor : pointer; background: #d8d8d8; } - >p{ + + >p { text-align: center; margin-top: 5px; } } } } + //隐藏缩略图标按钮 -#TopToolBar .small-iconlist -{ - width: 100%; - position: absolute; - margin-top: 55px; - display: flex; +#TopToolBar .small-iconlist { + width : 100%; + position : absolute; + margin-top : 55px; + display : flex; flex-direction: column; - outline: none; + outline : none; + // flex-flow: column wrap; - ul{ - margin: 0; - display: flex; + ul { + margin : 0; + display : flex; flex-flow: row wrap; - >li{ - height: 25px; - width: 50px; + + >li { + height : 25px; + width : 50px; text-align: center; - cursor: pointer; - >img{ + cursor : pointer; + + >img { height: 20px; - width: 20px; + width : 20px; } } } - &>.bp3-button{ - width: 100%; - min-height: 20px; - font-size: 10px; - padding: 0; - min-height: 20px; - font-size: 10px; - padding: 0; + + &>.bp3-button { + width : 100%; + min-height : 20px; + font-size : 10px; + padding : 0; + min-height : 20px; + font-size : 10px; + padding : 0; border-radius: 0px; - background: #2d3a46; - &:hover{ - background: #202b33; + background : #2d3a46; + + &:hover { + background: #202b33; } } } @@ -434,58 +458,65 @@ 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; + background: transparent; } } -#TransTerminal .terminal-commandResult -{ + +#TransTerminal .terminal-commandResult { margin: 5px; - span{ - padding: 0 3px 0 3px; + + span { + padding : 0 3px 0 3px; border-radius: 3px; } - animation-name: fade-out; - animation: fade-out 5s ease-in; - animation-fill-mode: forwards; + + animation-name : fade-out; + animation : fade-out 5s ease-in; + animation-fill-mode : forwards; animation-iteration-count: 1; - opacity: 1; - animation-delay: 1.5s; + 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; + overflow : hidden; flex-direction: column; - position: absolute; - right: 0; - top: 50px; - background: #394b59; + position : absolute; + right : 0; + top : 50px; + background : #394b59; } + #TopPanel .hidden { display: none; } @@ -499,28 +530,30 @@ input[type=radio] { } //Text对象输入框 -.text-input{ - display: block; +.text-input { + display : block; background: transparent; - overflow:hidden; - color:#fff; - position:fixed; - outline: none; - border: 1px solid transparent; - padding: 0 0px; -} -.text-input:focus{ - border-color:#fff; - background: #444; + overflow : hidden; + color : #fff; + position : fixed; + outline : none; + border : 1px solid transparent; + padding : 0 0px; +} + +.text-input:focus { + border-color: #fff; + background : #444; } + /**********自定义通用样式*****************/ -.flex -{ +.flex { display: flex; } + .flexCol { - display: flex; + display : flex; flex-direction: column; } @@ -534,47 +567,57 @@ div { float: right; ; } -.inline{ + +.inline { display: inline-block } -.flexWrap{ - display: flex; + +.flexWrap { + display : flex; flex-wrap: wrap } + .ul-unstyle { list-style: none; - padding: 0; + padding : 0; } -.flex-arround{ + +.flex-arround { .flex(); justify-content: space-around; } -.flex-between{ + +.flex-between { .flex(); justify-content: space-between; } -.flex-col{ + +.flex-col { .flex(); flex-direction: column; } -.flex-center{ + +.flex-center { .flex(); justify-content: center; } -.flex-end{ + +.flex-end { .flex(); justify-content: flex-end; } -.flex-wrap{ - display: flex; + +.flex-wrap { + display : flex; flex-wrap: wrap } + .half { width: 50%; } img { - width: 100%; + width : 100%; height: 100%; } @@ -582,58 +625,65 @@ img { margin-right: 10px; } -.center{ +.center { text-align: center; } -.widthHalf{ + +.widthHalf { width: 50%; } -.arrow{ + +.arrow { display: block; - border: 10px solid transparent; - width: 0; - height: 0px; - margin: 0 auto; + border : 10px solid transparent; + width : 0; + height : 0px; + margin : 0 auto; } -.arrowtop{ + +.arrowtop { border-bottom: 10px solid #000; - margin-top: -3px; + margin-top : -3px; } -.arrowbottom{ + +.arrowbottom { border-top: 10px solid #000; } -.line{ + +.line { display: block; - border: 2px solid #000; - width: 0; - height: 16px; - margin: 0 auto; + border : 2px solid #000; + width : 0; + height : 16px; + margin : 0 auto; } //蒙版通用样式 -.masking{ +.masking { position: fixed; - top: 0; - left: 0; - right:0; - bottom:0; - height: 100%; - width:100%; + top : 0; + left : 0; + right : 0; + bottom : 0; + height : 100%; + width : 100%; } -#matContent canvas{ +#matContent canvas { border-left: 1px solid #30404d; } -.right{ + +.right { text-align: right; } -.flex-wrap{ + +.flex-wrap { .flex(); flex-wrap: wrap; } -.text-hidden{ - overflow: hidden; +.text-hidden { + overflow : hidden; text-overflow: ellipsis; - white-space: nowrap; -} \ No newline at end of file + white-space : nowrap; +} diff --git a/src/UI/Css/switchTheme.less b/src/UI/Css/switchTheme.less index 4a8aa025f..4f88102cf 100644 --- a/src/UI/Css/switchTheme.less +++ b/src/UI/Css/switchTheme.less @@ -1,39 +1,40 @@ @charset "utf-8"; @import (less) "golden.less"; -.dark-golden{ - .changeGoldenTheme(); //黑夜 + +.dark-golden { + .changeGoldenTheme(); //黑夜 } -.light-golden{ - .changeGoldenTheme( - #cbd7e7,//@lm_content_bg - #394B59,//@standrad_shadow - #999999,//@text_color_unactive - #10161A,//@text_color_active - #f5f8fa,//@toolbar_bg - #ffffff,//@fileName_bg - #E1E8ED,//@downpanel_bg - #1D7324,//@command_result_text - #E1E8ED,//@recommand_cmd_bg - #A7B6C2,//@recommand_cmd_bg_hover - #ced9e0,//@topToolsBlock_btn_bg - #E1E8ED,//@topToolsBlock_btn_bg_hover - #f5f8fa,//@topToolBar_bg - #f5f8fa,//@topToolBar_ul_bg - #ced9e0,//@topToolBar_smallIconList_btn_bg - #E1E8ED,//@topToolBar_smallIconList_btn_bg_hover - #ced9e0,//@topToolBar_tablist_bg - #f5f8fa,//@topToolBar_tablist_bg_hover - #10161A,//@topToolBar_tablist_color - #E1E8ED,//@topToolBar_li_hover - #f5f8fa,//@verticalTab_selected_bg - #A7B6C2,//@tabUnstyle_border - #CED9E0,//@rightPanel_tabs_border - #CED9E0,//@commandInput_bg - #8A9BA8, //@commandInput_dragArea_bg - #DCDCDC, //@terminalCommandResult_bg - #E1E8ED,//@commandPanel_li_bg_hover - #BFCCD6,//@properties_header_bg - #ced9e0,//@properties_li_title_bg - #ccc//@templateParam_detail_title_bg - ); //白天 + +.light-golden { + .changeGoldenTheme(#cbd7e7, //@lm_content_bg + #394B59, //@standrad_shadow + #999999, //@text_color_unactive + #10161A, //@text_color_active + #f5f8fa, //@toolbar_bg + #ffffff, //@fileName_bg + #E1E8ED, //@downpanel_bg + #1D7324, //@command_result_text + #E1E8ED, //@recommand_cmd_bg + #A7B6C2, //@recommand_cmd_bg_hover + #ced9e0, //@topToolsBlock_btn_bg + #E1E8ED, //@topToolsBlock_btn_bg_hover + #f5f8fa, //@topToolBar_bg + #f5f8fa, //@topToolBar_ul_bg + #ced9e0, //@topToolBar_smallIconList_btn_bg + #E1E8ED, //@topToolBar_smallIconList_btn_bg_hover + #ced9e0, //@topToolBar_tablist_bg + #f5f8fa, //@topToolBar_tablist_bg_hover + #10161A, //@topToolBar_tablist_color + #E1E8ED, //@topToolBar_li_hover + #f5f8fa, //@verticalTab_selected_bg + #A7B6C2, //@tabUnstyle_border + #CED9E0, //@rightPanel_tabs_border + #CED9E0, //@commandInput_bg + #8A9BA8, //@commandInput_dragArea_bg + #DCDCDC, //@terminalCommandResult_bg + #E1E8ED, //@commandPanel_li_bg_hover + #BFCCD6, //@properties_header_bg + #ced9e0, //@properties_li_title_bg + #ccc //@templateParam_detail_title_bg + ); //白天 } diff --git a/src/UI/Css/test.less b/src/UI/Css/test.less index cd0bc1e0e..95cb99044 100644 --- a/src/UI/Css/test.less +++ b/src/UI/Css/test.less @@ -1,80 +1,84 @@ -.messageCounter{ - position: absolute; - right: -5px; - top: -5px; - background: #ad5000; - color:#fff; - font-weight: bold; - z-index: 4; - padding: 2px 5px; +.messageCounter { + position : absolute; + right : -5px; + top : -5px; + background : #ad5000; + color : #fff; + font-weight : bold; + z-index : 4; + padding : 2px 5px; border-radius: 50px; } -.lm_active .messageCounter{ - background: #ee7813; +.lm_active .messageCounter { + background: #ee7813; } -html, body{ - margin: 0; - height: 100%; - background: #000; +html, +body { + margin : 0; + height : 100%; + background: #000; } -#layoutContainer{ - height:98%; - bottom: 0; - width: 100%; - position: absolute; +#layoutContainer { + height : 98%; + bottom : 0; + width : 100%; + position: absolute; } -.btnContainer{ - width: 300px; - margin: 0 auto; - position: relative; - top: 50%; - margin-top: -30px; + +.btnContainer { + width : 300px; + margin : 0 auto; + position : relative; + top : 50%; + margin-top: -30px; } + button { - -moz-box-shadow:inset 0px 1px 0px 0px #777; - -webkit-box-shadow:inset 0px 1px 0px 0px #777; - box-shadow:inset 0px 1px 0px 0px #777; - background:-webkit-gradient(linear, left top, left bottom, color-stop(0.05, #403f40), color-stop(1, #1f1f1f)); - background:-moz-linear-gradient(top, #403f40 5%, #1f1f1f 100%); - background:-webkit-linear-gradient(top, #403f40 5%, #1f1f1f 100%); - background:-o-linear-gradient(top, #403f40 5%, #1f1f1f 100%); - background:-ms-linear-gradient(top, #403f40 5%, #1f1f1f 100%); - background:linear-gradient(to bottom, #403f40 5%, #1f1f1f 100%); - filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#403f40', endColorstr='#1f1f1f',GradientType=0); - background-color:#403f40; - -moz-border-radius:6px; - -webkit-border-radius:6px; - border-radius:6px; - border:1px solid #2e2e2e; - margin: 0 10px; - display:inline-block; - cursor:pointer; - color:#d6d6d6; - font-family:arial; - font-size:30px; - font-weight:bold; - outline: none; - padding:12px 0; - text-decoration:none; - text-shadow:0px 1px 0px #000000; - width: 100px; - + -moz-box-shadow : inset 0px 1px 0px 0px #777; + -webkit-box-shadow : inset 0px 1px 0px 0px #777; + box-shadow : inset 0px 1px 0px 0px #777; + background : -webkit-gradient(linear, left top, left bottom, color-stop(0.05, #403f40), color-stop(1, #1f1f1f)); + background : -moz-linear-gradient(top, #403f40 5%, #1f1f1f 100%); + background : -webkit-linear-gradient(top, #403f40 5%, #1f1f1f 100%); + background : -o-linear-gradient(top, #403f40 5%, #1f1f1f 100%); + background : -ms-linear-gradient(top, #403f40 5%, #1f1f1f 100%); + background : linear-gradient(to bottom, #403f40 5%, #1f1f1f 100%); + filter : progid:DXImageTransform.Microsoft.gradient(startColorstr='#403f40', endColorstr='#1f1f1f', GradientType=0); + background-color : #403f40; + -moz-border-radius : 6px; + -webkit-border-radius: 6px; + border-radius : 6px; + border : 1px solid #2e2e2e; + margin : 0 10px; + display : inline-block; + cursor : pointer; + color : #d6d6d6; + font-family : arial; + font-size : 30px; + font-weight : bold; + outline : none; + padding : 12px 0; + text-decoration : none; + text-shadow : 0px 1px 0px #000000; + 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%); - background:-webkit-linear-gradient(top, #1f1f1f 5%, #403f40 100%); - background:-o-linear-gradient(top, #1f1f1f 5%, #403f40 100%); - background:-ms-linear-gradient(top, #1f1f1f 5%, #403f40 100%); - background:linear-gradient(to bottom, #1f1f1f 5%, #403f40 100%); - filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#1f1f1f', endColorstr='#403f40',GradientType=0); - background-color:#1f1f1f; + 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%); + background : -webkit-linear-gradient(top, #1f1f1f 5%, #403f40 100%); + background : -o-linear-gradient(top, #1f1f1f 5%, #403f40 100%); + background : -ms-linear-gradient(top, #1f1f1f 5%, #403f40 100%); + background : linear-gradient(to bottom, #1f1f1f 5%, #403f40 100%); + filter : progid:DXImageTransform.Microsoft.gradient(startColorstr='#1f1f1f', endColorstr='#403f40', GradientType=0); + background-color: #1f1f1f; } + button:active { - position:relative; - top:1px; + position: relative; + top : 1px; } - diff --git a/src/UI/MaterialEditor/Material.less b/src/UI/MaterialEditor/Material.less index 8a8e7ca8c..7b60d25e6 100644 --- a/src/UI/MaterialEditor/Material.less +++ b/src/UI/MaterialEditor/Material.less @@ -1,7 +1,7 @@ //材质球编辑器 样式文件. #modal { .texture-list { - height: calc(~"100% - 50px"); + height : calc(~"100% - 50px"); display: flex; padding: 0; @@ -10,11 +10,11 @@ } &>div:last-child { - flex: 1; - display: flex; - flex-wrap: wrap; + flex : 1; + display : flex; + flex-wrap : wrap; align-content: flex-start; - overflow: auto; + overflow : auto; h5 { width: 100%; @@ -23,26 +23,26 @@ } &>div>div { - text-align: center; - margin-right: 10px; + text-align : center; + margin-right : 10px; margin-bottom: 10px; - height: 150px; - position: relative; - box-shadow: none; - padding: 0; + height : 150px; + position : relative; + box-shadow : none; + padding : 0; .editor-content { &>label { display: flex; &>span { - text-align: left; + text-align : left; margin-right: 20px; } &>div { - display: flex; - margin: 0; + display : flex; + margin : 0; justify-content: space-between; &>label { @@ -62,8 +62,8 @@ .delete-btn { position: absolute; - top: 0; - right: 0; + top : 0; + right : 0; svg { color: #000; @@ -84,9 +84,9 @@ } .img-select-hint { - position: relative; + position : relative; user-select: none; - overflow: hidden; + overflow : hidden; } .img-select-hint:hover { @@ -94,22 +94,22 @@ } .img-select-hint:hover:before { - content: "双击选择图片"; + content : "双击选择图片"; position: absolute; - left: 0; - right: 0; - bottom: 0; - top: 0; - margin: auto; - width: max-content; - height: 33px; - opacity: 0.5; - z-index: 33; + left : 0; + right : 0; + bottom : 0; + top : 0; + margin : auto; + width : max-content; + height : 33px; + opacity : 0.5; + z-index : 33; } .select-shop { - margin: 3px; - display: flex; + margin : 3px; + display : flex; align-items: center; &>span { @@ -122,16 +122,16 @@ & .br-set>span:first-child { display: inline-block; - width: 60px !important; + width : 60px !important; } &>div { input { vertical-align: middle; - background: #fff; - border: none; - outline: none; - height: 22px; + background : #fff; + border : none; + outline : none; + height : 22px; } } @@ -139,20 +139,20 @@ } .search-shop { - position: fixed; - top: 112px; - right: 30px; - z-index: 35; - padding: 10px; + position : fixed; + top : 112px; + right : 30px; + z-index : 35; + padding : 10px; font-size: 16px; - width: 740px; - outline: 1px solid #ccc; + width : 740px; + outline : 1px solid #ccc; .title { display: flex; span { - width: 25%; + width : 25%; outline: 1px solid #ccc; padding: 5px 5px; } @@ -162,11 +162,11 @@ display: flex; span { - width: 25%; - overflow: hidden; + width : 25%; + overflow : hidden; text-overflow: ellipsis; - outline: 1px solid #ccc; - white-space: nowrap; + outline : 1px solid #ccc; + white-space : nowrap; } }