diff --git a/index.html b/index.html index 8cd966b..6e0ad68 100644 --- a/index.html +++ b/index.html @@ -6,7 +6,6 @@ heynote - diff --git a/public/font/hack/hack-bold.woff b/public/font/hack/hack-bold.woff new file mode 100644 index 0000000..368b913 Binary files /dev/null and b/public/font/hack/hack-bold.woff differ diff --git a/public/font/hack/hack-bold.woff2 b/public/font/hack/hack-bold.woff2 new file mode 100644 index 0000000..1155477 Binary files /dev/null and b/public/font/hack/hack-bold.woff2 differ diff --git a/public/font/hack/hack-bolditalic.woff b/public/font/hack/hack-bolditalic.woff new file mode 100644 index 0000000..ce87fe2 Binary files /dev/null and b/public/font/hack/hack-bolditalic.woff differ diff --git a/public/font/hack/hack-bolditalic.woff2 b/public/font/hack/hack-bolditalic.woff2 new file mode 100644 index 0000000..46ff1c4 Binary files /dev/null and b/public/font/hack/hack-bolditalic.woff2 differ diff --git a/public/font/hack/hack-italic.woff b/public/font/hack/hack-italic.woff new file mode 100644 index 0000000..bd545e4 Binary files /dev/null and b/public/font/hack/hack-italic.woff differ diff --git a/public/font/hack/hack-italic.woff2 b/public/font/hack/hack-italic.woff2 new file mode 100644 index 0000000..1e7630c Binary files /dev/null and b/public/font/hack/hack-italic.woff2 differ diff --git a/public/font/hack/hack-regular.woff b/public/font/hack/hack-regular.woff new file mode 100644 index 0000000..e835381 Binary files /dev/null and b/public/font/hack/hack-regular.woff differ diff --git a/public/font/hack/hack-regular.woff2 b/public/font/hack/hack-regular.woff2 new file mode 100644 index 0000000..524465c Binary files /dev/null and b/public/font/hack/hack-regular.woff2 differ diff --git a/public/font/open-sans/fonts/Bold/OpenSans-Bold.woff b/public/font/open-sans/fonts/Bold/OpenSans-Bold.woff new file mode 100644 index 0000000..c668e45 Binary files /dev/null and b/public/font/open-sans/fonts/Bold/OpenSans-Bold.woff differ diff --git a/public/font/open-sans/fonts/Bold/OpenSans-Bold.woff2 b/public/font/open-sans/fonts/Bold/OpenSans-Bold.woff2 new file mode 100644 index 0000000..c80b2d2 Binary files /dev/null and b/public/font/open-sans/fonts/Bold/OpenSans-Bold.woff2 differ diff --git a/public/font/open-sans/fonts/BoldItalic/OpenSans-BoldItalic.woff b/public/font/open-sans/fonts/BoldItalic/OpenSans-BoldItalic.woff new file mode 100644 index 0000000..ced8f69 Binary files /dev/null and b/public/font/open-sans/fonts/BoldItalic/OpenSans-BoldItalic.woff differ diff --git a/public/font/open-sans/fonts/BoldItalic/OpenSans-BoldItalic.woff2 b/public/font/open-sans/fonts/BoldItalic/OpenSans-BoldItalic.woff2 new file mode 100644 index 0000000..60d8de4 Binary files /dev/null and b/public/font/open-sans/fonts/BoldItalic/OpenSans-BoldItalic.woff2 differ diff --git a/public/font/open-sans/fonts/ExtraBold/OpenSans-ExtraBold.woff b/public/font/open-sans/fonts/ExtraBold/OpenSans-ExtraBold.woff new file mode 100644 index 0000000..412a01b Binary files /dev/null and b/public/font/open-sans/fonts/ExtraBold/OpenSans-ExtraBold.woff differ diff --git a/public/font/open-sans/fonts/ExtraBold/OpenSans-ExtraBold.woff2 b/public/font/open-sans/fonts/ExtraBold/OpenSans-ExtraBold.woff2 new file mode 100644 index 0000000..bbaa1d4 Binary files /dev/null and b/public/font/open-sans/fonts/ExtraBold/OpenSans-ExtraBold.woff2 differ diff --git a/public/font/open-sans/fonts/ExtraBoldItalic/OpenSans-ExtraBoldItalic.woff b/public/font/open-sans/fonts/ExtraBoldItalic/OpenSans-ExtraBoldItalic.woff new file mode 100644 index 0000000..6056847 Binary files /dev/null and b/public/font/open-sans/fonts/ExtraBoldItalic/OpenSans-ExtraBoldItalic.woff differ diff --git a/public/font/open-sans/fonts/ExtraBoldItalic/OpenSans-ExtraBoldItalic.woff2 b/public/font/open-sans/fonts/ExtraBoldItalic/OpenSans-ExtraBoldItalic.woff2 new file mode 100644 index 0000000..eff8367 Binary files /dev/null and b/public/font/open-sans/fonts/ExtraBoldItalic/OpenSans-ExtraBoldItalic.woff2 differ diff --git a/public/font/open-sans/fonts/Italic/OpenSans-Italic.woff b/public/font/open-sans/fonts/Italic/OpenSans-Italic.woff new file mode 100644 index 0000000..1ed8ab9 Binary files /dev/null and b/public/font/open-sans/fonts/Italic/OpenSans-Italic.woff differ diff --git a/public/font/open-sans/fonts/Italic/OpenSans-Italic.woff2 b/public/font/open-sans/fonts/Italic/OpenSans-Italic.woff2 new file mode 100644 index 0000000..440b74c Binary files /dev/null and b/public/font/open-sans/fonts/Italic/OpenSans-Italic.woff2 differ diff --git a/public/font/open-sans/fonts/Light/OpenSans-Light.woff b/public/font/open-sans/fonts/Light/OpenSans-Light.woff new file mode 100644 index 0000000..937323d Binary files /dev/null and b/public/font/open-sans/fonts/Light/OpenSans-Light.woff differ diff --git a/public/font/open-sans/fonts/Light/OpenSans-Light.woff2 b/public/font/open-sans/fonts/Light/OpenSans-Light.woff2 new file mode 100644 index 0000000..d0b43e0 Binary files /dev/null and b/public/font/open-sans/fonts/Light/OpenSans-Light.woff2 differ diff --git a/public/font/open-sans/fonts/LightItalic/OpenSans-LightItalic.woff b/public/font/open-sans/fonts/LightItalic/OpenSans-LightItalic.woff new file mode 100644 index 0000000..bc83d1d Binary files /dev/null and b/public/font/open-sans/fonts/LightItalic/OpenSans-LightItalic.woff differ diff --git a/public/font/open-sans/fonts/LightItalic/OpenSans-LightItalic.woff2 b/public/font/open-sans/fonts/LightItalic/OpenSans-LightItalic.woff2 new file mode 100644 index 0000000..21a92a7 Binary files /dev/null and b/public/font/open-sans/fonts/LightItalic/OpenSans-LightItalic.woff2 differ diff --git a/public/font/open-sans/fonts/Regular/OpenSans-Regular.woff b/public/font/open-sans/fonts/Regular/OpenSans-Regular.woff new file mode 100644 index 0000000..bd0f824 Binary files /dev/null and b/public/font/open-sans/fonts/Regular/OpenSans-Regular.woff differ diff --git a/public/font/open-sans/fonts/Regular/OpenSans-Regular.woff2 b/public/font/open-sans/fonts/Regular/OpenSans-Regular.woff2 new file mode 100644 index 0000000..f778f9c Binary files /dev/null and b/public/font/open-sans/fonts/Regular/OpenSans-Regular.woff2 differ diff --git a/public/font/open-sans/fonts/Semibold/OpenSans-Semibold.woff b/public/font/open-sans/fonts/Semibold/OpenSans-Semibold.woff new file mode 100644 index 0000000..8c0313f Binary files /dev/null and b/public/font/open-sans/fonts/Semibold/OpenSans-Semibold.woff differ diff --git a/public/font/open-sans/fonts/Semibold/OpenSans-Semibold.woff2 b/public/font/open-sans/fonts/Semibold/OpenSans-Semibold.woff2 new file mode 100644 index 0000000..852f710 Binary files /dev/null and b/public/font/open-sans/fonts/Semibold/OpenSans-Semibold.woff2 differ diff --git a/public/font/open-sans/fonts/SemiboldItalic/OpenSans-SemiboldItalic.woff b/public/font/open-sans/fonts/SemiboldItalic/OpenSans-SemiboldItalic.woff new file mode 100644 index 0000000..90351a2 Binary files /dev/null and b/public/font/open-sans/fonts/SemiboldItalic/OpenSans-SemiboldItalic.woff differ diff --git a/public/font/open-sans/fonts/SemiboldItalic/OpenSans-SemiboldItalic.woff2 b/public/font/open-sans/fonts/SemiboldItalic/OpenSans-SemiboldItalic.woff2 new file mode 100644 index 0000000..b0c2a26 Binary files /dev/null and b/public/font/open-sans/fonts/SemiboldItalic/OpenSans-SemiboldItalic.woff2 differ diff --git a/public/font/open-sans/open-sans.scss b/public/font/open-sans/open-sans.scss new file mode 100644 index 0000000..978d9be --- /dev/null +++ b/public/font/open-sans/open-sans.scss @@ -0,0 +1,12 @@ +@import "sass/variables"; +@import "sass/mixins"; +@import "sass/Light"; +@import "sass/LightItalic"; +@import "sass/Regular"; +@import "sass/Italic"; +@import "sass/Semibold"; +@import "sass/SemiboldItalic"; +@import "sass/Bold"; +@import "sass/BoldItalic"; +@import "sass/ExtraBold"; +@import "sass/ExtraBoldItalic"; diff --git a/public/font/open-sans/sass/.gitignore b/public/font/open-sans/sass/.gitignore new file mode 100644 index 0000000..e6037df --- /dev/null +++ b/public/font/open-sans/sass/.gitignore @@ -0,0 +1,4 @@ +# Ignore everything in this directory +# * +# Except this file +!.gitignore diff --git a/public/font/open-sans/sass/_Bold.scss b/public/font/open-sans/sass/_Bold.scss new file mode 100755 index 0000000..2d9ada4 --- /dev/null +++ b/public/font/open-sans/sass/_Bold.scss @@ -0,0 +1,8 @@ +/* BEGIN Bold */ +@font-face { + font-family: 'Open Sans'; + @include fontdef($OpenSansPath, $OpenSansVersion, "Bold"); + font-weight: bold; + font-style: normal; +} +/* END Bold */ diff --git a/public/font/open-sans/sass/_BoldItalic.scss b/public/font/open-sans/sass/_BoldItalic.scss new file mode 100755 index 0000000..4ebf86f --- /dev/null +++ b/public/font/open-sans/sass/_BoldItalic.scss @@ -0,0 +1,8 @@ +/* BEGIN Bold Italic */ +@font-face { + font-family: 'Open Sans'; + @include fontdef($OpenSansPath, $OpenSansVersion, "BoldItalic"); + font-weight: bold; + font-style: italic; +} +/* END Bold Italic */ diff --git a/public/font/open-sans/sass/_ExtraBold.scss b/public/font/open-sans/sass/_ExtraBold.scss new file mode 100755 index 0000000..63a1c73 --- /dev/null +++ b/public/font/open-sans/sass/_ExtraBold.scss @@ -0,0 +1,8 @@ +/* BEGIN Extrabold */ +@font-face { + font-family: 'Open Sans'; + @include fontdef($OpenSansPath, $OpenSansVersion, "ExtraBold"); + font-weight: 800; + font-style: normal; +} +/* END Extrabold */ diff --git a/public/font/open-sans/sass/_ExtraBoldItalic.scss b/public/font/open-sans/sass/_ExtraBoldItalic.scss new file mode 100755 index 0000000..d786bd2 --- /dev/null +++ b/public/font/open-sans/sass/_ExtraBoldItalic.scss @@ -0,0 +1,8 @@ +/* BEGIN Extrabold Italic */ +@font-face { + font-family: 'Open Sans'; + @include fontdef($OpenSansPath, $OpenSansVersion, "ExtraBoldItalic"); + font-weight: 800; + font-style: italic; +} +/* END Extrabold Italic */ diff --git a/public/font/open-sans/sass/_Italic.scss b/public/font/open-sans/sass/_Italic.scss new file mode 100755 index 0000000..0aab00c --- /dev/null +++ b/public/font/open-sans/sass/_Italic.scss @@ -0,0 +1,8 @@ +/* BEGIN Italic */ +@font-face { + font-family: 'Open Sans'; + @include fontdef($OpenSansPath, $OpenSansVersion, "Italic"); + font-weight: normal; + font-style: italic; +} +/* END Italic */ diff --git a/public/font/open-sans/sass/_Light.scss b/public/font/open-sans/sass/_Light.scss new file mode 100755 index 0000000..3b3f194 --- /dev/null +++ b/public/font/open-sans/sass/_Light.scss @@ -0,0 +1,8 @@ +/* BEGIN Light */ +@font-face { + font-family: 'Open Sans'; + @include fontdef($OpenSansPath, $OpenSansVersion, "Light"); + font-weight: 300; + font-style: normal; +} +/* END Light */ diff --git a/public/font/open-sans/sass/_LightItalic.scss b/public/font/open-sans/sass/_LightItalic.scss new file mode 100755 index 0000000..389cd90 --- /dev/null +++ b/public/font/open-sans/sass/_LightItalic.scss @@ -0,0 +1,8 @@ +/* BEGIN Light Italic */ +@font-face { + font-family: 'Open Sans'; + @include fontdef($OpenSansPath, $OpenSansVersion, "LightItalic"); + font-weight: 300; + font-style: italic; +} +/* END Light Italic */ diff --git a/public/font/open-sans/sass/_Regular.scss b/public/font/open-sans/sass/_Regular.scss new file mode 100755 index 0000000..352f2e5 --- /dev/null +++ b/public/font/open-sans/sass/_Regular.scss @@ -0,0 +1,8 @@ +/* BEGIN Regular */ +@font-face { + font-family: 'Open Sans'; + @include fontdef($OpenSansPath, $OpenSansVersion, "Regular"); + font-weight: normal; + font-style: normal; +} +/* END Regular */ diff --git a/public/font/open-sans/sass/_Semibold.scss b/public/font/open-sans/sass/_Semibold.scss new file mode 100755 index 0000000..9292ee1 --- /dev/null +++ b/public/font/open-sans/sass/_Semibold.scss @@ -0,0 +1,8 @@ +/* BEGIN Semibold */ +@font-face { + font-family: 'Open Sans'; + @include fontdef($OpenSansPath, $OpenSansVersion, "Semibold"); + font-weight: 600; + font-style: normal; +} +/* END Semibold */ diff --git a/public/font/open-sans/sass/_SemiboldItalic.scss b/public/font/open-sans/sass/_SemiboldItalic.scss new file mode 100755 index 0000000..afbb9fa --- /dev/null +++ b/public/font/open-sans/sass/_SemiboldItalic.scss @@ -0,0 +1,8 @@ +/* BEGIN Semibold Italic */ +@font-face { + font-family: 'Open Sans'; + @include fontdef($OpenSansPath, $OpenSansVersion, "SemiboldItalic"); + font-weight: 600; + font-style: italic; +} +/* END Semibold Italic */ diff --git a/public/font/open-sans/sass/_mixins.scss b/public/font/open-sans/sass/_mixins.scss new file mode 100644 index 0000000..84800dd --- /dev/null +++ b/public/font/open-sans/sass/_mixins.scss @@ -0,0 +1,4 @@ +@mixin fontdef($OpenSansPath, $OpenSansVersion, $FontType:"Regular") { + src: url('#{$OpenSansPath}/#{$FontType}/OpenSans-#{$FontType}.woff2?v=#{$OpenSansVersion}') format('woff2'), + url('#{$OpenSansPath}/#{$FontType}/OpenSans-#{$FontType}.woff?v=#{$OpenSansVersion}') format('woff'); +} diff --git a/public/font/open-sans/sass/_variables.scss b/public/font/open-sans/sass/_variables.scss new file mode 100755 index 0000000..03720c5 --- /dev/null +++ b/public/font/open-sans/sass/_variables.scss @@ -0,0 +1,2 @@ +$OpenSansPath: "/font/open-sans/fonts" !default; +$OpenSansVersion: "1.1.0" !default; diff --git a/public/font/open-sans/sass/open-sans.scss b/public/font/open-sans/sass/open-sans.scss new file mode 100755 index 0000000..22dbbe8 --- /dev/null +++ b/public/font/open-sans/sass/open-sans.scss @@ -0,0 +1,12 @@ +@import "variables"; +@import "mixins"; +@import "Light"; +@import "LightItalic"; +@import "Regular"; +@import "Italic"; +@import "Semibold"; +@import "SemiboldItalic"; +@import "Bold"; +@import "BoldItalic"; +@import "ExtraBold"; +@import "ExtraBoldItalic"; diff --git a/src/components/StatusBar.vue b/src/components/StatusBar.vue index 2d7654e..7e9a8c6 100644 --- a/src/components/StatusBar.vue +++ b/src/components/StatusBar.vue @@ -116,10 +116,10 @@ +dark-mode opacity: 0.9 &.dark - background-image: url("/icons/dark-mode.png") + background-image: url("icons/dark-mode.png") &.light - background-image: url("/icons/light-mode.png") + background-image: url("icons/light-mode.png") &.system - background-image: url("/icons/both-mode.png") + background-image: url("icons/both-mode.png") diff --git a/src/css/application.sass b/src/css/application.sass new file mode 100644 index 0000000..aca682d --- /dev/null +++ b/src/css/application.sass @@ -0,0 +1,2 @@ +@import "font" +@import "base" diff --git a/src/css/base.sass b/src/css/base.sass new file mode 100644 index 0000000..8c5074f --- /dev/null +++ b/src/css/base.sass @@ -0,0 +1,23 @@ +html, body + margin: 0 + padding: 0 + background: #fff + color: #444 + font-family: 'Gill Sans','Gill Sans MT',Calibri,'Trebuchet MS',sans-serif + height: 100% + font-size: 12px + overscroll-behavior-y: none + +#app + height: 100% + width: 100% + +.editor + height: 100% + .cm-editor + height: 100% + +#syntaxTree + height: 20% + overflow-y: auto + diff --git a/src/css/font.sass b/src/css/font.sass new file mode 100644 index 0000000..08ee201 --- /dev/null +++ b/src/css/font.sass @@ -0,0 +1,27 @@ +@font-face + font-family: 'Hack' + src: url('/font/hack/hack-regular.woff2') format('woff2'), url('/font/hack/hack-regular.woff') format('woff') + font-weight: 400 + font-style: normal + + +@font-face + font-family: 'Hack' + src: url('/font/hack/hack-bold.woff2') format('woff2'), url('/font/hack/hack-bold.woff') format('woff') + font-weight: 700 + font-style: normal + +@font-face + font-family: 'Hack' + src: url('/font/hack/hack-italic.woff2') format('woff2'), url('/font/hack/hack-italic.woff') format('woff') + font-weight: 400 + font-style: italic + +@font-face + font-family: 'Hack' + src: url('/font/hack/hack-bolditalic.woff2') format('woff2'), url('/font/hack/hack-bolditalic.woff') format('woff') + font-weight: 700 + font-style: italic + + +@import "~/../public/font/open-sans/open-sans" diff --git a/src/editor/styles.css b/src/editor/styles.css deleted file mode 100644 index 2e1f9dd..0000000 --- a/src/editor/styles.css +++ /dev/null @@ -1,28 +0,0 @@ -html, -body { - margin: 0; - padding: 0; - background: #fff; - color: #444; - font-family: 'Gill Sans','Gill Sans MT',Calibri,'Trebuchet MS',sans-serif; - height: 100%; - font-size: 12px; - overscroll-behavior-y: none; -} - -#app { - height: 100%; - width: 100%; -} - -.editor { - height: 100%; -} -.editor .cm-editor { - height: 100%; -} - -#syntaxTree { - height: 20%; - overflow-y: auto; -} diff --git a/src/editor/theme/base.js b/src/editor/theme/base.js index 421f8af..1bcbe77 100644 --- a/src/editor/theme/base.js +++ b/src/editor/theme/base.js @@ -9,7 +9,7 @@ export const heynoteBase = EditorView.theme({ paddingTop: 4, }, '.cm-scroller': { - fontFamily: "Menlo, Monaco, 'Courier New', monospace", + fontFamily: "Hack, Menlo, Monaco, 'Courier New', monospace", }, '.cm-gutters': { padding: '0 2px 0 4px', diff --git a/src/main.js b/src/main.js index fb139b1..f6a9a96 100644 --- a/src/main.js +++ b/src/main.js @@ -1,3 +1,5 @@ +import './css/application.sass' + import { createApp } from 'vue' import App from './App.vue'