mmjee/Piped-Material
1
0
Fork 0
mirror of https://github.com/mmjee/Piped-Material.git synced 2024-12-06 19:26:36 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/inter-v2'

Browse Source
This commit is contained in:
root
2022-03-21 07:07:35 +05:30
parent 450706b8c7 bdaa6d3acc
commit cd8c43dd84
8 changed files with 10 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.idea/.gitignore
Generated
-5
View File
@@ -1,5 +0,0 @@
# Default ignored files
/shelf/
/workspace.xml
# Editor-based HTTP Client requests
/httpRequests/
.idea/codeStyles/Project.xml
Generated
-30
View File
@@ -1,33 +1,17 @@
<component name="ProjectCodeStyleConfiguration">
<code_scheme name="Project" version="173">
<option name="LINE_SEPARATOR" value="&#10;" />
<HTMLCodeStyleSettings>
<option name="HTML_SPACE_INSIDE_EMPTY_TAG" value="true" />
<option name="HTML_ENFORCE_QUOTES" value="true" />
</HTMLCodeStyleSettings>
<JSCodeStyleSettings version="0">
<option name="USE_SEMICOLON_AFTER_STATEMENT" value="false" />
<option name="FORCE_SEMICOLON_STYLE" value="true" />
<option name="SPACE_BEFORE_GENERATOR_MULT" value="true" />
<option name="USE_DOUBLE_QUOTES" value="false" />
<option name="FORCE_QUOTE_STYlE" value="true" />
<option name="ENFORCE_TRAILING_COMMA" value="WhenMultiline" />
<option name="OBJECT_LITERAL_WRAP" value="2" />
<option name="SPACES_WITHIN_OBJECT_LITERAL_BRACES" value="true" />
<option name="SPACES_WITHIN_IMPORTS" value="true" />
</JSCodeStyleSettings>
<TypeScriptCodeStyleSettings version="0">
<option name="FORCE_SEMICOLON_STYLE" value="true" />
<option name="SPACE_BEFORE_FUNCTION_LEFT_PARENTH" value="false" />
<option name="FORCE_QUOTE_STYlE" value="true" />
<option name="ENFORCE_TRAILING_COMMA" value="WhenMultiline" />
<option name="SPACES_WITHIN_OBJECT_LITERAL_BRACES" value="true" />
<option name="SPACES_WITHIN_IMPORTS" value="true" />
</TypeScriptCodeStyleSettings>
<VueCodeStyleSettings>
<option name="UNIFORM_INDENT" value="false" />
<option name="INTERPOLATION_NEW_LINE_AFTER_START_DELIMITER" value="false" />
<option name="INTERPOLATION_NEW_LINE_BEFORE_END_DELIMITER" value="false" />
</VueCodeStyleSettings>
<codeStyleSettings language="CSS">
<indentOptions>
@@ -35,12 +19,6 @@
<option name="USE_TAB_CHARACTER" value="true" />
</indentOptions>
</codeStyleSettings>
<codeStyleSettings language="HTML">
<option name="SOFT_MARGINS" value="120" />
<indentOptions>
<option name="CONTINUATION_INDENT_SIZE" value="4" />
</indentOptions>
</codeStyleSettings>
<codeStyleSettings language="JavaScript">
<option name="BLOCK_COMMENT_ADD_SPACE" value="true" />
<option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
@@ -51,7 +29,6 @@
<option name="DOWHILE_BRACE_FORCE" value="1" />
<option name="WHILE_BRACE_FORCE" value="1" />
<option name="FOR_BRACE_FORCE" value="1" />
<option name="SOFT_MARGINS" value="120" />
<indentOptions>
<option name="USE_TAB_CHARACTER" value="true" />
</indentOptions>
@@ -64,16 +41,9 @@
</indentOptions>
</codeStyleSettings>
<codeStyleSettings language="TypeScript">
<option name="SOFT_MARGINS" value="120" />
<indentOptions>
<option name="USE_TAB_CHARACTER" value="true" />
</indentOptions>
</codeStyleSettings>
<codeStyleSettings language="Vue">
<option name="SOFT_MARGINS" value="120" />
<indentOptions>
<option name="CONTINUATION_INDENT_SIZE" value="2" />
</indentOptions>
</codeStyleSettings>
</code_scheme>
</component>
.idea/discord.xml
Generated
-6
View File
@@ -1,6 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="DiscordProjectSettings">
<option name="show" value="PROJECT" />
</component>
</project>
.idea/watcherTasks.xml
Generated
-4
View File
@@ -1,4 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectTasksOptions" suppressed-tasks="SCSS" />
</project>
package.json
+1 -1
View File
@@ -9,7 +9,6 @@
"dependencies": {
"@babel/eslint-parser": "^7.17.0",
"@fontsource/baloo-da-2": "^4.5.4",
"@fontsource/inter": "^4.5.5",
"@fontsource/noto-naskh-arabic": "^4.5.4",
"@fontsource/noto-sans-jp": "^4.5.5",
"@fontsource/noto-sans-kr": "^4.5.5",
@@ -23,6 +22,7 @@
"dompurify": "^2.3.6",
"format-duration": "^1.4.0",
"i18n-iso-countries": "^6.8.0",
"inter-hinted": "https://cf-ipfs.com/ipfs/QmUsL8MbjXkxqkiLDRdnXPn5AxiiG2zfvQuRGeaxJJ76j7?filename=hinted-inter-web.tar",
"javascript-time-ago": "^2.3.13",
"lodash-es": "^4.17.21",
"marked": "^3.0.8",
src/main.js
+1 -1
View File
@@ -1,7 +1,7 @@
import Vue from 'vue'
import App from './App.vue'
import '@fontsource/inter/latin.css'
import 'inter-hinted/inter.css'
import '@/styles/main.scss'
import { i18n, i18nInitialized } from '@/plugins/i18n'
src/styles/main.scss
+4
View File
@@ -18,6 +18,10 @@
.latin {
@include addFonts('Inter');
.v-application {
font-feature-settings: "calt", "case", "ccmp", "ss01", "ss02", "ss03";
}
}
.bengali {
yarn.lock
+4 -5
View File
@@ -977,11 +977,6 @@
resolved "https://registry.yarnpkg.com/@fontsource/baloo-da-2/-/baloo-da-2-4.5.4.tgz#cc0f79ad9d31914073e84b100bf9f40dbeb726ca"
integrity sha512-ZIgIlnwp779Bm2hxwDSntDHXmjahev5madn+JjOH/5TF4AJ7AbtUgQaLcw8MsHneXHJaP45jHVBIXD3kW5loUw==
"@fontsource/inter@^4.5.5":
version "4.5.5"
resolved "https://registry.yarnpkg.com/@fontsource/inter/-/inter-4.5.5.tgz#d4e52e8a0c84b93abae46efd4c43bd7a7f23907f"
integrity sha512-mWnePEroLfaJQWmynipzOVcH6JwT8Jta3+yLsC5Pm/snHBXnOiAOnjBqYjKnvXwJ4eUPt2AaAhyrtwCgWQRGOg==
"@fontsource/noto-naskh-arabic@^4.5.4":
version "4.5.4"
resolved "https://registry.yarnpkg.com/@fontsource/noto-naskh-arabic/-/noto-naskh-arabic-4.5.4.tgz#7e848caaf349dd90190b6e2c888ed0678e3d5e3a"
@@ -4030,6 +4025,10 @@ inherits@2.0.3:
resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
"inter-hinted@https://cf-ipfs.com/ipfs/QmUsL8MbjXkxqkiLDRdnXPn5AxiiG2zfvQuRGeaxJJ76j7?filename=hinted-inter-web.tar":
version "0.0.0"
resolved "https://cf-ipfs.com/ipfs/QmUsL8MbjXkxqkiLDRdnXPn5AxiiG2zfvQuRGeaxJJ76j7?filename=hinted-inter-web.tar#4cb347da3bfff090be4e56a86ca7d6ab5f6c2dc2"
internal-slot@^1.0.3:
version "1.0.3"
resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.3.tgz#7347e307deeea2faac2ac6205d4bc7d34967f59c"