diff --git a/.gitignore b/.gitignore index 75ef73c..a768e75 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ node_modules dist out +.history .DS_Store .eslintcache *.log* diff --git a/src/renderer/components.d.ts b/src/renderer/components.d.ts index d8deeea..31faf23 100644 --- a/src/renderer/components.d.ts +++ b/src/renderer/components.d.ts @@ -8,6 +8,8 @@ export {} /* prettier-ignore */ declare module 'vue' { export interface GlobalComponents { + BaseDialog: typeof import('./src/components/dialog/baseDialog.vue')['default'] + Dialog: typeof import('./src/components/dialog/index.vue')['default'] Directory: typeof import('./src/components/dialog/directory.vue')['default'] ElButton: typeof import('element-plus/es')['ElButton'] ElCheckbox: typeof import('element-plus/es')['ElCheckbox'] diff --git a/src/renderer/src/assets/iconfont/Ali-mother-counts-bold.ttf b/src/renderer/src/assets/iconfont/Ali-mother-counts-bold.ttf new file mode 100644 index 0000000..854c844 Binary files /dev/null and b/src/renderer/src/assets/iconfont/Ali-mother-counts-bold.ttf differ diff --git a/src/renderer/src/assets/iconfont/sy-boldface.otf b/src/renderer/src/assets/iconfont/sy-boldface.otf new file mode 100644 index 0000000..3cb9336 Binary files /dev/null and b/src/renderer/src/assets/iconfont/sy-boldface.otf differ diff --git a/src/renderer/src/assets/styles/font.css b/src/renderer/src/assets/styles/font.css index b09da8a..805c283 100644 --- a/src/renderer/src/assets/styles/font.css +++ b/src/renderer/src/assets/styles/font.css @@ -29,3 +29,13 @@ /* src: url('./your-font-file.woff') format('woff'); */ /* src: url('./your-font-file.eot') format('embedded-opentype'); */ } + +@font-face { + font-family: 'sy-boldface'; + src: url('../fonts/sy-boldface.otf') format('opentype'); +} + +@font-face { + font-family: 'Ali-mother-counts-bold'; + src: url('../fonts/Ali-mother-counts-bold.ttf') format('truetype'); +} diff --git a/src/renderer/src/components/dialog/baseDialog.vue b/src/renderer/src/components/dialog/baseDialog.vue new file mode 100644 index 0000000..0443506 --- /dev/null +++ b/src/renderer/src/components/dialog/baseDialog.vue @@ -0,0 +1,264 @@ + + + + + diff --git a/src/renderer/src/views/components/bottomSide/bottomSide.vue b/src/renderer/src/views/components/bottomSide/bottomSide.vue index 642902e..64b1599 100644 --- a/src/renderer/src/views/components/bottomSide/bottomSide.vue +++ b/src/renderer/src/views/components/bottomSide/bottomSide.vue @@ -20,7 +20,9 @@ \ No newline at end of file diff --git a/src/renderer/src/views/home/index.vue b/src/renderer/src/views/home/index.vue index b1ff2a4..9c912c0 100644 --- a/src/renderer/src/views/home/index.vue +++ b/src/renderer/src/views/home/index.vue @@ -3,6 +3,7 @@
+ @@ -12,6 +13,7 @@