cxc/yshop-pro-vue3
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

解决代码冲突

Browse Source
This commit is contained in:
黄少君
2023-11-14 17:57:33 +08:00
parent 3b2609e9a6
commit 12742d345f
231 changed files with 180 additions and 143121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
public/UEditor/third-party/webuploader/webuploader.css vendored
View File

@ -1,33 +1,3 @@
<<<<<<< HEAD
.webuploader-container {
position: relative;
}
.webuploader-element-invisible {
position: absolute !important;
clip: rect(1px 1px 1px 1px); /* IE6, IE7 */
clip: rect(1px,1px,1px,1px);
}
.webuploader-pick {
position: relative;
display: inline-block;
cursor: pointer;
background: #00b7ee;
padding: 10px 15px;
color: #fff;
text-align: center;
border-radius: 3px;
overflow: hidden;
}
.webuploader-pick-hover {
background: #00a2d4;
}
.webuploader-pick-disable {
opacity: 0.6;
pointer-events:none;
}
=======
.webuploader-container {
position: relative;
}
@ -56,4 +26,3 @@
pointer-events:none;
}
>>>>>>> master