diff --git a/.github/CHANGELOG.md b/.github/CHANGELOG.md index 235a0eb2..a2c2adc8 100644 --- a/.github/CHANGELOG.md +++ b/.github/CHANGELOG.md @@ -7,6 +7,9 @@ **:butterfly:Optimization** - Respect existing image title if no source is specified (#562) +- Separate font and font size for code blocks and source code mode (#373, #467) +- Opened files and opened directories/files can now be folded (#475, #602) +- You can now hide the quick insert hint (#621) **:beetle:Bug fix** @@ -16,6 +19,8 @@ - Restore default Mark Text style after exporting/printing - Prevent enter key as language identifier (#569) - Allow pasting text into the code block language text-box (#553) +- Fixed a crash when opening a directory with an unknown file extension +- Fixed an issue with `Save all` and `Delete all` buttons in the side bar ### 0.13.65 diff --git a/src/main/window.js b/src/main/window.js index 228636ae..ba7bad5e 100644 --- a/src/main/window.js +++ b/src/main/window.js @@ -6,6 +6,7 @@ import appMenu from './menu' import Watcher from './watcher' import { isMarkdownFile, isDirectory, log } from './utils' import { TITLE_BAR_HEIGHT, defaultWinOptions, isLinux } from './config' +import userPreference from './preference' class AppWindow { constructor () { @@ -151,12 +152,20 @@ class AppWindow { win.webContents.send('AGANI::ask-for-close') }) + // set renderer arguments + const { codeFontFamily, codeFontSize, theme } = userPreference.getAll() + win.stylePrefs = { + codeFontFamily, + codeFontSize, + theme + } + const winURL = process.env.NODE_ENV === 'development' ? `http://localhost:9080` : `file://${__dirname}/index.html` win.loadURL(winURL) - win.setSheetOffset(TITLE_BAR_HEIGHT) // 21 is the title bar height + win.setSheetOffset(TITLE_BAR_HEIGHT) return win } diff --git a/src/muya/lib/assets/styles/index.css b/src/muya/lib/assets/styles/index.css index fd4f73c5..378acf77 100644 --- a/src/muya/lib/assets/styles/index.css +++ b/src/muya/lib/assets/styles/index.css @@ -58,7 +58,7 @@ pre { font-style: italic; } -p.ag-paragraph.ag-active > span.ag-line:first-of-type:empty::after { +div.editor-wrapper:not(.hide-quick-insert-hint) p.ag-paragraph.ag-active > span.ag-line:first-of-type:empty::after { content: 'Type @ to insert'; color: var(--placeholerColor); } diff --git a/src/muya/themes/dark.css b/src/muya/themes/dark.css index bc97edaa..527d367a 100755 --- a/src/muya/themes/dark.css +++ b/src/muya/themes/dark.css @@ -1,31 +1,97 @@ -@include-when-export url(https://fonts.googleapis.com/css?family=Open+Sans:400italic,700italic,700,400&subset=latin,latin-ext); - +/* + * Open Sans + * https://fonts.googleapis.com/css?family=Open+Sans:300,300i,400,400i,600,600i,700,700i&subset=latin-ext + */ + @font-face { + font-family: 'Open Sans'; + font-style: normal; + font-weight: 300; + src: local('Open Sans Light'), local('OpenSans-Light'), + url('./fonts/open-sans-v15-latin_latin-ext-300.woff') format('woff'); +} @font-face { - font-family: 'Open Sans'; - font-style: normal; - font-weight: normal; - src: local('Open Sans Regular'),url('./github/400.woff') format('woff') + font-family: 'Open Sans'; + font-style: italic; + font-weight: 300; + src: local('Open Sans Light Italic'), local('OpenSans-LightItalic'), + url('./fonts/open-sans-v15-latin_latin-ext-300italic.woff') format('woff'); +} +@font-face { + font-family: 'Open Sans'; + font-style: normal; + font-weight: 400; + src: local('Open Sans Regular'), local('OpenSans-Regular'), + url('./fonts/open-sans-v15-latin_latin-ext-regular.woff') format('woff'); +} +@font-face { + font-family: 'Open Sans'; + font-style: italic; + font-weight: 400; + src: local('Open Sans Italic'), local('OpenSans-Italic'), + url('./fonts/open-sans-v15-latin_latin-ext-italic.woff') format('woff'); +} +@font-face { + font-family: 'Open Sans'; + font-style: normal; + font-weight: 600; + src: local('Open Sans SemiBold'), local('OpenSans-SemiBold'), + url('./fonts/open-sans-v15-latin_latin-ext-600.woff') format('woff'); +} +@font-face { + font-family: 'Open Sans'; + font-style: italic; + font-weight: 600; + src: local('Open Sans SemiBold Italic'), local('OpenSans-SemiBoldItalic'), + url('./fonts/open-sans-v15-latin_latin-ext-600italic.woff') format('woff'); +} +@font-face { + font-family: 'Open Sans'; + font-style: normal; + font-weight: 700; + src: local('Open Sans Bold'), local('OpenSans-Bold'), + url('./fonts/open-sans-v15-latin_latin-ext-700.woff') format('woff'); +} +@font-face { + font-family: 'Open Sans'; + font-style: italic; + font-weight: 700; + src: local('Open Sans Bold Italic'), local('OpenSans-BoldItalic'), + url('./fonts/open-sans-v15-latin_latin-ext-700italic.woff') format('woff'); } +/* + * DejaVu Sans Mono + */ @font-face { - font-family: 'Open Sans'; - font-style: italic; - font-weight: normal; - src: local('Open Sans Italic'),url('./github/400i.woff') format('woff') + font-family: "DejaVu Sans Mono"; + src: local('DejaVu Sans Mono'), url('./fonts/DejaVuSansMono.ttf'); } - @font-face { - font-family: 'Open Sans'; - font-style: normal; - font-weight: bold; - src: local('Open Sans Bold'),url('./github/700.woff') format('woff') + font-family: "DejaVu Sans Mono"; + font-weight: bold; + src: url('./fonts/DejaVuSansMono-Bold.ttf'); } - @font-face { - font-family: 'Open Sans'; - font-style: italic; - font-weight: bold; - src: local('Open Sans Bold Italic'),url('./github/700i.woff') format('woff') + font-family: "DejaVu Sans Mono"; + font-style: oblique; + font-weight: bold; + src: url('./fonts/DejaVuSansMono-BoldOblique.ttf'); +} +@font-face { + font-family: "DejaVu Sans Mono"; + font-style: italic; + font-weight: bold; + src: url('./fonts/DejaVuSansMono-BoldOblique.ttf'); +} +@font-face { + font-family: "DejaVu Sans Mono"; + font-style: italic; + src: url('./fonts/DejaVuSansMono-Oblique.ttf'); +} +@font-face { + font-family: "DejaVu Sans Mono"; + font-style: oblique; + src: url('./fonts/DejaVuSansMono-Oblique.ttf'); } html, body { @@ -36,6 +102,17 @@ html, body { background: rgb(45, 45, 45); } +span code, +td code, +th code, +code, +code[class*="language-"], +.CodeMirror, +pre.ag-paragraph { + font-family: "DejaVu Sans Mono", "Source Code Pro", "Droid Sans Mono", Consolas, monospace; + font-size: 14px; +} + ::-webkit-scrollbar { background: rgb(43, 43, 43); } @@ -358,7 +435,7 @@ td code { color: #efefef; background-color: #606266; border-radius: 4px; - font-family: Menlo, Monaco, Consolas, "Courier New", monospace; + /*font-family: Menlo, Monaco, Consolas, "Courier New", monospace;*/ } @media print { @@ -432,7 +509,7 @@ td code { code[class*="language-"], pre.ag-paragraph { color: #f8f8f2; - font-family: Consolas, Monaco, 'Andale Mono', 'Ubuntu Mono', monospace; + /*font-family: Consolas, Monaco, 'Andale Mono', 'Ubuntu Mono', monospace;*/ text-align: left; white-space: pre; word-spacing: normal; diff --git a/src/muya/themes/fonts/DejaVuSansMono-Bold.ttf b/src/muya/themes/fonts/DejaVuSansMono-Bold.ttf new file mode 100644 index 00000000..8184ced8 Binary files /dev/null and b/src/muya/themes/fonts/DejaVuSansMono-Bold.ttf differ diff --git a/src/muya/themes/fonts/DejaVuSansMono-BoldOblique.ttf b/src/muya/themes/fonts/DejaVuSansMono-BoldOblique.ttf new file mode 100644 index 00000000..754dca73 Binary files /dev/null and b/src/muya/themes/fonts/DejaVuSansMono-BoldOblique.ttf differ diff --git a/src/muya/themes/fonts/DejaVuSansMono-Oblique.ttf b/src/muya/themes/fonts/DejaVuSansMono-Oblique.ttf new file mode 100644 index 00000000..4c858d40 Binary files /dev/null and b/src/muya/themes/fonts/DejaVuSansMono-Oblique.ttf differ diff --git a/src/muya/themes/fonts/DejaVuSansMono.ttf b/src/muya/themes/fonts/DejaVuSansMono.ttf new file mode 100644 index 00000000..f5786022 Binary files /dev/null and b/src/muya/themes/fonts/DejaVuSansMono.ttf differ diff --git a/src/muya/themes/fonts/DejaVuSansMono_LICENSE b/src/muya/themes/fonts/DejaVuSansMono_LICENSE new file mode 100644 index 00000000..df52c170 --- /dev/null +++ b/src/muya/themes/fonts/DejaVuSansMono_LICENSE @@ -0,0 +1,187 @@ +Fonts are (c) Bitstream (see below). DejaVu changes are in public domain. +Glyphs imported from Arev fonts are (c) Tavmjong Bah (see below) + + +Bitstream Vera Fonts Copyright +------------------------------ + +Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream Vera is +a trademark of Bitstream, Inc. + +Permission is hereby granted, free of charge, to any person obtaining a copy +of the fonts accompanying this license ("Fonts") and associated +documentation files (the "Font Software"), to reproduce and distribute the +Font Software, including without limitation the rights to use, copy, merge, +publish, distribute, and/or sell copies of the Font Software, and to permit +persons to whom the Font Software is furnished to do so, subject to the +following conditions: + +The above copyright and trademark notices and this permission notice shall +be included in all copies of one or more of the Font Software typefaces. + +The Font Software may be modified, altered, or added to, and in particular +the designs of glyphs or characters in the Fonts may be modified and +additional glyphs or characters may be added to the Fonts, only if the fonts +are renamed to names not containing either the words "Bitstream" or the word +"Vera". + +This License becomes null and void to the extent applicable to Fonts or Font +Software that has been modified and is distributed under the "Bitstream +Vera" names. + +The Font Software may be sold as part of a larger software package but no +copy of one or more of the Font Software typefaces may be sold by itself. + +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT, +TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL BITSTREAM OR THE GNOME +FOUNDATION BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING +ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, +WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF +THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE +FONT SOFTWARE. + +Except as contained in this notice, the names of Gnome, the Gnome +Foundation, and Bitstream Inc., shall not be used in advertising or +otherwise to promote the sale, use or other dealings in this Font Software +without prior written authorization from the Gnome Foundation or Bitstream +Inc., respectively. For further information, contact: fonts at gnome dot +org. + +Arev Fonts Copyright +------------------------------ + +Copyright (c) 2006 by Tavmjong Bah. All Rights Reserved. + +Permission is hereby granted, free of charge, to any person obtaining +a copy of the fonts accompanying this license ("Fonts") and +associated documentation files (the "Font Software"), to reproduce +and distribute the modifications to the Bitstream Vera Font Software, +including without limitation the rights to use, copy, merge, publish, +distribute, and/or sell copies of the Font Software, and to permit +persons to whom the Font Software is furnished to do so, subject to +the following conditions: + +The above copyright and trademark notices and this permission notice +shall be included in all copies of one or more of the Font Software +typefaces. + +The Font Software may be modified, altered, or added to, and in +particular the designs of glyphs or characters in the Fonts may be +modified and additional glyphs or characters may be added to the +Fonts, only if the fonts are renamed to names not containing either +the words "Tavmjong Bah" or the word "Arev". + +This License becomes null and void to the extent applicable to Fonts +or Font Software that has been modified and is distributed under the +"Tavmjong Bah Arev" names. + +The Font Software may be sold as part of a larger software package but +no copy of one or more of the Font Software typefaces may be sold by +itself. + +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL +TAVMJONG BAH BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. + +Except as contained in this notice, the name of Tavmjong Bah shall not +be used in advertising or otherwise to promote the sale, use or other +dealings in this Font Software without prior written authorization +from Tavmjong Bah. For further information, contact: tavmjong @ free +. fr. + +TeX Gyre DJV Math +----------------- +Fonts are (c) Bitstream (see below). DejaVu changes are in public domain. + +Math extensions done by B. Jackowski, P. Strzelczyk and P. Pianowski +(on behalf of TeX users groups) are in public domain. + +Letters imported from Euler Fraktur from AMSfonts are (c) American +Mathematical Society (see below). +Bitstream Vera Fonts Copyright +Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream Vera +is a trademark of Bitstream, Inc. + +Permission is hereby granted, free of charge, to any person obtaining a copy +of the fonts accompanying this license (“Fonts”) and associated +documentation +files (the “Font Software”), to reproduce and distribute the Font Software, +including without limitation the rights to use, copy, merge, publish, +distribute, +and/or sell copies of the Font Software, and to permit persons to whom +the Font Software is furnished to do so, subject to the following +conditions: + +The above copyright and trademark notices and this permission notice +shall be +included in all copies of one or more of the Font Software typefaces. + +The Font Software may be modified, altered, or added to, and in particular +the designs of glyphs or characters in the Fonts may be modified and +additional +glyphs or characters may be added to the Fonts, only if the fonts are +renamed +to names not containing either the words “Bitstream” or the word “Vera”. + +This License becomes null and void to the extent applicable to Fonts or +Font Software +that has been modified and is distributed under the “Bitstream Vera” +names. + +The Font Software may be sold as part of a larger software package but +no copy +of one or more of the Font Software typefaces may be sold by itself. + +THE FONT SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS +OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT, +TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL BITSTREAM OR THE GNOME +FOUNDATION +BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY GENERAL, +SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN AN +ACTION +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE USE OR +INABILITY TO USE +THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE. +Except as contained in this notice, the names of GNOME, the GNOME +Foundation, +and Bitstream Inc., shall not be used in advertising or otherwise to promote +the sale, use or other dealings in this Font Software without prior written +authorization from the GNOME Foundation or Bitstream Inc., respectively. +For further information, contact: fonts at gnome dot org. + +AMSFonts (v. 2.2) copyright + +The PostScript Type 1 implementation of the AMSFonts produced by and +previously distributed by Blue Sky Research and Y&Y, Inc. are now freely +available for general use. This has been accomplished through the +cooperation +of a consortium of scientific publishers with Blue Sky Research and Y&Y. +Members of this consortium include: + +Elsevier Science IBM Corporation Society for Industrial and Applied +Mathematics (SIAM) Springer-Verlag American Mathematical Society (AMS) + +In order to assure the authenticity of these fonts, copyright will be +held by +the American Mathematical Society. This is not meant to restrict in any way +the legitimate use of the fonts, such as (but not limited to) electronic +distribution of documents containing these fonts, inclusion of these fonts +into other public domain or commercial font collections or computer +applications, use of the outline data to create derivative fonts and/or +faces, etc. However, the AMS does require that the AMS copyright notice be +removed from any derivative versions of the fonts which have been altered in +any way. In addition, to ensure the fidelity of TeX documents using Computer +Modern fonts, Professor Donald Knuth, creator of the Computer Modern faces, +has requested that any alterations which yield different font metrics be +given a different name. + +$Id$ diff --git a/src/muya/themes/fonts/open-sans-LICENSE.txt b/src/muya/themes/fonts/open-sans-LICENSE.txt new file mode 100644 index 00000000..75b52484 --- /dev/null +++ b/src/muya/themes/fonts/open-sans-LICENSE.txt @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/src/muya/themes/fonts/open-sans-v15-latin_latin-ext-300.woff b/src/muya/themes/fonts/open-sans-v15-latin_latin-ext-300.woff new file mode 100644 index 00000000..50ee044a Binary files /dev/null and b/src/muya/themes/fonts/open-sans-v15-latin_latin-ext-300.woff differ diff --git a/src/muya/themes/fonts/open-sans-v15-latin_latin-ext-300italic.woff b/src/muya/themes/fonts/open-sans-v15-latin_latin-ext-300italic.woff new file mode 100644 index 00000000..a05f3dac Binary files /dev/null and b/src/muya/themes/fonts/open-sans-v15-latin_latin-ext-300italic.woff differ diff --git a/src/muya/themes/fonts/open-sans-v15-latin_latin-ext-600.woff b/src/muya/themes/fonts/open-sans-v15-latin_latin-ext-600.woff new file mode 100644 index 00000000..3fe03f97 Binary files /dev/null and b/src/muya/themes/fonts/open-sans-v15-latin_latin-ext-600.woff differ diff --git a/src/muya/themes/fonts/open-sans-v15-latin_latin-ext-600italic.woff b/src/muya/themes/fonts/open-sans-v15-latin_latin-ext-600italic.woff new file mode 100644 index 00000000..a7ab3113 Binary files /dev/null and b/src/muya/themes/fonts/open-sans-v15-latin_latin-ext-600italic.woff differ diff --git a/src/muya/themes/fonts/open-sans-v15-latin_latin-ext-700.woff b/src/muya/themes/fonts/open-sans-v15-latin_latin-ext-700.woff new file mode 100644 index 00000000..30b4c3fb Binary files /dev/null and b/src/muya/themes/fonts/open-sans-v15-latin_latin-ext-700.woff differ diff --git a/src/muya/themes/fonts/open-sans-v15-latin_latin-ext-700italic.woff b/src/muya/themes/fonts/open-sans-v15-latin_latin-ext-700italic.woff new file mode 100644 index 00000000..7b0a2720 Binary files /dev/null and b/src/muya/themes/fonts/open-sans-v15-latin_latin-ext-700italic.woff differ diff --git a/src/muya/themes/fonts/open-sans-v15-latin_latin-ext-italic.woff b/src/muya/themes/fonts/open-sans-v15-latin_latin-ext-italic.woff new file mode 100644 index 00000000..4e08d18f Binary files /dev/null and b/src/muya/themes/fonts/open-sans-v15-latin_latin-ext-italic.woff differ diff --git a/src/muya/themes/fonts/open-sans-v15-latin_latin-ext-regular.woff b/src/muya/themes/fonts/open-sans-v15-latin_latin-ext-regular.woff new file mode 100644 index 00000000..6ca02c46 Binary files /dev/null and b/src/muya/themes/fonts/open-sans-v15-latin_latin-ext-regular.woff differ diff --git a/src/muya/themes/github/300.woff b/src/muya/themes/github/300.woff deleted file mode 100755 index 53fe5744..00000000 Binary files a/src/muya/themes/github/300.woff and /dev/null differ diff --git a/src/muya/themes/github/400.woff b/src/muya/themes/github/400.woff deleted file mode 100755 index 8b512d0a..00000000 Binary files a/src/muya/themes/github/400.woff and /dev/null differ diff --git a/src/muya/themes/github/400i.woff b/src/muya/themes/github/400i.woff deleted file mode 100755 index d6684e85..00000000 Binary files a/src/muya/themes/github/400i.woff and /dev/null differ diff --git a/src/muya/themes/github/600i.woff b/src/muya/themes/github/600i.woff deleted file mode 100755 index 0a9591a1..00000000 Binary files a/src/muya/themes/github/600i.woff and /dev/null differ diff --git a/src/muya/themes/github/700.woff b/src/muya/themes/github/700.woff deleted file mode 100755 index 29c4f31e..00000000 Binary files a/src/muya/themes/github/700.woff and /dev/null differ diff --git a/src/muya/themes/github/700i.woff b/src/muya/themes/github/700i.woff deleted file mode 100755 index 2004dc9f..00000000 Binary files a/src/muya/themes/github/700i.woff and /dev/null differ diff --git a/src/muya/themes/light.css b/src/muya/themes/light.css index 09dfaf99..f57e329a 100644 --- a/src/muya/themes/light.css +++ b/src/muya/themes/light.css @@ -1,31 +1,97 @@ -@include-when-export url(https://fonts.googleapis.com/css?family=Open+Sans:400italic,700italic,700,400&subset=latin,latin-ext); - +/* + * Open Sans + * https://fonts.googleapis.com/css?family=Open+Sans:300,300i,400,400i,600,600i,700,700i&subset=latin-ext + */ @font-face { - font-family: 'Open Sans'; - font-style: normal; - font-weight: normal; - src: local('Open Sans Regular'),url('./github/400.woff') format('woff'); + font-family: 'Open Sans'; + font-style: normal; + font-weight: 300; + src: local('Open Sans Light'), local('OpenSans-Light'), + url('./fonts/open-sans-v15-latin_latin-ext-300.woff') format('woff'); +} +@font-face { + font-family: 'Open Sans'; + font-style: italic; + font-weight: 300; + src: local('Open Sans Light Italic'), local('OpenSans-LightItalic'), + url('./fonts/open-sans-v15-latin_latin-ext-300italic.woff') format('woff'); +} +@font-face { + font-family: 'Open Sans'; + font-style: normal; + font-weight: 400; + src: local('Open Sans Regular'), local('OpenSans-Regular'), + url('./fonts/open-sans-v15-latin_latin-ext-regular.woff') format('woff'); +} +@font-face { + font-family: 'Open Sans'; + font-style: italic; + font-weight: 400; + src: local('Open Sans Italic'), local('OpenSans-Italic'), + url('./fonts/open-sans-v15-latin_latin-ext-italic.woff') format('woff'); +} +@font-face { + font-family: 'Open Sans'; + font-style: normal; + font-weight: 600; + src: local('Open Sans SemiBold'), local('OpenSans-SemiBold'), + url('./fonts/open-sans-v15-latin_latin-ext-600.woff') format('woff'); +} +@font-face { + font-family: 'Open Sans'; + font-style: italic; + font-weight: 600; + src: local('Open Sans SemiBold Italic'), local('OpenSans-SemiBoldItalic'), + url('./fonts/open-sans-v15-latin_latin-ext-600italic.woff') format('woff'); +} +@font-face { + font-family: 'Open Sans'; + font-style: normal; + font-weight: 700; + src: local('Open Sans Bold'), local('OpenSans-Bold'), + url('./fonts/open-sans-v15-latin_latin-ext-700.woff') format('woff'); +} +@font-face { + font-family: 'Open Sans'; + font-style: italic; + font-weight: 700; + src: local('Open Sans Bold Italic'), local('OpenSans-BoldItalic'), + url('./fonts/open-sans-v15-latin_latin-ext-700italic.woff') format('woff'); } +/* + * DejaVu Sans Mono + */ @font-face { - font-family: 'Open Sans'; - font-style: italic; - font-weight: normal; - src: local('Open Sans Italic'),url('./github/400i.woff') format('woff'); + font-family: "DejaVu Sans Mono"; + src: local('DejaVu Sans Mono'), url('./fonts/DejaVuSansMono.ttf'); } - @font-face { - font-family: 'Open Sans'; - font-style: normal; - font-weight: bold; - src: local('Open Sans Bold'),url('./github/700.woff') format('woff'); + font-family: "DejaVu Sans Mono"; + font-weight: bold; + src: url('./fonts/DejaVuSansMono-Bold.ttf'); } - @font-face { - font-family: 'Open Sans'; - font-style: italic; - font-weight: bold; - src: local('Open Sans Bold Italic'),url('./github/700i.woff') format('woff'); + font-family: "DejaVu Sans Mono"; + font-style: oblique; + font-weight: bold; + src: url('./fonts/DejaVuSansMono-BoldOblique.ttf'); +} +@font-face { + font-family: "DejaVu Sans Mono"; + font-style: italic; + font-weight: bold; + src: url('./fonts/DejaVuSansMono-BoldOblique.ttf'); +} +@font-face { + font-family: "DejaVu Sans Mono"; + font-style: italic; + src: url('./fonts/DejaVuSansMono-Oblique.ttf'); +} +@font-face { + font-family: "DejaVu Sans Mono"; + font-style: oblique; + src: url('./fonts/DejaVuSansMono-Oblique.ttf'); } html, body { @@ -36,6 +102,17 @@ html, body { background: rgb(252, 252, 252); } +span code, +td code, +th code, +code, +code[class*="language-"], +.CodeMirror, +pre.ag-paragraph { + font-family: "DejaVu Sans Mono", "Source Code Pro", "Droid Sans Mono", Consolas, monospace; + font-size: 14px; +} + ::-webkit-scrollbar { background: rgb(252, 252, 252); } @@ -320,7 +397,7 @@ th code { background-color: rgba(27, 31, 35, 0.05); border-radius: 3px; padding: 0; - font-family: Menlo, Monaco, Consolas, "Courier New", monospace; + /*font-family: Menlo, Monaco, Consolas, "Courier New", monospace;*/ padding: 2px 4px 0px 4px; font-size: 85%; margin: 0; @@ -389,7 +466,7 @@ p:not(.ag-active)[data-role="hr"]::before { code[class*="language-"], pre.ag-paragraph { color: black; - font-family: Consolas, Monaco, 'Andale Mono', 'Ubuntu Mono', monospace; + /*font-family: Consolas, Monaco, 'Andale Mono', 'Ubuntu Mono', monospace;*/ text-align: left; white-space: pre; word-spacing: normal; @@ -495,4 +572,4 @@ pre.ag-paragraph { .token.entity { cursor: help; - } + } \ No newline at end of file diff --git a/src/renderer/app.vue b/src/renderer/app.vue index 785b9e12..1162e6bb 100644 --- a/src/renderer/app.vue +++ b/src/renderer/app.vue @@ -43,6 +43,8 @@ diff --git a/src/renderer/components/editorWithTabs/editor.vue b/src/renderer/components/editorWithTabs/editor.vue index f20cfb91..51cf65be 100644 --- a/src/renderer/components/editorWithTabs/editor.vue +++ b/src/renderer/components/editorWithTabs/editor.vue @@ -1,7 +1,7 @@