mirror/tiptap
1
0
Fork 0
mirror of https://github.com/ueberdosis/tiptap.git synced 2024-11-24 11:49:02 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of github.com:ueberdosis/tiptap-next into main

Browse Source 
# Conflicts:
#	docs/src/components/PageFooter/index.vue
This commit is contained in:
Hans Pagel 2021-02-05 17:54:53 +01:00
commit 9f4f723a6b
5 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.eslintrc.js
View File

@ -55,6 +55,7 @@ module.exports = {
allowFirstLine: false,
},
}],
'vue/singleline-html-element-content-newline': 'off',
'no-param-reassign': 'off',
'import/prefer-default-export': 'off',
'consistent-return': 'off',

4
docs/src/components/Btn/style.scss
View File

@ -41,6 +41,10 @@
opacity: 0.3;
}
&--tertiary:hover &__icon {
opacity: 1;
}
&__icon {
&:first-child {
margin-right: 0.5rem;

5
docs/src/components/LogoItem/index.vue
View File

@ -44,6 +44,7 @@ export default {
flex-direction: column;
align-items: center;
background-color: rgba($colorBlack, 0.03);
border: 3px solid transparent;
border-radius: 0.75rem;
padding: 1.5rem;
margin-bottom: 1rem;
@ -57,5 +58,9 @@ export default {
white-space: nowrap;
font-size: 0.85rem;
}
&:hover {
border-color: $colorBlack;
}
}
</style>

8
docs/src/components/PageFooter/index.vue
View File

@ -80,7 +80,9 @@
</h3>
<ul>
<li>
<a href="https://github.com/ueberdosis/tiptap-next/blob/main/LICENSE.md">MIT</a>
<g-link to="https://github.com/ueberdosis/tiptap-next/blob/main/LICENSE.md">
MIT
</g-link>
</li>
</ul>
</div>
@ -93,9 +95,9 @@
<div class="page-footer__section">
<div class="page-footer__small-text text">
<p>
Made with ♥️ by <a href="https://twitter.com/_ueberdosis">überdosis</a>
Made with ♥️ by <g-link to="https://twitter.com/_ueberdosis">überdosis</g-link>
&middot;
Based on <a href="https://prosemirror.net/">ProseMirror</a> by Marijn Haverbeke
Based on <g-link to="https://prosemirror.net/">ProseMirror</g-link> by Marijn Haverbeke
</p>
</div>
</div>

16
docs/src/pages/index.vue
View File

@ -49,9 +49,7 @@
Framework-agnostic
</h3>
<p>
No matter what framework you use, you’ll enjoy tiptap. Out of the box, it works with plain JavaScript and Vue.js, but it’s also possible to use it in <g-link to="/guide/getting-started/react">
React
</g-link>, Svelte and others.
No matter what framework you use, you’ll enjoy tiptap. Out of the box, it works with plain JavaScript and Vue.js, but it’s also possible to use it in <g-link to="/guide/getting-started/react">React</g-link>, Svelte and others.
</p>
<div>
<btn type="tertiary" icon="arrow-right" to="/overview/installation">
@ -79,9 +77,7 @@
Collaborative
</h3>
<p>
Real-time collaboration, syncing between different devices and working offline used to be hard. We provide everything you need to keep everything in sync, conflict-free with the power of <g-link to="https://github.com/yjs/yjs">
Y.js
</g-link>. Our production-grade setup requires less than 20 lines of code.
Real-time collaboration, syncing between different devices and working offline used to be hard. We provide everything you need to keep everything in sync, conflict-free with the power of <g-link to="https://github.com/yjs/yjs">Y.js</g-link>. Our production-grade setup requires less than 20 lines of code.
</p>
<div>
<btn type="tertiary" icon="arrow-right" to="/guide/collaborative-editing">
@ -132,7 +128,7 @@
&lt;/html&gt;</prism>
<!-- eslint-enable -->
<div>
<btn type="secondary" icon="arrow-right" to="/overview/installation">
<btn type="tertiary" icon="arrow-right" to="/overview/installation">
Learn More
</btn>
</div>
@ -192,7 +188,7 @@
/> -->
</logo-list>
<div>
<btn type="secondary" icon="arrow-right" to="https://github.com/ueberdosis/tiptap/network/dependents?package_id=UGFja2FnZS0xMzE5OTg0ODc%3D">
<btn type="tertiary" icon="arrow-right" to="https://github.com/ueberdosis/tiptap/network/dependents?package_id=UGFja2FnZS0xMzE5OTg0ODc%3D">
And Many More
</btn>
</div>
@ -205,9 +201,7 @@
License
</h2>
<p>
tiptap is licensed under <a href="https://github.com/ueberdosis/tiptap-next/blob/main/LICENSE.md">MIT</a>, so you are free to do whatever you want. If you are using it commercially, do the right thing and <g-link to="/sponsor">
become one of our wonderful sponsors
</g-link> to fund the maintenance, support and development of tiptap now and in the future. That’s all we ask for.
tiptap is licensed under <g-link to="https://github.com/ueberdosis/tiptap-next/blob/main/LICENSE.md">MIT</g-link>, so you are free to do whatever you want. If you are using it commercially, do the right thing and <g-link to="/sponsor">become one of our wonderful sponsors</g-link> to fund the maintenance, support and development of tiptap now and in the future. That’s all we ask for.
</p>
</div>
</app-section>