Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
74d6d45150
7 changed files with 15 additions and 15 deletions
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"name": "crimata-electron",
|
||||
"name": "crimata-messenger",
|
||||
"version": "0.1.0",
|
||||
"private": true,
|
||||
"scripts": {
|
||||
|
|
@ -11,7 +11,7 @@
|
|||
"electron:build": "vue-cli-service electron:build",
|
||||
"electron:serve": "vue-cli-service electron:serve",
|
||||
"postinstall": "electron-builder install-app-deps",
|
||||
"postuninstall": "electron-builder install-app-deps"
|
||||
"postuninstal": "electron-builder install-app-deps"
|
||||
},
|
||||
"main": "background.js",
|
||||
"dependencies": {
|
||||
|
|
|
|||
|
|
@ -33,8 +33,9 @@ protocol.registerSchemesAsPrivileged([
|
|||
function createWindow() {
|
||||
// Create the browser window.
|
||||
win = new BrowserWindow({
|
||||
width: 650,
|
||||
height: 1200,
|
||||
width: 350,
|
||||
height: 525,
|
||||
resizable: false,
|
||||
webPreferences: {
|
||||
// Use pluginOptions.nodeIntegration, leave this alone
|
||||
// See nklayman.github.io/vue-cli-plugin-electron-builder/guide/security.html#node-integration for more info
|
||||
|
|
@ -47,7 +48,7 @@ function createWindow() {
|
|||
if (process.env.WEBPACK_DEV_SERVER_URL) {
|
||||
// Load the url of the dev server if in development mode
|
||||
win.loadURL(process.env.WEBPACK_DEV_SERVER_URL as string);
|
||||
if (!process.env.IS_TEST) win.webContents.openDevTools();
|
||||
// if (!process.env.IS_TEST) win.webContents.openDevTools();
|
||||
} else {
|
||||
createProtocol("app");
|
||||
// Load the index.html when not in development
|
||||
|
|
|
|||
|
|
@ -26,7 +26,6 @@
|
|||
data-name="Rectangle 410"
|
||||
width="350"
|
||||
height="500"
|
||||
rx="20"
|
||||
fill="url(#radial-gradient)"
|
||||
/>
|
||||
</g>
|
||||
|
|
|
|||
|
|
@ -91,7 +91,7 @@ div[contenteditable] {
|
|||
border: 0;
|
||||
border-radius: 20px;
|
||||
color: #fff;
|
||||
background-color: #61b4f4;
|
||||
background-color: #585858;
|
||||
font-size: 14;
|
||||
text-align: left;
|
||||
p {
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
<AI />
|
||||
<MessageRenderer />
|
||||
<InputItem />
|
||||
<TitleBar />
|
||||
<!-- <TitleBar /> -->
|
||||
</svg>
|
||||
</template>
|
||||
|
||||
|
|
@ -54,6 +54,6 @@ export default defineComponent({
|
|||
height: 500px;
|
||||
background-color: #e6e6e6;
|
||||
box-shadow: 0px 3px 10px 0px rgba(0, 0, 0, 0.3);
|
||||
border-radius: 20px;
|
||||
// border-radius: 20px;
|
||||
}
|
||||
</style>
|
||||
|
|
|
|||
|
|
@ -33,10 +33,10 @@ export default function useMessageItemComp(m: string, id: string) {
|
|||
|
||||
const textFill = computed(() => {
|
||||
switch (m) {
|
||||
case "fr":
|
||||
return "#000";
|
||||
default:
|
||||
case "sf":
|
||||
return "#fff";
|
||||
default:
|
||||
return "#000";
|
||||
}
|
||||
});
|
||||
|
||||
|
|
@ -45,7 +45,7 @@ export default function useMessageItemComp(m: string, id: string) {
|
|||
case "sf":
|
||||
return "#61b4f4";
|
||||
case "ai":
|
||||
return "#585858";
|
||||
return "#DDDDDD";
|
||||
default:
|
||||
return "#fff";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -23,8 +23,8 @@ export default function useOffsetCalculator() {
|
|||
|
||||
const calculateMessageOffsets = (msg: HTMLElement) => {
|
||||
const msgRect = msg.getBoundingClientRect();
|
||||
setXoffset(msg)
|
||||
setYoffset(msgRect.height)
|
||||
setXoffset(msg);
|
||||
setYoffset(msgRect.height);
|
||||
const offsets = {
|
||||
x: xOffset.value as number,
|
||||
y: yOffset.value as number
|
||||
|
|
|
|||
Loading…
Reference in a new issue