From 07370601ced88feaf18ef038485fa3fea7cae590 Mon Sep 17 00:00:00 2001 From: Brandon Bellero Date: Fri, 22 Mar 2019 17:45:39 -0400 Subject: [PATCH 1/6] allow configurable badge colors --- lib/app/components/Badge.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/app/components/Badge.vue b/lib/app/components/Badge.vue index 17e6ba6e7a..599ab17b2c 100644 --- a/lib/app/components/Badge.vue +++ b/lib/app/components/Badge.vue @@ -38,9 +38,9 @@ export default { &.top vertical-align top &.tip, &.green - background-color #42b983 + background-color $badgeGreen &.error - background-color #DA5961 //#f66 + background-color $badgeError &.warning, &.warn, &.yellow - background-color darken(#ffe564, 35%) + background-color $badgeWarning From 877b4a2fe1052a27e334418330a7e114635444f8 Mon Sep 17 00:00:00 2001 From: Brandon Bellero Date: Fri, 22 Mar 2019 17:51:01 -0400 Subject: [PATCH 2/6] Update config.styl --- lib/default-theme/styles/config.styl | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/default-theme/styles/config.styl b/lib/default-theme/styles/config.styl index a57d4484de..118e47f8bc 100644 --- a/lib/default-theme/styles/config.styl +++ b/lib/default-theme/styles/config.styl @@ -4,6 +4,9 @@ $textColor = #2c3e50 $borderColor = #eaecef $codeBgColor = #282c34 $arrowBgColor = #ccc +$badgeGreen = #42b983 +$badgeWarning = darken(#ffe564, 35%) +$badgeError = #DA5961 //#f66 // layout $navbarHeight = 3.6rem From de36185ef371dc3d3b42306cec21de4afd6696a0 Mon Sep 17 00:00:00 2001 From: Brandon Bellero Date: Sun, 24 Mar 2019 13:43:23 -0400 Subject: [PATCH 3/6] Update badge name --- lib/default-theme/styles/config.styl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/default-theme/styles/config.styl b/lib/default-theme/styles/config.styl index 118e47f8bc..d48e0b6d01 100644 --- a/lib/default-theme/styles/config.styl +++ b/lib/default-theme/styles/config.styl @@ -4,7 +4,7 @@ $textColor = #2c3e50 $borderColor = #eaecef $codeBgColor = #282c34 $arrowBgColor = #ccc -$badgeGreen = #42b983 +$badgeTip = #42b983 $badgeWarning = darken(#ffe564, 35%) $badgeError = #DA5961 //#f66 From 24f075678f86fd6d7f0e642d206a3423074fe6c8 Mon Sep 17 00:00:00 2001 From: Brandon Bellero Date: Sun, 24 Mar 2019 13:45:33 -0400 Subject: [PATCH 4/6] Update reference to badge variable --- lib/app/components/Badge.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/app/components/Badge.vue b/lib/app/components/Badge.vue index 599ab17b2c..faa2e5d285 100644 --- a/lib/app/components/Badge.vue +++ b/lib/app/components/Badge.vue @@ -38,7 +38,7 @@ export default { &.top vertical-align top &.tip, &.green - background-color $badgeGreen + background-color $badgeTip &.error background-color $badgeError &.warning, &.warn, &.yellow From bf26fe5cc7a88b435efd65fe4be14d0839398aee Mon Sep 17 00:00:00 2001 From: Franck Date: Sat, 12 Oct 2019 10:04:28 +0200 Subject: [PATCH 5/6] feat($docs): Update v0 documentation for badges color override --- docs/default-theme-config/README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docs/default-theme-config/README.md b/docs/default-theme-config/README.md index 2643db6de1..36d6398f46 100644 --- a/docs/default-theme-config/README.md +++ b/docs/default-theme-config/README.md @@ -461,6 +461,11 @@ $accentColor = #3eaf7c $textColor = #2c3e50 $borderColor = #eaecef $codeBgColor = #282c34 + +// badges colors +$badgeTip = #42b983 +$badgeWarning = darken(#ffe564, 35%) +$badgeError = #DA596 ``` ### Existing issues From c9533cf63fda3632c1114e76e88404b2740c30b9 Mon Sep 17 00:00:00 2001 From: Franck Date: Sat, 12 Oct 2019 10:42:01 +0200 Subject: [PATCH 6/6] feat($docs): Update zh documentation --- docs/default-theme-config/README.md | 2 -- docs/zh/default-theme-config/README.md | 3 +++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/default-theme-config/README.md b/docs/default-theme-config/README.md index 36d6398f46..7e2331c87c 100644 --- a/docs/default-theme-config/README.md +++ b/docs/default-theme-config/README.md @@ -461,8 +461,6 @@ $accentColor = #3eaf7c $textColor = #2c3e50 $borderColor = #eaecef $codeBgColor = #282c34 - -// badges colors $badgeTip = #42b983 $badgeWarning = darken(#ffe564, 35%) $badgeError = #DA596 diff --git a/docs/zh/default-theme-config/README.md b/docs/zh/default-theme-config/README.md index 94c3b11bf5..1ccd27cf5a 100644 --- a/docs/zh/default-theme-config/README.md +++ b/docs/zh/default-theme-config/README.md @@ -443,6 +443,9 @@ $accentColor = #3eaf7c $textColor = #2c3e50 $borderColor = #eaecef $codeBgColor = #282c34 +$badgeTip = #42b983 +$badgeWarning = darken(#ffe564, 35%) +$badgeError = #DA596 ``` ### 低版本存在的问题