From f1ff37d65816efab8632ec6eee9a039c73aaad5b Mon Sep 17 00:00:00 2001 From: Franck Date: Sat, 12 Oct 2019 10:37:22 +0200 Subject: [PATCH 1/2] feat($config): Allow overriding badges colors (close #1940) --- packages/@vuepress/core/lib/client/style/config.styl | 3 +++ .../@vuepress/theme-default/global-components/Badge.vue | 6 +++--- packages/docs/docs/config/README.md | 3 +++ packages/docs/docs/zh/config/README.md | 3 +++ 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/packages/@vuepress/core/lib/client/style/config.styl b/packages/@vuepress/core/lib/client/style/config.styl index 4d8c916ce6..00d4466495 100644 --- a/packages/@vuepress/core/lib/client/style/config.styl +++ b/packages/@vuepress/core/lib/client/style/config.styl @@ -4,6 +4,9 @@ $textColor = #2c3e50 $borderColor = #eaecef $codeBgColor = #282c34 $arrowBgColor = #ccc +$badgeTip = #42b983 +$badgeWarning = darken(#ffe564, 35%) +$badgeError = #DA5961 // layout $navbarHeight = 3.6rem diff --git a/packages/@vuepress/theme-default/global-components/Badge.vue b/packages/@vuepress/theme-default/global-components/Badge.vue index 8255293b56..d6393d85e8 100644 --- a/packages/@vuepress/theme-default/global-components/Badge.vue +++ b/packages/@vuepress/theme-default/global-components/Badge.vue @@ -34,11 +34,11 @@ export default { color white background-color #42b983 &.tip, &.green - background-color #42b983 + background-color $badgeTip &.error - background-color #DA5961 //#f66 + background-color $badgeError &.warning, &.warn, &.yellow - background-color darken(#ffe564, 35%) + background-color $badgeWarning & + & margin-left 5px diff --git a/packages/docs/docs/config/README.md b/packages/docs/docs/config/README.md index 9ee0aa6663..2f63b1c9ba 100644 --- a/packages/docs/docs/config/README.md +++ b/packages/docs/docs/config/README.md @@ -152,6 +152,9 @@ $accentColor = #3eaf7c $textColor = #2c3e50 $borderColor = #eaecef $codeBgColor = #282c34 +$badgeTip = #42b983 +$badgeWarning = darken(#ffe564, 35%) +$badgeError = #DA5961 ``` ::: danger Note diff --git a/packages/docs/docs/zh/config/README.md b/packages/docs/docs/zh/config/README.md index 79af789c04..4b32d26ef2 100644 --- a/packages/docs/docs/zh/config/README.md +++ b/packages/docs/docs/zh/config/README.md @@ -148,6 +148,9 @@ $accentColor = #3eaf7c $textColor = #2c3e50 $borderColor = #eaecef $codeBgColor = #282c34 +$badgeTip = #42b983 +$badgeWarning = darken(#ffe564, 35%) +$badgeError = #DA5961 ``` ::: danger Note From 761aaa5c958452079da69234e02a1d92f3891b68 Mon Sep 17 00:00:00 2001 From: Franck Date: Wed, 23 Oct 2019 10:40:28 +0200 Subject: [PATCH 2/2] fix: Rename stylus color variables --- packages/@vuepress/core/lib/client/style/config.styl | 6 +++--- .../@vuepress/theme-default/global-components/Badge.vue | 6 +++--- packages/docs/docs/config/README.md | 6 +++--- packages/docs/docs/zh/config/README.md | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/packages/@vuepress/core/lib/client/style/config.styl b/packages/@vuepress/core/lib/client/style/config.styl index 00d4466495..c480436ccc 100644 --- a/packages/@vuepress/core/lib/client/style/config.styl +++ b/packages/@vuepress/core/lib/client/style/config.styl @@ -4,9 +4,9 @@ $textColor = #2c3e50 $borderColor = #eaecef $codeBgColor = #282c34 $arrowBgColor = #ccc -$badgeTip = #42b983 -$badgeWarning = darken(#ffe564, 35%) -$badgeError = #DA5961 +$badgeTipColor = #42b983 +$badgeWarningColor = darken(#ffe564, 35%) +$badgeErrorColor = #DA5961 // layout $navbarHeight = 3.6rem diff --git a/packages/@vuepress/theme-default/global-components/Badge.vue b/packages/@vuepress/theme-default/global-components/Badge.vue index d6393d85e8..53951f9d50 100644 --- a/packages/@vuepress/theme-default/global-components/Badge.vue +++ b/packages/@vuepress/theme-default/global-components/Badge.vue @@ -34,11 +34,11 @@ export default { color white background-color #42b983 &.tip, &.green - background-color $badgeTip + background-color $badgeTipColor &.error - background-color $badgeError + background-color $badgeErrorColor &.warning, &.warn, &.yellow - background-color $badgeWarning + background-color $badgeWarningColor & + & margin-left 5px diff --git a/packages/docs/docs/config/README.md b/packages/docs/docs/config/README.md index 2f63b1c9ba..e092fb9129 100644 --- a/packages/docs/docs/config/README.md +++ b/packages/docs/docs/config/README.md @@ -152,9 +152,9 @@ $accentColor = #3eaf7c $textColor = #2c3e50 $borderColor = #eaecef $codeBgColor = #282c34 -$badgeTip = #42b983 -$badgeWarning = darken(#ffe564, 35%) -$badgeError = #DA5961 +$badgeTipColor = #42b983 +$badgeWarningColor = darken(#ffe564, 35%) +$badgeErrorColor = #DA5961 ``` ::: danger Note diff --git a/packages/docs/docs/zh/config/README.md b/packages/docs/docs/zh/config/README.md index 4b32d26ef2..bf11609f42 100644 --- a/packages/docs/docs/zh/config/README.md +++ b/packages/docs/docs/zh/config/README.md @@ -148,9 +148,9 @@ $accentColor = #3eaf7c $textColor = #2c3e50 $borderColor = #eaecef $codeBgColor = #282c34 -$badgeTip = #42b983 -$badgeWarning = darken(#ffe564, 35%) -$badgeError = #DA5961 +$badgeTipColor = #42b983 +$badgeWarningColor = darken(#ffe564, 35%) +$badgeErrorColor = #DA5961 ``` ::: danger Note