From cbf21078deb56e6315244468214b33a33ea51813 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= Date: Mon, 12 Oct 2020 12:26:54 +0200 Subject: [PATCH 01/28] add basic new colors --- docs/src/components/Demo/style.scss | 8 +- docs/src/components/LiveDemo/CustomLayout.vue | 7 +- docs/src/components/LiveDemo/style.scss | 12 +-- docs/src/components/PageNavigation/style.scss | 6 +- docs/src/layouts/App/base.scss | 18 ++-- docs/src/layouts/App/prism.scss | 77 ++++++++--------- docs/src/layouts/App/style.scss | 24 +++--- docs/src/templates/DocPage/style.scss | 85 ++++++++++++++----- docs/src/variables.scss | 15 +++- 9 files changed, 144 insertions(+), 108 deletions(-) diff --git a/docs/src/components/Demo/style.scss b/docs/src/components/Demo/style.scss index a14c2342..21fc2326 100644 --- a/docs/src/components/Demo/style.scss +++ b/docs/src/components/Demo/style.scss @@ -5,14 +5,15 @@ &__preview { padding: 1.5rem; - border: 1px solid rgba($colorBlack, 0.1); border-top-left-radius: inherit; border-top-right-radius: inherit; border-bottom-width: 0; + color: $colorBlack; } &__source { - // background-color: $colorBlack; + border: 1px solid rgba($colorWhite, 0.1); + background-color: $colorBlack; } &__tabs { @@ -55,11 +56,10 @@ width: 100%; padding: 0.5rem 1.5rem; border: 1px solid rgba($colorWhite, 0.1); - border: 1px solid rgba($colorBlack, 0.1); border-bottom-left-radius: inherit; border-bottom-right-radius: inherit; border-top-width: 0; - background-color: rgba($colorBlack, 0.9); + background-color: $colorBlack; color: $colorWhite; } diff --git a/docs/src/components/LiveDemo/CustomLayout.vue b/docs/src/components/LiveDemo/CustomLayout.vue index 10ecd65e..98e8df6a 100644 --- a/docs/src/components/LiveDemo/CustomLayout.vue +++ b/docs/src/components/LiveDemo/CustomLayout.vue @@ -47,15 +47,16 @@ export default { &__preview { padding: 1.5rem; - border: 1px solid rgba($colorBlack, 0.1); border-top-left-radius: inherit; border-top-right-radius: inherit; border-bottom-width: 0; + color: $colorBlack; } &__editor { - background-color: rgba($colorBlack, 0.9); - color: rgba($colorWhite, 0.7); + border: 1px solid rgba($colorWhite, 0.1); + background-color: $colorBlack; + color: $colorText; } &__editor ::v-deep { diff --git a/docs/src/components/LiveDemo/style.scss b/docs/src/components/LiveDemo/style.scss index ce9a5cfa..804476db 100644 --- a/docs/src/components/LiveDemo/style.scss +++ b/docs/src/components/LiveDemo/style.scss @@ -9,15 +9,6 @@ border-bottom-width: 0; } - &__source { - // background-color: $colorBlack; - } - - &__tabs { - padding: 1rem 1.5rem 0 1.5rem; - background-color: rgba($colorBlack, 0.9); - } - &__tab { display: inline-flex; position: relative; @@ -53,11 +44,10 @@ width: 100%; padding: 0.5rem 1.5rem; border: 1px solid rgba($colorWhite, 0.1); - border: 1px solid rgba($colorBlack, 0.1); border-bottom-left-radius: inherit; border-bottom-right-radius: inherit; border-top-width: 0; - background-color: rgba($colorBlack, 0.9); + background-color: $colorBlack; color: $colorWhite; } diff --git a/docs/src/components/PageNavigation/style.scss b/docs/src/components/PageNavigation/style.scss index 21161f90..584f45f9 100644 --- a/docs/src/components/PageNavigation/style.scss +++ b/docs/src/components/PageNavigation/style.scss @@ -5,10 +5,10 @@ &__link { font-weight: 500; - color: rgba($colorBlack, 0.6); + color: rgba($colorWhite, 0.6); &:hover { - color: $colorBlack; + color: $colorWhite; } } -} \ No newline at end of file +} diff --git a/docs/src/layouts/App/base.scss b/docs/src/layouts/App/base.scss index bcd6f3f4..f0b05ab2 100644 --- a/docs/src/layouts/App/base.scss +++ b/docs/src/layouts/App/base.scss @@ -24,11 +24,11 @@ border: 4px solid rgba(0, 0, 0, 0); background-clip: padding-box; border-radius: 8px; - background-color: rgba($colorBlack, 0); + background-color: rgba($colorWhite, 0); } :hover::-webkit-scrollbar-thumb { - background-color: rgba($colorBlack, 0.1); + background-color: rgba($colorWhite, 0.1); } ::-webkit-scrollbar-button { @@ -52,7 +52,8 @@ body { -moz-osx-font-smoothing: grayscale; line-height: 1.7; font-feature-settings: 'cv05' 1; - background-color: $colorBackground; + background-color: $colorBlack; + color: $colorWhite; height: 100%; } @@ -78,10 +79,8 @@ a { code { font-family: 'JetBrainsMono', monospace; - background-color: rgba($colorBlack, 0.05); padding: 0.1rem 0.3rem; border-radius: 0.25rem; - color: rgba($colorBlack, 0.7); font-size: 0.9rem; } @@ -122,3 +121,12 @@ blockquote { #table-of-contents { display: none; } + +h1, +h2, +h3, +h4, +h5, +h6 { + font-weight: 500; +} diff --git a/docs/src/layouts/App/prism.scss b/docs/src/layouts/App/prism.scss index fddc3f77..6c585e81 100644 --- a/docs/src/layouts/App/prism.scss +++ b/docs/src/layouts/App/prism.scss @@ -1,13 +1,4 @@ -$codeBackground: rgba($colorBlack, 0.9); -$codeText: #eee; -$codeGrey: #616161; -$codeRed: #ff6666; -$codeOrange: #fd9170; -$colorYellow: #ffcb6b; -$codeGreen: #b9ea80; -$codeBlue: #89ddff; -$codeTeal: #80cbc4; -$codePurple: #c792ea; +$codeBackground: $colorBlack; .prism-editor__textarea { background: transparent; @@ -36,7 +27,7 @@ pre[class*="language-"] { :not(pre) > code[class*="language-"] { white-space: normal; - color: $codeText; + color: $colorText; background: $codeBackground; border-radius: 0.2em; padding: 0.1em; @@ -51,7 +42,7 @@ pre > code[class*="language-"] { pre[class*="language-"] { overflow: auto; position: relative; - color: $codeText; + color: $colorText; background: $codeBackground; padding: 1.2rem 1.5rem !important; border-radius: 0.5rem; @@ -65,7 +56,7 @@ pre[class*="language-"] { pre[class*="language-"].language-css > code, pre[class*="language-"].language-sass > code, pre[class*="language-"].language-scss > code { - color: $codeOrange; + color: $colorOrange; } [class*="language-"] .namespace { @@ -73,7 +64,7 @@ pre[class*="language-"].language-scss > code { } .token.atrule { - color: $codePurple; + color: $colorPurple; } .token.attr-name { @@ -81,15 +72,15 @@ pre[class*="language-"].language-scss > code { } .token.attr-value { - color: $codeGreen; + color: $colorGreen; } .token.attribute { - color: $codeGreen; + color: $colorGreen; } .token.boolean { - color: $codePurple; + color: $colorPurple; } .token.builtin { @@ -97,11 +88,11 @@ pre[class*="language-"].language-scss > code { } .token.cdata { - color: $codeTeal; + color: $colorTeal; } .token.char { - color: $codeTeal; + color: $colorTeal; } .token.class { @@ -113,27 +104,27 @@ pre[class*="language-"].language-scss > code { } .token.comment { - color: $codeGrey; + color: $colorGrey; } .token.constant { - color: $codePurple; + color: $colorPurple; } .token.deleted { - color: $codeRed; + color: $colorRed; } .token.doctype { - color: $codeGrey; + color: $colorGrey; } .token.entity { - color: $codeRed; + color: $colorRed; } .token.function { - color: $codePurple; + color: $colorPurple; } .token.hexcode { @@ -141,49 +132,49 @@ pre[class*="language-"].language-scss > code { } .token.id { - color: $codePurple; + color: $colorPurple; font-weight: bold; } .token.important { - color: $codePurple; + color: $colorPurple; font-weight: bold; } .token.inserted { - color: $codeTeal; + color: $colorTeal; } .token.keyword { - color: $codePurple; + color: $colorPurple; } .token.number { - color: $codeOrange; + color: $colorOrange; } .token.operator { - color: $codeBlue; + color: $colorBlue; } .token.prolog { - color: $codeGrey; + color: $colorGrey; } .token.property { - color: $codeTeal; + color: $colorTeal; } .token.pseudo-class { - color: $codeGreen; + color: $colorGreen; } .token.pseudo-element { - color: $codeGreen; + color: $colorGreen; } .token.punctuation { - color: $codeBlue; + color: $colorBlue; } .token.regex { @@ -191,31 +182,31 @@ pre[class*="language-"].language-scss > code { } .token.selector { - color: $codeRed; + color: $colorRed; } .token.string { - color: $codeGreen; + color: $colorGreen; } .token.symbol { - color: $codePurple; + color: $colorPurple; } .token.tag { - color: $codeRed; + color: $colorRed; } .token.unit { - color: $codeOrange; + color: $colorOrange; } .token.url { - color: $codeRed; + color: $colorRed; } .token.variable { - color: $codeRed; + color: $colorRed; } .line-highlight { diff --git a/docs/src/layouts/App/style.scss b/docs/src/layouts/App/style.scss index 4af9e903..32d49152 100644 --- a/docs/src/layouts/App/style.scss +++ b/docs/src/layouts/App/style.scss @@ -20,7 +20,7 @@ $menuBreakPoint: 750px; letter-spacing: 0.025rem; font-size: 0.75rem; text-transform: uppercase; - color: rgba($colorBlack, 0.3); + color: rgba($colorWhite, 0.3); margin-bottom: 0.5rem; } @@ -29,7 +29,7 @@ $menuBreakPoint: 750px; padding-left: 1rem; margin-top: 0.5rem; margin-bottom: 1.5rem; - border-left: 2px solid rgba($colorBlack, 0.1); + border-left: 2px solid rgba($colorWhite, 0.1); } .active + &__link-list { @@ -41,26 +41,26 @@ $menuBreakPoint: 750px; padding: 0.1rem 0.5rem; border-radius: 5px; font-weight: 500; - color: rgba($colorBlack, 0.6); + color: rgba($colorWhite, 0.6); margin-bottom: 0.2rem; margin-left: -0.5rem; &:hover { - color: $colorBlack; + color: $colorWhite; } &.active { - color: $colorBlack; - background-color: rgba($colorBlack, 0.05); + color: $colorWhite; + background-color: rgba($colorWhite, 0.05); } &--draft { - color: rgba($colorBlack, 0.2); + color: rgba($colorWhite, 0.2); } &--with-children::after { - content: '→'; - color: rgba($colorBlack, 0.2); + content: '→'; + color: rgba($colorWhite, 0.2); } } @@ -75,8 +75,8 @@ $menuBreakPoint: 750px; width: 100%; height: $navHeight; flex: 0 0 auto; - background-color: rgba($colorBackground, 0.8); - border-bottom: 1px solid rgba($colorBlack, 0.05); + background-color: rgba($colorBlack, 0.7); + border-bottom: 1px solid rgba($colorWhite, 0.05); backdrop-filter: blur(10px); } @@ -130,7 +130,7 @@ $menuBreakPoint: 750px; bottom: 0; left: 0; right: 0; - background-color: $colorBackground; + // background-color: $colorBackground; padding-left: 1rem; padding-right: 1rem; visibility: hidden; diff --git a/docs/src/templates/DocPage/style.scss b/docs/src/templates/DocPage/style.scss index f298c8e7..c38043bc 100644 --- a/docs/src/templates/DocPage/style.scss +++ b/docs/src/templates/DocPage/style.scss @@ -1,8 +1,20 @@ .doc-page { &__markdown ::v-deep { - a { - text-decoration: underline; + $spacing: 0.75em; + + > div, + > p, + ul, + ol, + blockquote { + margin-top: 2 * $spacing; + margin-bottom: 2 * $spacing; + } + + li { + margin-top: $spacing; + margin-bottom: $spacing; } h1, @@ -11,12 +23,12 @@ h4, h5, h6 { - position: relative; - font-weight: 500; - } + margin-top: 3 * $spacing; + margin-bottom: $spacing; - h1 { - font-weight: 400; + & + * { + margin-top: 0; + } } h1, @@ -36,7 +48,7 @@ position: absolute; top: 0; right: 100%; - color: rgba($colorBlack, 0.4); + color: rgba($colorWhite, 0.4); text-decoration: none; font-weight: 400; padding-right: 0.5rem; @@ -49,8 +61,29 @@ } } - > * + * { - margin-top: 1.5em; + :first-child { + margin-top: 0; + } + + :last-child { + margin-bottom: 0; + } + + > p { + color: rgba($colorWhite, 0.8); + } + + > pre { + border: 1px solid rgba($colorWhite, 0.1); + } + + p code { + color: $colorPurple; + background-color: rgba($colorPurple, 0.1); + } + + a { + text-decoration: underline; } ul { @@ -96,9 +129,9 @@ justify-content: center; height: 1.5rem; width: 1.5rem; - background-color: rgba($colorBlack, 0.1); + background-color: rgba($colorWhite, 0.1); border-radius: 9999px; - color: rgba($colorBlack, 0.4); + color: rgba($colorWhite, 0.4); font-size: 0.75rem; font-weight: 700; content: counter(item); @@ -120,7 +153,7 @@ th { font-weight: 600; - background-color: rgba($colorBlack, 0.05); + background-color: rgba($colorWhite, 0.05); &:first-child { border-top-left-radius: 5px; @@ -134,7 +167,7 @@ } td { - border-bottom: 1px solid rgba($colorBlack, 0.05); + border-bottom: 1px solid rgba($colorWhite, 0.05); } tr:last-child td { @@ -144,19 +177,25 @@ .remark-container { padding: 1rem; - border: 2px solid rgba($colorBlack, 0.1); - border-radius: 0.25rem; + border: 1px solid rgba($colorWhite, 0.1); + border-radius: 0.5rem; &.warning { - border-color:#ffd8a8; - background-color: #fff4e6; - color: #ca9c63; + border-color: rgba($colorYellow, 0.1); + background-color: rgba($colorYellow, 0.1); + color: $colorYellow; } &.info { - border-color:#a5d8ff; - background-color: #e7f5ff; - color: #228be6; + border-color: rgba($colorBlue, 0.1); + background-color: rgba($colorBlue, 0.1); + color: $colorBlue; + } + + &.error { + border-color: rgba($colorRed, 0.1); + background-color: rgba($colorRed, 0.1); + color: $colorRed; } .remark-container-title { @@ -165,4 +204,4 @@ } } -} \ No newline at end of file +} diff --git a/docs/src/variables.scss b/docs/src/variables.scss index 42d5f433..61fa793a 100644 --- a/docs/src/variables.scss +++ b/docs/src/variables.scss @@ -1,7 +1,14 @@ $colorWhite: #FFF; -$colorBlack: #000; -$colorRed: #fa5252; -$colorBackground: mix($colorBlack, $colorWhite, 2%); +$colorBlack: #0D0D0D; +$colorText: rgba($colorWhite, 0.8); +$colorGrey: #616161; +$colorPurple: #A975FF; +$colorRed: #FB5151; +$colorOrange: #fd9170; +$colorYellow: #FFCB6B; +$colorBlue: #68CEF8; +$colorTeal: #80cbc4; +$colorGreen: #9DEF8F; /* Default Equations */ $linear: cubic-bezier(0.250, 0.250, 0.750, 0.750); @@ -36,4 +43,4 @@ $easeInOutQuint: cubic-bezier(0.860, 0.000, 0.070, 1.000); $easeInOutSine: cubic-bezier(0.445, 0.050, 0.550, 0.950); $easeInOutExpo: cubic-bezier(1.000, 0.000, 0.000, 1.000); $easeInOutCirc: cubic-bezier(0.785, 0.135, 0.150, 0.860); -$easeInOutBack: cubic-bezier(0.680, -0.550, 0.265, 1.550); \ No newline at end of file +$easeInOutBack: cubic-bezier(0.680, -0.550, 0.265, 1.550); From 4528d3c5d75a6fb3e763d05d0c44a11de8fe28e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= Date: Mon, 12 Oct 2020 12:29:24 +0200 Subject: [PATCH 02/28] fix lint --- packages/core/src/utils/getSchema.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/core/src/utils/getSchema.ts b/packages/core/src/utils/getSchema.ts index fccc01e9..7db415e9 100644 --- a/packages/core/src/utils/getSchema.ts +++ b/packages/core/src/utils/getSchema.ts @@ -1,4 +1,3 @@ -import deepmerge from 'deepmerge' import { Schema } from 'prosemirror-model' import { Extensions } from '../types' import getTopNodeFromExtensions from './getTopNodeFromExtensions' From b8483f4c0840c4d774fd526726e231357cf2cdac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= Date: Mon, 12 Oct 2020 13:09:37 +0200 Subject: [PATCH 03/28] improve css scope --- docs/src/templates/DocPage/style.scss | 54 ++++++++++++++------------- 1 file changed, 29 insertions(+), 25 deletions(-) diff --git a/docs/src/templates/DocPage/style.scss b/docs/src/templates/DocPage/style.scss index c38043bc..c8e9dbf4 100644 --- a/docs/src/templates/DocPage/style.scss +++ b/docs/src/templates/DocPage/style.scss @@ -1,28 +1,28 @@ .doc-page { &__markdown ::v-deep { - $spacing: 0.75em; > div, > p, - ul, - ol, - blockquote { + > ul, + > ol, + > blockquote { margin-top: 2 * $spacing; margin-bottom: 2 * $spacing; } - li { + > ul li, + > ol li { margin-top: $spacing; margin-bottom: $spacing; } - h1, - h2, - h3, - h4, - h5, - h6 { + > h1, + > h2, + > h3, + > h4, + > h5, + > h6 { margin-top: 3 * $spacing; margin-bottom: $spacing; @@ -31,17 +31,17 @@ } } - h1, - h4, - h5, - h6 { + > h1, + > h4, + > h5, + > h6 { a { display: none; } } - h2, - h3 { + > h2, + > h3 { position: relative; a { @@ -61,11 +61,11 @@ } } - :first-child { + > :first-child { margin-top: 0; } - :last-child { + > :last-child { margin-bottom: 0; } @@ -77,16 +77,20 @@ border: 1px solid rgba($colorWhite, 0.1); } - p code { + > p code, + > li code, + > .remark-container code { color: $colorPurple; background-color: rgba($colorPurple, 0.1); } - a { + > p a, + > li a, + > .remark-container a { text-decoration: underline; } - ul { + > ul { list-style-type: none; > * + * { @@ -108,7 +112,7 @@ } } - ol { + > ol { counter-reset: item; > * + * { @@ -140,7 +144,7 @@ } } - table { + > table { width: 100%; border-collapse: collapse; @@ -175,7 +179,7 @@ } } - .remark-container { + > .remark-container { padding: 1rem; border: 1px solid rgba($colorWhite, 0.1); border-radius: 0.5rem; From fb101c05f33591e1c5e1571402c2948c24ef6d2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= Date: Mon, 12 Oct 2020 13:21:16 +0200 Subject: [PATCH 04/28] improve styling --- docs/src/components/LiveDemo/CustomLayout.vue | 4 ---- docs/src/layouts/App/prism.scss | 4 ---- docs/src/templates/DocPage/style.scss | 22 ++++++++++++++----- 3 files changed, 17 insertions(+), 13 deletions(-) diff --git a/docs/src/components/LiveDemo/CustomLayout.vue b/docs/src/components/LiveDemo/CustomLayout.vue index 98e8df6a..77b5768c 100644 --- a/docs/src/components/LiveDemo/CustomLayout.vue +++ b/docs/src/components/LiveDemo/CustomLayout.vue @@ -64,10 +64,6 @@ export default { overflow: auto; max-height: unquote("max(300px, 60vh)"); padding: 1.5rem; - - &::-webkit-scrollbar-thumb { - background-color: rgba($colorWhite, 0.25); - } } .prism-editor__container { diff --git a/docs/src/layouts/App/prism.scss b/docs/src/layouts/App/prism.scss index 6c585e81..2f9b6cfd 100644 --- a/docs/src/layouts/App/prism.scss +++ b/docs/src/layouts/App/prism.scss @@ -47,10 +47,6 @@ pre[class*="language-"] { padding: 1.2rem 1.5rem !important; border-radius: 0.5rem; max-height: unquote("max(300px, 60vh)"); - - &::-webkit-scrollbar-thumb { - background-color: rgba($colorWhite, 0.25); - } } pre[class*="language-"].language-css > code, diff --git a/docs/src/templates/DocPage/style.scss b/docs/src/templates/DocPage/style.scss index c8e9dbf4..1de3a93e 100644 --- a/docs/src/templates/DocPage/style.scss +++ b/docs/src/templates/DocPage/style.scss @@ -79,6 +79,7 @@ > p code, > li code, + > table code, > .remark-container code { color: $colorPurple; background-color: rgba($colorPurple, 0.1); @@ -86,6 +87,7 @@ > p a, > li a, + > table a, > .remark-container a { text-decoration: underline; } @@ -147,17 +149,27 @@ > table { width: 100%; border-collapse: collapse; + font-size: 0.85rem; + text-align: left; + color: rgba($colorWhite, 0.8); th, td { - text-align: left; - font-size: 0.75rem; padding: 0.5rem; + + &:first-child { + padding-left: 0; + } + + &:last-child { + padding-right: 0; + } } th { - font-weight: 600; - background-color: rgba($colorWhite, 0.05); + color: $colorWhite; + font-weight: 500; + border-bottom: 1px solid rgba($colorWhite, 0.2); &:first-child { border-top-left-radius: 5px; @@ -171,7 +183,7 @@ } td { - border-bottom: 1px solid rgba($colorWhite, 0.05); + border-bottom: 1px solid rgba($colorWhite, 0.1); } tr:last-child td { From 4cd4c7527b41c423e119aedae5e9ad346a5b0abc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= Date: Mon, 12 Oct 2020 13:58:41 +0200 Subject: [PATCH 05/28] add basic new page layout --- docs/src/layouts/App/index.vue | 54 +++++- docs/src/layouts/App/style.scss | 328 +++++++++++++++++++++----------- 2 files changed, 268 insertions(+), 114 deletions(-) diff --git a/docs/src/layouts/App/index.vue b/docs/src/layouts/App/index.vue index 98580e2b..a890caba 100644 --- a/docs/src/layouts/App/index.vue +++ b/docs/src/layouts/App/index.vue @@ -1,5 +1,5 @@ @@ -120,7 +170,7 @@ export default { docsearch({ apiKey: '1abe7fb0f0dac150d0e963d2eda930fe', indexName: 'ueberdosis_tiptap', - inputSelector: '.search', + inputSelector: '.app__search', debug: false, }) }, diff --git a/docs/src/layouts/App/style.scss b/docs/src/layouts/App/style.scss index 32d49152..d0d1ec7a 100644 --- a/docs/src/layouts/App/style.scss +++ b/docs/src/layouts/App/style.scss @@ -1,14 +1,225 @@ $navHeight: 4.5rem; $menuBreakPoint: 750px; +// .app { +// display: flex; +// flex-direction: column; +// min-height: 100%; + +// &__logo { +// font-weight: 700; +// font-size: 1.4rem; +// } + +// &__link-group { +// margin-bottom: 2rem; +// } + +// &__link-group-title { +// font-weight: 700; +// letter-spacing: 0.025rem; +// font-size: 0.75rem; +// text-transform: uppercase; +// color: rgba($colorWhite, 0.3); +// margin-bottom: 0.5rem; +// } + +// &__link-list &__link-list { +// display: none; +// padding-left: 1rem; +// margin-top: 0.5rem; +// margin-bottom: 1.5rem; +// border-left: 2px solid rgba($colorWhite, 0.1); +// } + +// .active + &__link-list { +// display: block; +// } + +// &__link { +// display: block; +// padding: 0.1rem 0.5rem; +// border-radius: 5px; +// font-weight: 500; +// color: rgba($colorWhite, 0.6); +// margin-bottom: 0.2rem; +// margin-left: -0.5rem; + +// &:hover { +// color: $colorWhite; +// } + +// &.active { +// color: $colorWhite; +// background-color: rgba($colorWhite, 0.05); +// } + +// &--draft { +// color: rgba($colorWhite, 0.2); +// } + +// &--with-children::after { +// content: '→'; +// color: rgba($colorWhite, 0.2); +// } +// } + +// &__header { +// align-self: center; +// position: fixed; +// top: 0; +// z-index: 2; +// display: flex; +// align-items: center; +// justify-content: center; +// width: 100%; +// height: $navHeight; +// flex: 0 0 auto; +// background-color: rgba($colorBlack, 0.7); +// border-bottom: 1px solid rgba($colorWhite, 0.05); +// backdrop-filter: blur(10px); +// } + +// &__header-inner { +// width: 100%; +// display: flex; +// align-items: center; +// justify-content: space-between; +// max-width: 62rem; +// margin: 0 auto; +// padding: 0 1rem; + +// @media (min-width: $menuBreakPoint) { +// padding: 0 2rem; +// } +// } + +// &__content { +// position: relative; +// z-index: 1; +// flex: 1 1 auto; +// display: flex; +// width: 100%; +// max-width: 62rem; +// margin: 0 auto; +// padding-left: 1rem; +// padding-right: 1rem; + +// @media (min-width: $menuBreakPoint) { +// padding-left: 2rem; +// padding-right: 2rem; +// } +// } + +// &__menu-icon, +// &__close-icon { +// border: none; +// padding: 0; +// background-color: transparent; +// margin-left: 1rem; + +// @media (min-width: $menuBreakPoint) { +// display: none; +// } +// } + +// &__sidebar-wrapper { +// position: fixed; +// z-index: 2; +// top: $navHeight; +// bottom: 0; +// left: 0; +// right: 0; +// // background-color: $colorBackground; +// padding-left: 1rem; +// padding-right: 1rem; +// visibility: hidden; +// opacity: 0; + +// &.is-mobile-visible { +// visibility: visible; +// opacity: 1; +// } + +// @media (min-width: $menuBreakPoint) { +// visibility: visible; +// opacity: 1; +// position: sticky; +// flex: 0 0 auto; +// align-self: flex-start; +// top: 0; +// width: 18rem; +// height: 100vh; +// padding-left: 0; +// padding-right: 0; +// padding-right: 3rem; +// padding-top: $navHeight; +// } +// } + +// &__sidebar { +// overflow: auto; +// height: 100%; +// padding-top: 2rem; +// padding-left: 0.5rem; +// margin-left: -0.5rem; +// } + +// &__main { +// flex: 1 1 auto; +// min-width: 0; +// padding-top: $navHeight + 2rem; +// } +// } + .app { display: flex; - flex-direction: column; - min-height: 100%; - &__logo { - font-weight: 700; - font-size: 1.4rem; + ::v-deep .algolia-autocomplete { + display: block; + width: 100%; + } + + &__search { + display: block; + width: 100%; + background-color: rgba($colorWhite, 0.08); + border: 1px solid rgba($colorWhite, 0.08); + border-radius: 0.5rem; + font: inherit; + color: $colorWhite; + padding: 0.5rem 0.75rem; + } + + &__sidebar { + width: 20rem; + flex: 0 0 auto; + position: sticky; + top: 0; + align-self: flex-start; + padding: 2rem; + height: 100vh; + overflow: auto; + overscroll-behavior: contain; + } + + &__content { + flex: 1 1 auto; + padding: 0 2rem 2rem 2rem; + } + + &__top-bar { + padding: 2rem; + position: sticky; + z-index: 2; + top: 0; + background-color: rgba($colorBlack, 0.7); + backdrop-filter: blur(10px); + } + + &__inner { + margin: 0 auto; + max-width: 45rem; } &__link-group { @@ -63,111 +274,4 @@ $menuBreakPoint: 750px; color: rgba($colorWhite, 0.2); } } - - &__header { - align-self: center; - position: fixed; - top: 0; - z-index: 2; - display: flex; - align-items: center; - justify-content: center; - width: 100%; - height: $navHeight; - flex: 0 0 auto; - background-color: rgba($colorBlack, 0.7); - border-bottom: 1px solid rgba($colorWhite, 0.05); - backdrop-filter: blur(10px); - } - - &__header-inner { - width: 100%; - display: flex; - align-items: center; - justify-content: space-between; - max-width: 62rem; - margin: 0 auto; - padding: 0 1rem; - - @media (min-width: $menuBreakPoint) { - padding: 0 2rem; - } - } - - &__content { - position: relative; - z-index: 1; - flex: 1 1 auto; - display: flex; - width: 100%; - max-width: 62rem; - margin: 0 auto; - padding-left: 1rem; - padding-right: 1rem; - - @media (min-width: $menuBreakPoint) { - padding-left: 2rem; - padding-right: 2rem; - } - } - - &__menu-icon, - &__close-icon { - border: none; - padding: 0; - background-color: transparent; - margin-left: 1rem; - - @media (min-width: $menuBreakPoint) { - display: none; - } - } - - &__sidebar-wrapper { - position: fixed; - z-index: 2; - top: $navHeight; - bottom: 0; - left: 0; - right: 0; - // background-color: $colorBackground; - padding-left: 1rem; - padding-right: 1rem; - visibility: hidden; - opacity: 0; - - &.is-mobile-visible { - visibility: visible; - opacity: 1; - } - - @media (min-width: $menuBreakPoint) { - visibility: visible; - opacity: 1; - position: sticky; - flex: 0 0 auto; - align-self: flex-start; - top: 0; - width: 18rem; - height: 100vh; - padding-left: 0; - padding-right: 0; - padding-right: 3rem; - padding-top: $navHeight; - } - } - - &__sidebar { - overflow: auto; - height: 100%; - padding-top: 2rem; - padding-left: 0.5rem; - margin-left: -0.5rem; - } - - &__main { - flex: 1 1 auto; - min-width: 0; - padding-top: $navHeight + 2rem; - } } From 801912be5d64c4fabe1fac10fb675b9845b0b51e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= Date: Mon, 12 Oct 2020 17:03:46 +0200 Subject: [PATCH 06/28] add toc style --- docs/src/components/Demo/style.scss | 1 - docs/src/components/LiveDemo/CustomLayout.vue | 1 - docs/src/components/LiveDemo/style.scss | 5 -- docs/src/layouts/App/base.scss | 2 +- docs/src/layouts/App/prism.scss | 4 +- docs/src/layouts/App/style.scss | 23 +++++---- docs/src/templates/DocPage/style.scss | 51 ++++++++++++------- 7 files changed, 50 insertions(+), 37 deletions(-) diff --git a/docs/src/components/Demo/style.scss b/docs/src/components/Demo/style.scss index 21fc2326..9879ab3e 100644 --- a/docs/src/components/Demo/style.scss +++ b/docs/src/components/Demo/style.scss @@ -60,7 +60,6 @@ border-bottom-right-radius: inherit; border-top-width: 0; background-color: $colorBlack; - color: $colorWhite; } &__link { diff --git a/docs/src/components/LiveDemo/CustomLayout.vue b/docs/src/components/LiveDemo/CustomLayout.vue index 77b5768c..4df8f6a6 100644 --- a/docs/src/components/LiveDemo/CustomLayout.vue +++ b/docs/src/components/LiveDemo/CustomLayout.vue @@ -56,7 +56,6 @@ export default { &__editor { border: 1px solid rgba($colorWhite, 0.1); background-color: $colorBlack; - color: $colorText; } &__editor ::v-deep { diff --git a/docs/src/components/LiveDemo/style.scss b/docs/src/components/LiveDemo/style.scss index 804476db..822b6223 100644 --- a/docs/src/components/LiveDemo/style.scss +++ b/docs/src/components/LiveDemo/style.scss @@ -48,11 +48,6 @@ border-bottom-right-radius: inherit; border-top-width: 0; background-color: $colorBlack; - color: $colorWhite; - } - - &__link { - // text-align: right; } &__error { diff --git a/docs/src/layouts/App/base.scss b/docs/src/layouts/App/base.scss index f0b05ab2..9afe3622 100644 --- a/docs/src/layouts/App/base.scss +++ b/docs/src/layouts/App/base.scss @@ -53,7 +53,7 @@ body { line-height: 1.7; font-feature-settings: 'cv05' 1; background-color: $colorBlack; - color: $colorWhite; + color: $colorText; height: 100%; } diff --git a/docs/src/layouts/App/prism.scss b/docs/src/layouts/App/prism.scss index 2f9b6cfd..6b8544a3 100644 --- a/docs/src/layouts/App/prism.scss +++ b/docs/src/layouts/App/prism.scss @@ -27,7 +27,7 @@ pre[class*="language-"] { :not(pre) > code[class*="language-"] { white-space: normal; - color: $colorText; + color: $colorWhite; background: $codeBackground; border-radius: 0.2em; padding: 0.1em; @@ -42,7 +42,7 @@ pre > code[class*="language-"] { pre[class*="language-"] { overflow: auto; position: relative; - color: $colorText; + color: $colorWhite; background: $codeBackground; padding: 1.2rem 1.5rem !important; border-radius: 0.5rem; diff --git a/docs/src/layouts/App/style.scss b/docs/src/layouts/App/style.scss index d0d1ec7a..1a2f2102 100644 --- a/docs/src/layouts/App/style.scss +++ b/docs/src/layouts/App/style.scss @@ -201,19 +201,21 @@ $menuBreakPoint: 750px; height: 100vh; overflow: auto; overscroll-behavior: contain; + border-right: 1px solid rgba($colorWhite, 0.1); } &__content { flex: 1 1 auto; + min-width: 0; padding: 0 2rem 2rem 2rem; } &__top-bar { - padding: 2rem; + padding: 1rem 0; position: sticky; z-index: 2; top: 0; - background-color: rgba($colorBlack, 0.7); + background-color: rgba($colorBlack, 0.8); backdrop-filter: blur(10px); } @@ -248,12 +250,11 @@ $menuBreakPoint: 750px; } &__link { - display: block; - padding: 0.1rem 0.5rem; + display: flex; + justify-content: space-between; + padding: 0.25rem 0.5rem; border-radius: 5px; - font-weight: 500; - color: rgba($colorWhite, 0.6); - margin-bottom: 0.2rem; + font-size: 0.85rem; margin-left: -0.5rem; &:hover { @@ -262,7 +263,7 @@ $menuBreakPoint: 750px; &.active { color: $colorWhite; - background-color: rgba($colorWhite, 0.05); + background-color: rgba($colorWhite, 0.08); } &--draft { @@ -270,8 +271,12 @@ $menuBreakPoint: 750px; } &--with-children::after { - content: '→'; + content: '↓'; color: rgba($colorWhite, 0.2); } } + + &__main { + margin-top: 2rem; + } } diff --git a/docs/src/templates/DocPage/style.scss b/docs/src/templates/DocPage/style.scss index 1de3a93e..816e2a48 100644 --- a/docs/src/templates/DocPage/style.scss +++ b/docs/src/templates/DocPage/style.scss @@ -12,9 +12,13 @@ } > ul li, - > ol li { - margin-top: $spacing; - margin-bottom: $spacing; + > ol li, + > ul ul, + > ul ol, + > ol ol, + > ol ul { + margin-top: 0.5 * $spacing; + margin-bottom: 0.5 * $spacing; } > h1, @@ -23,6 +27,7 @@ > h4, > h5, > h6 { + color: $colorWhite; margin-top: 3 * $spacing; margin-bottom: $spacing; @@ -61,18 +66,14 @@ } } - > :first-child { + :first-child { margin-top: 0; } - > :last-child { + :last-child { margin-bottom: 0; } - > p { - color: rgba($colorWhite, 0.8); - } - > pre { border: 1px solid rgba($colorWhite, 0.1); } @@ -92,13 +93,32 @@ text-decoration: underline; } + #table-of-contents + ul { + border: 1px solid rgba($colorWhite, 0.1); + padding: 1.2rem 1.5rem !important; + border-radius: 0.5rem; + + li { + padding-left: 0; + + &::before { + display: none; + } + + ul { + margin-left: 1rem; + } + + // a::before { + // content: '→ '; + // opacity: 0.2; + // } + } + } + > ul { list-style-type: none; - > * + * { - margin-top: 0.5rem; - } - li { position: relative; padding-left: 1.25rem; @@ -117,10 +137,6 @@ > ol { counter-reset: item; - > * + * { - margin-top: 0.5rem; - } - li { position: relative; padding-left: 2.5rem; @@ -151,7 +167,6 @@ border-collapse: collapse; font-size: 0.85rem; text-align: left; - color: rgba($colorWhite, 0.8); th, td { From 597b2db742a8cd776cbd79522b56a24b25a73d4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= Date: Mon, 12 Oct 2020 17:07:10 +0200 Subject: [PATCH 07/28] add label to toc --- docs/src/templates/DocPage/style.scss | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/docs/src/templates/DocPage/style.scss b/docs/src/templates/DocPage/style.scss index 816e2a48..9d16438d 100644 --- a/docs/src/templates/DocPage/style.scss +++ b/docs/src/templates/DocPage/style.scss @@ -98,6 +98,17 @@ padding: 1.2rem 1.5rem !important; border-radius: 0.5rem; + &::before { + display: block; + content: 'On this page'; + font-weight: 700; + letter-spacing: 0.025rem; + font-size: 0.75rem; + text-transform: uppercase; + color: rgba($colorWhite, 0.3); + margin-bottom: 0.5rem; + } + li { padding-left: 0; From 5d679249d546117c980da17dfbb5d7aa4b17d25c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= Date: Mon, 12 Oct 2020 17:12:44 +0200 Subject: [PATCH 08/28] fix render bug --- docs/src/layouts/App/style.scss | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/docs/src/layouts/App/style.scss b/docs/src/layouts/App/style.scss index 1a2f2102..2f5511aa 100644 --- a/docs/src/layouts/App/style.scss +++ b/docs/src/layouts/App/style.scss @@ -215,8 +215,21 @@ $menuBreakPoint: 750px; position: sticky; z-index: 2; top: 0; - background-color: rgba($colorBlack, 0.8); backdrop-filter: blur(10px); + + &::after { + content: ''; + z-index: -1; + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 100%; + background-color: $colorBlack; + opacity: 0.8; + transform: translate3d(0,0,0); + pointer-events: none; + } } &__inner { From 9abb4afc214b452cc4c9a7368222c1e76f89caae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= Date: Mon, 12 Oct 2020 17:16:51 +0200 Subject: [PATCH 09/28] improve inline code breaks --- docs/src/templates/DocPage/style.scss | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/docs/src/templates/DocPage/style.scss b/docs/src/templates/DocPage/style.scss index 9d16438d..25498b81 100644 --- a/docs/src/templates/DocPage/style.scss +++ b/docs/src/templates/DocPage/style.scss @@ -84,6 +84,7 @@ > .remark-container code { color: $colorPurple; background-color: rgba($colorPurple, 0.1); + box-decoration-break: clone; } > p a, @@ -119,11 +120,6 @@ ul { margin-left: 1rem; } - - // a::before { - // content: '→ '; - // opacity: 0.2; - // } } } From 34affa7bbbf6a1d76c37f68a789df24d1242e2ae Mon Sep 17 00:00:00 2001 From: Hans Pagel Date: Mon, 12 Oct 2020 17:19:19 +0200 Subject: [PATCH 10/28] fix tests --- docs/src/demos/Extensions/Heading/index.spec.js | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/docs/src/demos/Extensions/Heading/index.spec.js b/docs/src/demos/Extensions/Heading/index.spec.js index edb14b07..7fd1e3a3 100644 --- a/docs/src/demos/Extensions/Heading/index.spec.js +++ b/docs/src/demos/Extensions/Heading/index.spec.js @@ -14,9 +14,6 @@ context('/api/extensions/heading', () => { '

Example Text

', '

Example Text

', '

Example Text

', - '

Example Text

', - '
Example Text
', - '
Example Text
', ] headings.forEach(html => { @@ -28,9 +25,9 @@ context('/api/extensions/heading', () => { }) }) - it('should omit invalid headings', () => { + it('should omit disabled heading levels', () => { cy.get('.ProseMirror').then(([{ editor }]) => { - editor.setContent('Example Text') + editor.setContent('

Example Text

') expect(editor.html()).to.eq('

Example Text

') }) }) From ba7d17603b9f1cf688bdfde7122315b7f28fd0fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= Date: Mon, 12 Oct 2020 17:21:09 +0200 Subject: [PATCH 11/28] decrease text brightness --- docs/src/variables.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/src/variables.scss b/docs/src/variables.scss index 61fa793a..27db5a61 100644 --- a/docs/src/variables.scss +++ b/docs/src/variables.scss @@ -1,6 +1,6 @@ $colorWhite: #FFF; $colorBlack: #0D0D0D; -$colorText: rgba($colorWhite, 0.8); +$colorText: rgba($colorWhite, 0.75); $colorGrey: #616161; $colorPurple: #A975FF; $colorRed: #FB5151; From 512f504f087e4223dc1d7ae9d915e9d958b01b17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= Date: Mon, 12 Oct 2020 17:43:20 +0200 Subject: [PATCH 12/28] add github link --- docs/src/layouts/App/base.scss | 4 ++++ docs/src/layouts/App/index.vue | 21 +++++++++++++++++++++ docs/src/layouts/App/style.scss | 18 ++++++++++++++++++ 3 files changed, 43 insertions(+) diff --git a/docs/src/layouts/App/base.scss b/docs/src/layouts/App/base.scss index 9afe3622..2e1ee2ac 100644 --- a/docs/src/layouts/App/base.scss +++ b/docs/src/layouts/App/base.scss @@ -75,6 +75,10 @@ a { color: inherit; transition: color 0.2s $ease, background-color 0.2s $ease; text-decoration: none; + + &:hover { + color: $colorWhite; + } } code { diff --git a/docs/src/layouts/App/index.vue b/docs/src/layouts/App/index.vue index a890caba..e619a2d9 100644 --- a/docs/src/layouts/App/index.vue +++ b/docs/src/layouts/App/index.vue @@ -75,6 +75,27 @@
+
+ + {{ $static.metadata.siteName }} + + + + +
+