From 180b31216eeb5d2b65c7c58e72bf8c4f715d92d7 Mon Sep 17 00:00:00 2001 From: Pierre Wizla Date: Tue, 9 Aug 2022 10:55:32 +0200 Subject: [PATCH 01/17] Add branding palette --- docs/.vuepress/styles/index.styl | 1 + docs/.vuepress/styles/palette.styl | 42 +++++++++++++++++++++++++++++- 2 files changed, 42 insertions(+), 1 deletion(-) diff --git a/docs/.vuepress/styles/index.styl b/docs/.vuepress/styles/index.styl index ef392e1f9b..0e07c04108 100644 --- a/docs/.vuepress/styles/index.styl +++ b/docs/.vuepress/styles/index.styl @@ -7,4 +7,5 @@ .sidebar-heading:not(.clickable) opacity: 1 !important +@import "palette.styl" @import "strapi-custom-blocks.styl" diff --git a/docs/.vuepress/styles/palette.styl b/docs/.vuepress/styles/palette.styl index 8c59b67737..48d0318e68 100644 --- a/docs/.vuepress/styles/palette.styl +++ b/docs/.vuepress/styles/palette.styl @@ -5,4 +5,44 @@ $borderColor = #eeeeee $codeBgColor = #282c34 // Layout -$contentWidth = 900px \ No newline at end of file +$contentWidth = 900px + + +// Strapi branding palette +$primary700 = #4945FF +$primary600 = #4945FF +$primary200 = #F0F0FF +$primary100 = #F0F0FF + +$success700 = #2F6846 +$success600 = #328048 +$success200 = #C6F0C2 +$success100 = #EAFBE7 + +$danger700 = #B72B1A +$danger600 = #D02B20 +$danger200 = #F5C0B8 +$danger100 = #FCECEA + +$warning700 = #BE5D01 +$warning600 = #D9822F +$warning200 = #FAE7B9 +$warning100 = #FDF4DC + +$secondary700 = #006096 +$secondary600 = #0C75AF +$secondary200 = #B8E1FF +$secondary100 = #EAF5FF + +$alternative700 = #8212D1 +$alternative600 = #9736E8 +$alternative200 = #E0C1F4 +$alternative100 = #F6E6FC + +$neutral900 = #212134 +$neutral800 = #32324D +$neutral700 = #4A4A6A +$neutral500 = #8E8EA9 +$neutral150 = #eaeaef +$neutral100 = #F6F6F9 +$neutral0 = #FFFFFF From 2c8936f6e4fa8a9aecc3f9c5c621d3b9ab7f8278 Mon Sep 17 00:00:00 2001 From: Pierre Wizla Date: Tue, 9 Aug 2022 10:55:51 +0200 Subject: [PATCH 02/17] Add branding stylesheet --- docs/.vuepress/styles/branding.styl | 36 +++++++++++++++++++++++++++++ docs/.vuepress/styles/index.styl | 1 + 2 files changed, 37 insertions(+) create mode 100644 docs/.vuepress/styles/branding.styl diff --git a/docs/.vuepress/styles/branding.styl b/docs/.vuepress/styles/branding.styl new file mode 100644 index 0000000000..1a491e8e1e --- /dev/null +++ b/docs/.vuepress/styles/branding.styl @@ -0,0 +1,36 @@ +body +// TODO: system fonts + font-family: "SF UI text" + +.install-link + // text-decoration: none + background-color: #4945FF + border-radius: 6px + padding: 20px + color: $primary100 + justify-content: space-between + + .text + flex-grow: 1 + + .title + color: $neutral0 + + .description + color: $primary100 + + .arrow + width: 24px + height: 24px + + &:hover + .title + color: $neutral0 + text-decoration: underline + .description + color: $neutral0 + // text-decoration: none + .arrow + // TODO: + + diff --git a/docs/.vuepress/styles/index.styl b/docs/.vuepress/styles/index.styl index 0e07c04108..dd842b3390 100644 --- a/docs/.vuepress/styles/index.styl +++ b/docs/.vuepress/styles/index.styl @@ -9,3 +9,4 @@ @import "palette.styl" @import "strapi-custom-blocks.styl" +@import "branding.styl" From 66a9ebc6fd9a3d0504677f521691463ec4d61ec8 Mon Sep 17 00:00:00 2001 From: Pierre Wizla Date: Tue, 9 Aug 2022 10:56:08 +0200 Subject: [PATCH 03/17] Modify InstallLink component --- docs/.vuepress/public/assets/NextIcon.svg | 1 + .../theme/global-components/InstallLink.vue | 27 ++++++++++++++----- docs/.vuepress/theme/icons/NextIcon.svg | 1 + 3 files changed, 22 insertions(+), 7 deletions(-) create mode 100644 docs/.vuepress/public/assets/NextIcon.svg create mode 100644 docs/.vuepress/theme/icons/NextIcon.svg diff --git a/docs/.vuepress/public/assets/NextIcon.svg b/docs/.vuepress/public/assets/NextIcon.svg new file mode 100644 index 0000000000..99035875e6 --- /dev/null +++ b/docs/.vuepress/public/assets/NextIcon.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/docs/.vuepress/theme/global-components/InstallLink.vue b/docs/.vuepress/theme/global-components/InstallLink.vue index 460f2ed343..ab6bfb6031 100644 --- a/docs/.vuepress/theme/global-components/InstallLink.vue +++ b/docs/.vuepress/theme/global-components/InstallLink.vue @@ -3,14 +3,21 @@ - +

+ + + foo + + - \ No newline at end of file + diff --git a/docs/.vuepress/theme/icons/NextIcon.svg b/docs/.vuepress/theme/icons/NextIcon.svg new file mode 100644 index 0000000000..99035875e6 --- /dev/null +++ b/docs/.vuepress/theme/icons/NextIcon.svg @@ -0,0 +1 @@ + \ No newline at end of file From eb89a54e1bc957edcadd650b9f256c10efbb27d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Georget?= Date: Tue, 9 Aug 2022 18:23:35 +0200 Subject: [PATCH 04/17] Apply system-ui font --- docs/.vuepress/styles/branding.styl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/.vuepress/styles/branding.styl b/docs/.vuepress/styles/branding.styl index 1a491e8e1e..2354b53221 100644 --- a/docs/.vuepress/styles/branding.styl +++ b/docs/.vuepress/styles/branding.styl @@ -1,6 +1,6 @@ body // TODO: system fonts - font-family: "SF UI text" + font-family: system-ui .install-link // text-decoration: none From 3a9fcc823179caff5fcf4cbe4547df0aa9e5bc01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Georget?= Date: Tue, 9 Aug 2022 18:28:07 +0200 Subject: [PATCH 05/17] Update logo --- docs/.vuepress/public/assets/logo.svg | 30 +++++++++++++--------- docs/.vuepress/theme/components/Navbar.vue | 4 +-- 2 files changed, 20 insertions(+), 14 deletions(-) diff --git a/docs/.vuepress/public/assets/logo.svg b/docs/.vuepress/public/assets/logo.svg index c7d3241966..4cfa55c078 100644 --- a/docs/.vuepress/public/assets/logo.svg +++ b/docs/.vuepress/public/assets/logo.svg @@ -1,13 +1,19 @@ - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + diff --git a/docs/.vuepress/theme/components/Navbar.vue b/docs/.vuepress/theme/components/Navbar.vue index 2c3662f06a..04f5883067 100644 --- a/docs/.vuepress/theme/components/Navbar.vue +++ b/docs/.vuepress/theme/components/Navbar.vue @@ -103,10 +103,10 @@ $navbar-horizontal-padding = 1.5rem a, span, img display inline-block .logo - height $navbarHeight - 1.4rem + height 25px min-width $navbarHeight - 1.4rem margin-right 0.8rem - vertical-align top + vertical-align middle .site-name font-size 1.3rem font-weight 600 From 80080e6015df4683a5bf939577858ddca1191c96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Georget?= Date: Tue, 9 Aug 2022 19:00:12 +0200 Subject: [PATCH 06/17] Position the search bar --- docs/.vuepress/styles/branding.styl | 25 ++++++++++++++++++- docs/.vuepress/styles/palette.styl | 2 ++ .../theme/components/AlgoliaSearchBox.vue | 6 ++--- docs/.vuepress/theme/components/Navbar.vue | 12 +-------- docs/.vuepress/theme/icons/NextIcon.svg | 1 - 5 files changed, 30 insertions(+), 16 deletions(-) delete mode 100644 docs/.vuepress/theme/icons/NextIcon.svg diff --git a/docs/.vuepress/styles/branding.styl b/docs/.vuepress/styles/branding.styl index 2354b53221..1a13a1cee1 100644 --- a/docs/.vuepress/styles/branding.styl +++ b/docs/.vuepress/styles/branding.styl @@ -33,4 +33,27 @@ body .arrow // TODO: - +.search-box + width: 100% + margin: 22px 0 0 !important + text-align: center + + span + width: calc(100% - 50px) + + input + width: inherit !important + font-family: system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif; + font-size: 13px !important; + color: $neutral600 !important + border-radius: 6px !important + border: 1px solid $neutral200 !important + + &::-webkit-input-placeholder + color $neutral600 !important + &:-moz-placeholder /* Firefox 18- */ + color $neutral600 !important + &::-moz-placeholder /* Firefox 19+ */ + color $neutral600 !important + &:-ms-input-placeholder + color $neutral600 !important diff --git a/docs/.vuepress/styles/palette.styl b/docs/.vuepress/styles/palette.styl index 48d0318e68..6dca2eaec8 100644 --- a/docs/.vuepress/styles/palette.styl +++ b/docs/.vuepress/styles/palette.styl @@ -42,7 +42,9 @@ $alternative100 = #F6E6FC $neutral900 = #212134 $neutral800 = #32324D $neutral700 = #4A4A6A +$neutral600 = #666687 $neutral500 = #8E8EA9 +$neutral200 = #DCDCE4 $neutral150 = #eaeaef $neutral100 = #F6F6F9 $neutral0 = #FFFFFF diff --git a/docs/.vuepress/theme/components/AlgoliaSearchBox.vue b/docs/.vuepress/theme/components/AlgoliaSearchBox.vue index c1f46b2246..f49f891ef9 100644 --- a/docs/.vuepress/theme/components/AlgoliaSearchBox.vue +++ b/docs/.vuepress/theme/components/AlgoliaSearchBox.vue @@ -7,7 +7,7 @@ @@ -33,8 +36,21 @@ export default {