Skip to content

Commit c5b8d66

Browse files
fix: refactor color picker
1 parent 7f59c82 commit c5b8d66

File tree

2 files changed

+12
-100
lines changed

2 files changed

+12
-100
lines changed

frontend/express/public/core/app-management/stylesheets/_main.scss

+2-2
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
}
8686
}
8787
&__colorpicker{
88-
.picker-body {overflow: auto;}
88+
.cly-vue-color-picker__picker {overflow: auto;}
8989
}
9090
&__button{
9191
&:active, &:focus, &:hover {background-color: unset !important;border-color: unset !important;}
@@ -193,4 +193,4 @@
193193
width: 177%;
194194
}
195195
}
196-
}
196+
}

frontend/express/public/stylesheets/vue/clyvue.scss

+10-98
Original file line numberDiff line numberDiff line change
@@ -1211,10 +1211,10 @@
12111211

12121212
background-color: #ffffff;
12131213

1214-
display: flex;
1214+
/* display: flex;
12151215
flex-direction: column;
12161216
align-items: flex-start;
1217-
justify-content: center;
1217+
justify-content: center; */
12181218

12191219
// .cly-vue-color-picker__body .vc-sketch
12201220
& .vc-sketch {
@@ -1254,6 +1254,14 @@
12541254
}
12551255
}
12561256

1257+
// .cly-vue-color-picker__buttons-container
1258+
&__buttons-container {
1259+
display: flex;
1260+
align-items: center;
1261+
justify-content: flex-end;
1262+
padding-right: 12px;
1263+
}
1264+
12571265
// .cly-vue-color-picker__input
12581266
&__input {
12591267
box-sizing: border-box;
@@ -1349,92 +1357,6 @@
13491357
width: 16px;
13501358
height: 16px;
13511359
}
1352-
1353-
1354-
1355-
/* OLD Code */
1356-
$cp-preview-height: 32px;
1357-
$cp-preview-width: 138px;
1358-
$cp-preview-border-size: 1px;
1359-
$cp-picker-body-size: 251px;
1360-
$cp-picker-body-padding: 12px;
1361-
/* display: flex; */
1362-
/* height: #{$cp-preview-height}; */
1363-
1364-
1365-
.picker-body {
1366-
&--left{
1367-
left:0
1368-
}
1369-
&--right{
1370-
left: #{-$cp-preview-width};
1371-
}
1372-
/* position: relative; */
1373-
/* box-shadow: 0 3px 7px rgba(0, 0, 0, 0.08); */
1374-
/* border: 1px solid #d0d0d0; */
1375-
/* border-radius: 2px; */
1376-
/* width: 275px;
1377-
height: 415px; */
1378-
/* background-color: #ffffff; */
1379-
/* top: #{$cp-preview-height}; */
1380-
/* z-index: 9999; */
1381-
/* > .vc-sketch {
1382-
background-color: transparent;
1383-
padding: #{$cp-picker-body-padding};
1384-
box-shadow: none;
1385-
border: none;
1386-
border-radius: 0;
1387-
width: #{$cp-picker-body-size};
1388-
.vc-sketch-saturation-wrap {
1389-
height: #{$cp-picker-body-size - 180px};
1390-
bottom: #{$cp-picker-body-padding};
1391-
.vc-saturation {
1392-
height: #{$cp-picker-body-size};
1393-
}
1394-
}
1395-
.vc-sketch-presets {
1396-
display: none;
1397-
}
1398-
} */
1399-
.button-controls {
1400-
float: right;
1401-
padding-right: #{$cp-picker-body-padding};
1402-
}
1403-
}
1404-
/* .preview { */
1405-
/* float: right;
1406-
outline: none;
1407-
color: #000;
1408-
font-size: 12px;
1409-
padding-left: 8px;
1410-
1411-
display: flex; */
1412-
1413-
/* box-sizing: border-box;
1414-
width: 138px;
1415-
height: 32px;
1416-
cursor: pointer; */
1417-
/* div {
1418-
margin-top: 5px;
1419-
position: relative;
1420-
img {
1421-
position: absolute;
1422-
}
1423-
} */
1424-
/* .drop {
1425-
width:16px;
1426-
height:16px;
1427-
margin-right:10px;
1428-
position:absolute;
1429-
} */
1430-
/* .color-input {
1431-
border-style:none;
1432-
width:57px;
1433-
margin-left:24px;
1434-
margin-right:24px;
1435-
font-size: 14px;
1436-
} */
1437-
/* } */
14381360
}
14391361

14401362
// check
@@ -4603,16 +4525,6 @@
46034525
width: auto;
46044526
box-shadow: none;
46054527

4606-
// .cly-vue-content-builder-sidebar-input__component.cly-vue-color-picker
4607-
&.cly-vue-color-picker {
4608-
// .cly-vue-content-builder-sidebar-input__component.cly-vue-color-picker .picker-body
4609-
& .picker-body {
4610-
position: absolute;
4611-
right: 0;
4612-
left: auto;
4613-
}
4614-
}
4615-
46164528
// .cly-vue-content-builder-sidebar-input__component .el-input__inner
46174529
& .el-input__inner {
46184530
font-size: 14px;

0 commit comments

Comments
 (0)