Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
"axios": "^0.26.1",
"date-fns": "^2.28.0",
"electron-store": "^8.0.1",
"floating-vue": "^2.0.0-beta.17",
"fs-extra": "^10.0.1",
"highlight.js": "^11.5.1",
"html2canvas": "^1.4.1",
Expand Down
30 changes: 30 additions & 0 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion src/main/services/i18n/locales/en/common.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,5 +50,7 @@
"darkMode": "Dark Mode",
"background": "Background",
"restartApp": "Restart massCode",
"updateAvailable": "Update Available"
"updateAvailable": "Update Available",
"hide": "Hide",
"show": "Show"
}
1 change: 1 addition & 0 deletions src/main/services/i18n/locales/en/menu.json
Original file line number Diff line number Diff line change
Expand Up @@ -63,5 +63,6 @@
"format": "Format",
"previewMarkdown": "Preview Markdown",
"previewCode": "Preview Code",
"previewScreenshot": "Preview Screenshot"
}
}
4 changes: 3 additions & 1 deletion src/main/services/i18n/locales/ru/common.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,5 +49,7 @@
"darkMode": "Темный режим",
"background": "Фон",
"restartApp": "Перезагрузить massCode",
"updateAvailable": "Доступно обновление"
"updateAvailable": "Доступно обновление",
"hide": "Hide",
"show": "Show"
}
3 changes: 2 additions & 1 deletion src/main/services/i18n/locales/ru/menu.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@
"copy": "Скопировать сниппет в буфер",
"format": "Форматировать",
"previewMarkdown": "Просмотр Markdown",
"previewCode": "Просмотр результата HTML/CSS"
"previewCode": "Просмотр результата HTML/CSS",
"previewScreenshot": "Просмотр скриншота"
}
}
18 changes: 16 additions & 2 deletions src/renderer/assets/scss/vendor.scss
Original file line number Diff line number Diff line change
Expand Up @@ -64,11 +64,25 @@

.toast-container {
.toast {

width: 400px;
&-text {
display: flex;
align-items: center;
}
}
}
}

.v-popper {
&--theme-tooltip {
.v-popper {
&__inner {
font-size: 12px;
padding: 4px 8px !important;
border-radius: 3px !important;
}
&__arrow-container {
display: none;
}
}
}
}
2 changes: 1 addition & 1 deletion src/renderer/components/sidebar/TheSidebar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
type="folders"
>
<template #action>
<AppActionButton>
<AppActionButton v-tooltip="i18n.t('newFolder')">
<UniconsPlus @click="onAddNewFolder" />
</AppActionButton>
</template>
Expand Down
33 changes: 29 additions & 4 deletions src/renderer/components/snippets/SnippetHeader.vue
Original file line number Diff line number Diff line change
Expand Up @@ -12,23 +12,48 @@
<div class="action">
<AppActionButton
v-if="snippetStore.currentLanguage === 'markdown'"
v-tooltip="
!snippetStore.isMarkdownPreview
? i18n.t('menu:editor.previewMarkdown')
: i18n.t('hide') + ' ' + i18n.t('menu:editor.previewMarkdown')
"
@click="onClickMarkdownPreview"
>
<UniconsEye v-if="!snippetStore.isMarkdownPreview" />
<UniconsEyeSlash v-else />
</AppActionButton>
<AppActionButton @click="onClickScreenshotPreview">
<AppActionButton
v-tooltip="
!snippetStore.isScreenshotPreview
? i18n.t('menu:editor.previewScreenshot')
: i18n.t('hide') + ' ' + i18n.t('menu:editor.previewScreenshot')
"
@click="onClickScreenshotPreview"
>
<UniconsCamera v-if="!snippetStore.isScreenshotPreview" />
<UniconsCameraSlash v-else />
</AppActionButton>
<AppActionButton @click="onCodePreview">
<AppActionButton
v-tooltip="
!snippetStore.isCodePreview
? i18n.t('menu:editor.previewCode')
: i18n.t('hide') + ' ' + i18n.t('menu:editor.previewCode')
"
@click="onCodePreview"
>
<SvgArrowSlash v-if="snippetStore.isCodePreview" />
<UniconsArrow v-else />
</AppActionButton>
<AppActionButton @click="onAddDescription">
<AppActionButton
v-tooltip="i18n.t('addDescription')"
@click="onAddDescription"
>
<UniconsText />
</AppActionButton>
<AppActionButton @click="onAddNewFragment">
<AppActionButton
v-tooltip="i18n.t('newFragment')"
@click="onAddNewFragment"
>
<UniconsPlus />
</AppActionButton>
</div>
Expand Down
1 change: 1 addition & 0 deletions src/renderer/components/snippets/SnippetListHeader.vue
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
>
<AppActionButton
v-if="!query"
v-tooltip="i18n.t('newSnippet')"
class="item"
@click="onAddNewSnippet"
>
Expand Down
3 changes: 3 additions & 0 deletions src/renderer/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,12 @@ import PerfectScrollbar from 'vue3-perfect-scrollbar'
import 'vue3-perfect-scrollbar/dist/vue3-perfect-scrollbar.css'
import 'vercel-toast/dist/vercel-toast.css'
import './assets/scss/main.scss'
import FloatingVue from 'floating-vue'
import 'floating-vue/dist/style.css'

createApp(App)
.use(createPinia())
.use(router)
.use(PerfectScrollbar)
.use(FloatingVue)
.mount('#app')
5 changes: 4 additions & 1 deletion src/renderer/views/Preferences.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,10 @@
<div class="preferences">
<div class="title">
<h3>{{ i18n.t('preferences:title') }}</h3>
<AppActionButton @click="toHome">
<AppActionButton
v-tooltip="i18n.t('close')"
@click="toHome"
>
<UniconsTimes />
</AppActionButton>
</div>
Expand Down