From 65881cb0db4721c19f9619be1c2b3c03ec953804 Mon Sep 17 00:00:00 2001 From: simurai Date: Wed, 20 May 2015 16:15:36 +0900 Subject: [PATCH 01/12] :art: Rename variables --- styles/colors.less | 41 +++++++------- styles/language.less | 100 +++++++++++++++++------------------ styles/languages/cs.less | 2 +- styles/languages/gfm.less | 6 +-- styles/languages/java.less | 4 +- styles/languages/python.less | 2 +- styles/syntax-variables.less | 50 +++++++++--------- 7 files changed, 100 insertions(+), 105 deletions(-) diff --git a/styles/colors.less b/styles/colors.less index 3d069ca..96b6e23 100644 --- a/styles/colors.less +++ b/styles/colors.less @@ -1,33 +1,28 @@ // Config ----------------------------------- -@syntax-hue: 220; -@syntax-saturation: 24%; +@syntax-hue: 230; +@syntax-saturation: 16%; @syntax-brightness: 20%; // Base colors ----------------------------------- -@syntax-base-accent-color: hsl(@syntax-hue, 100%, 66% ); -@syntax-base-background-color: hsv(@syntax-hue, @syntax-saturation, @syntax-brightness); -@syntax-base-text-color: @light-gray; -@syntax-base-guide-color: fade(@syntax-base-text-color, 15%); +@syntax-accent: hsl(@syntax-hue, 100%, 66% ); +@syntax-guide: fade(@syntax-fg, 15%); +@syntax-fg: @mono-1; +@syntax-bg: hsl(@syntax-hue, @syntax-saturation, @syntax-brightness); // Colors: Mix Base16 Tomorrow with Theme hue ----------------------------------- -@syntax-mix-base: hsl(@syntax-hue, 100%, 66%); -@syntax-mix-grey: 12%; -@syntax-mix-color: 0%; -@very-light-gray: mix( @syntax-mix-base, hsl(0,0%,84%), @syntax-mix-grey); -@light-gray: mix( @syntax-mix-base, hsl(0,0%,72%), @syntax-mix-grey); -@gray: mix( @syntax-mix-base, hsl(0,0%,54%), @syntax-mix-grey); -@dark-gray: mix( @syntax-mix-base, hsl(0,0%,36%), @syntax-mix-grey); -@very-dark-gray: mix( @syntax-mix-base, hsl(0,0%,18%), @syntax-mix-grey); +@mono-1: hsl(@syntax-hue, 32%, 88%); +@mono-2: hsl(@syntax-hue, 16%, 66%); +@mono-3: hsl(@syntax-hue, 8%, 44%); -@cyan: mix( @syntax-mix-base, #57B6C2, @syntax-mix-color); -@blue: mix( @syntax-mix-base, #61AEEF, @syntax-mix-color); -@purple: mix( @syntax-mix-base, #C679DD, @syntax-mix-color); -@green: mix( @syntax-mix-base, #97C378, @syntax-mix-color); -@red: mix( @syntax-mix-base, #DF6A73, @syntax-mix-color); -@dark-red: mix( @syntax-mix-base, #BE4F44, @syntax-mix-color); -@orange: mix( @syntax-mix-base, #D29B67, @syntax-mix-color); -@light-orange: mix( @syntax-mix-base, #E5C17C, @syntax-mix-color); -@bright-orange: mix( @syntax-mix-base, #FF8000, @syntax-mix-color); +@hue-1: #57B6C2; +@hue-2: #61AEEF; +@hue-3: #C679DD; +@hue-4: #97C378; +@hue-5: #DF6A73; +@hue-5-2: #BE4F44; +@hue-6: #D29B67; +@hue-6-2: #E5C17C; +@hue-6-3: #FF8000; diff --git a/styles/language.less b/styles/language.less index c62c8da..9bcad0f 100644 --- a/styles/language.less +++ b/styles/language.less @@ -1,26 +1,26 @@ // Language syntax highlighting .comment { - color: @dark-gray; + color: @mono-3; font-style: italic; } .entity { &.name.type { - color: @light-orange; + color: @hue-6-2; } &.other.inherited-class { - color: @green; + color: @hue-4; } } .keyword { - color: @purple; + color: @hue-3; &.control { - color: @purple; + color: @hue-3; } &.operator { @@ -28,21 +28,21 @@ } &.other.special-method { - color: @blue; + color: @hue-2; } &.other.unit { - color: @orange; + color: @hue-6; } } .storage { - color: @purple; + color: @hue-3; &.type { &.annotation, &.primitive { - color: @purple; + color: @hue-3; } } @@ -55,34 +55,34 @@ } .constant { - color: @orange; + color: @hue-6; &.variable { - color: @orange; + color: @hue-6; } &.character.escape { - color: @cyan; + color: @hue-1; } &.numeric { - color: @orange; + color: @hue-6; } &.other.color { - color: @cyan; + color: @hue-1; } &.other.symbol { - color: @cyan; + color: @hue-1; } } .variable { - color: @red; + color: @hue-5; &.interpolation { - color: @dark-red; + color: @hue-5-2; } &.parameter { @@ -91,31 +91,31 @@ } .invalid.illegal { - background-color: @red; + background-color: @hue-5; color: @syntax-background-color; } .string { - color: @green; + color: @hue-4; &.regexp { - color: @cyan; + color: @hue-1; .source.ruby.embedded { - color: @bright-orange; + color: @hue-6-3; } } &.other.link { - color: @red; + color: @hue-5; } } .punctuation { &.definition { &.comment { - color: @dark-gray; + color: @mono-3; } &.method-parameters, @@ -129,23 +129,23 @@ &.heading, &.identity { - color: @blue; + color: @hue-2; } &.bold { - color: @light-orange; + color: @hue-6-2; font-weight: bold; } &.italic { - color: @purple; + color: @hue-3; font-style: italic; } } &.section { &.embedded { - color: @dark-red; + color: @hue-5-2; } &.method, @@ -158,48 +158,48 @@ .support { &.class { - color: @light-orange; + color: @hue-6-2; } &.function { - color: @cyan; + color: @hue-1; &.any-method { - color: @blue; + color: @hue-2; } } } .entity { &.name.function { - color: @blue; + color: @hue-2; } &.name.class, &.name.type.class { - color: @light-orange; + color: @hue-6-2; } &.name.section { - color: @blue; + color: @hue-2; } &.name.tag { - color: @red; + color: @hue-5; } &.other.attribute-name { - color: @orange; + color: @hue-6; &.id { - color: @blue; + color: @hue-2; } } } .meta { &.class { - color: @light-orange; + color: @hue-6-2; &.body { color: @syntax-text-color; @@ -213,20 +213,20 @@ &.definition { &.variable { - color: @red; + color: @hue-5; } } &.link { - color: @orange; + color: @hue-6; } &.require { - color: @blue; + color: @hue-2; } &.selector { - color: @purple; + color: @hue-3; } &.separator { @@ -247,40 +247,40 @@ .markup { &.bold { - color: @orange; + color: @hue-6; font-weight: bold; } &.changed { - color: @purple; + color: @hue-3; } &.deleted { - color: @red; + color: @hue-5; } &.italic { - color: @purple; + color: @hue-3; font-style: italic; } &.heading .punctuation.definition.heading { - color: @blue; + color: @hue-2; } &.inserted { - color: @green; + color: @hue-4; } &.list { - color: @red; + color: @hue-5; } &.quote { - color: @orange; + color: @hue-6; } &.raw.inline { - color: @green; + color: @hue-4; } } diff --git a/styles/languages/cs.less b/styles/languages/cs.less index bd0386f..9da9c95 100644 --- a/styles/languages/cs.less +++ b/styles/languages/cs.less @@ -1,5 +1,5 @@ .source.cs { .keyword.operator { - color: @purple; + color: @hue-3; } } diff --git a/styles/languages/gfm.less b/styles/languages/gfm.less index 5ec4ecb..eba72ff 100644 --- a/styles/languages/gfm.less +++ b/styles/languages/gfm.less @@ -2,15 +2,15 @@ .markup { -webkit-font-smoothing: auto; &.heading { - color: @red; + color: @hue-5; } &.link { - color: @purple; + color: @hue-3; } } .link .entity { - color: @blue; + color: @hue-2; } } diff --git a/styles/languages/java.less b/styles/languages/java.less index 5a50691..fdefd93 100644 --- a/styles/languages/java.less +++ b/styles/languages/java.less @@ -1,11 +1,11 @@ .source.java { .storage { &.modifier.import { - color: @light-orange; + color: @hue-6-2; } &.type { - color: @light-orange; + color: @hue-6-2; } } } diff --git a/styles/languages/python.less b/styles/languages/python.less index c4c5df9..2dd35af 100644 --- a/styles/languages/python.less +++ b/styles/languages/python.less @@ -1,5 +1,5 @@ .source.python { .keyword.operator.logical.python { - color: @purple; + color: @hue-3; } } diff --git a/styles/syntax-variables.less b/styles/syntax-variables.less index 8af2c87..16b35c6 100644 --- a/styles/syntax-variables.less +++ b/styles/syntax-variables.less @@ -9,26 +9,26 @@ // Official Syntax Variables ----------------------------------- // General colors -@syntax-text-color: @syntax-base-text-color; -@syntax-cursor-color: @syntax-base-accent-color; +@syntax-text-color: @syntax-fg; +@syntax-cursor-color: @syntax-accent; @syntax-selection-color: lighten(@syntax-background-color, 10%); -@syntax-selection-flash-color: @syntax-base-accent-color; -@syntax-background-color: @syntax-base-background-color; +@syntax-selection-flash-color: @syntax-accent; +@syntax-background-color: @syntax-bg; // Guide colors -@syntax-wrap-guide-color: @syntax-base-guide-color; -@syntax-indent-guide-color: @syntax-base-guide-color; -@syntax-invisible-character-color: @syntax-base-guide-color; +@syntax-wrap-guide-color: @syntax-guide; +@syntax-indent-guide-color: @syntax-guide; +@syntax-invisible-character-color: @syntax-guide; // For find and replace markers -@syntax-result-marker-color: @syntax-text-color; -@syntax-result-marker-color-selected: @syntax-base-accent-color; +@syntax-result-marker-color: @syntax-fg; +@syntax-result-marker-color-selected: @syntax-accent; // Gutter colors -@syntax-gutter-text-color: darken(@syntax-text-color, 26%); -@syntax-gutter-text-color-selected: @syntax-text-color; -@syntax-gutter-background-color: @syntax-background-color; // unused -@syntax-gutter-background-color-selected: lighten(@syntax-background-color, 2%); +@syntax-gutter-text-color: lighten(@syntax-bg, 26%); +@syntax-gutter-text-color-selected: lighten(@syntax-bg, 58%); +@syntax-gutter-background-color: @syntax-bg; // unused +@syntax-gutter-background-color-selected: lighten(@syntax-bg, 2%); // Git colors - For git diff info. i.e. in the gutter @syntax-color-renamed: hsl(208, 100%, 60%); @@ -37,15 +37,15 @@ @syntax-color-removed: hsl(0, 70%, 60%); // For language entity colors -@syntax-color-variable: @red; -@syntax-color-constant: @orange; -@syntax-color-property: @syntax-text-color; -@syntax-color-value: @syntax-text-color; -@syntax-color-function: @blue; -@syntax-color-method: @blue; -@syntax-color-class: @light-orange; -@syntax-color-keyword: @purple; -@syntax-color-tag: @red; -@syntax-color-attribute: @orange; -@syntax-color-import: @purple; -@syntax-color-snippet: @green; +@syntax-color-variable: @hue-5; +@syntax-color-constant: @hue-6; +@syntax-color-property: @syntax-fg; +@syntax-color-value: @syntax-fg; +@syntax-color-function: @hue-2; +@syntax-color-method: @hue-2; +@syntax-color-class: @hue-6-2; +@syntax-color-keyword: @hue-3; +@syntax-color-tag: @hue-5; +@syntax-color-attribute: @hue-6; +@syntax-color-import: @hue-3; +@syntax-color-snippet: @hue-4; From 0cc786dc433ce82ab8d1512611fc278500a85e29 Mon Sep 17 00:00:00 2001 From: simurai Date: Wed, 20 May 2015 17:06:22 +0900 Subject: [PATCH 02/12] Convert to HSL --- styles/colors.less | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/styles/colors.less b/styles/colors.less index 96b6e23..38b6b56 100644 --- a/styles/colors.less +++ b/styles/colors.less @@ -1,11 +1,11 @@ // Config ----------------------------------- -@syntax-hue: 230; -@syntax-saturation: 16%; -@syntax-brightness: 20%; +@syntax-hue: 240; +@syntax-saturation: 12%; +@syntax-brightness: 16%; // Base colors ----------------------------------- -@syntax-accent: hsl(@syntax-hue, 100%, 66% ); +@syntax-accent: hsl(@syntax-hue, 100%, 72% ); @syntax-guide: fade(@syntax-fg, 15%); @syntax-fg: @mono-1; @syntax-bg: hsl(@syntax-hue, @syntax-saturation, @syntax-brightness); @@ -17,12 +17,14 @@ @mono-2: hsl(@syntax-hue, 16%, 66%); @mono-3: hsl(@syntax-hue, 8%, 44%); -@hue-1: #57B6C2; -@hue-2: #61AEEF; -@hue-3: #C679DD; -@hue-4: #97C378; -@hue-5: #DF6A73; -@hue-5-2: #BE4F44; -@hue-6: #D29B67; -@hue-6-2: #E5C17C; -@hue-6-3: #FF8000; +@hue-1: hsl(187, 47%, 55%); +@hue-2: hsl(207, 82%, 66%); +@hue-3: hsl(286, 60%, 67%); +@hue-4: hsl(95, 38%, 62%); + +@hue-5: hsl(355, 65%, 65%); +@hue-5-2: hsl(5, 48%, 51%); + +@hue-6: hsl(29, 54%, 61%); +@hue-6-2: hsl(39, 67%, 69%); +@hue-6-3: hsl(30, 100%, 50%); From a80b4b961521b3657164fb532fd5974f6b2524a9 Mon Sep 17 00:00:00 2001 From: simurai Date: Thu, 21 May 2015 01:07:59 +0900 Subject: [PATCH 03/12] Brighter colors --- styles/colors.less | 29 ++++++++++++++--------------- styles/language.less | 2 +- 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/styles/colors.less b/styles/colors.less index 38b6b56..0f27dfd 100644 --- a/styles/colors.less +++ b/styles/colors.less @@ -1,8 +1,8 @@ // Config ----------------------------------- -@syntax-hue: 240; -@syntax-saturation: 12%; -@syntax-brightness: 16%; +@syntax-hue: 230; +@syntax-saturation: 14%; +@syntax-brightness: 20%; // Base colors ----------------------------------- @syntax-accent: hsl(@syntax-hue, 100%, 72% ); @@ -13,18 +13,17 @@ // Colors: Mix Base16 Tomorrow with Theme hue ----------------------------------- -@mono-1: hsl(@syntax-hue, 32%, 88%); -@mono-2: hsl(@syntax-hue, 16%, 66%); -@mono-3: hsl(@syntax-hue, 8%, 44%); +@mono-1: hsl(@syntax-hue, 60%, 92%); +@mono-2: hsl(@syntax-hue, 24%, 66%); +@mono-3: hsl(@syntax-hue, 12%, 44%); -@hue-1: hsl(187, 47%, 55%); -@hue-2: hsl(207, 82%, 66%); -@hue-3: hsl(286, 60%, 67%); -@hue-4: hsl(95, 38%, 62%); +@hue-1: hsl(191, 91%, 73%); +@hue-2: hsl(212, 99%, 75%); +@hue-3: hsl(286, 82%, 79%); +@hue-4: hsl(118, 69%, 78%); -@hue-5: hsl(355, 65%, 65%); -@hue-5-2: hsl(5, 48%, 51%); +@hue-5: hsl( 5, 91%, 73%); +@hue-5-2: hsl(348, 45%, 66%); -@hue-6: hsl(29, 54%, 61%); -@hue-6-2: hsl(39, 67%, 69%); -@hue-6-3: hsl(30, 100%, 50%); +@hue-6: hsl( 48, 71%, 76%); +@hue-6-2: hsl( 41, 98%, 70%); diff --git a/styles/language.less b/styles/language.less index 9bcad0f..1c8ca3d 100644 --- a/styles/language.less +++ b/styles/language.less @@ -103,7 +103,7 @@ color: @hue-1; .source.ruby.embedded { - color: @hue-6-3; + color: @hue-6-2; } } From 57356c139654500092e71b06452490bf7bcd8cac Mon Sep 17 00:00:00 2001 From: simurai Date: Thu, 21 May 2015 01:22:02 +0900 Subject: [PATCH 04/12] :sparkles: --- styles/colors.less | 2 +- styles/syntax-variables.less | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/styles/colors.less b/styles/colors.less index 0f27dfd..9e940be 100644 --- a/styles/colors.less +++ b/styles/colors.less @@ -6,7 +6,7 @@ // Base colors ----------------------------------- @syntax-accent: hsl(@syntax-hue, 100%, 72% ); -@syntax-guide: fade(@syntax-fg, 15%); +@syntax-guide: fade(@syntax-fg, 10%); @syntax-fg: @mono-1; @syntax-bg: hsl(@syntax-hue, @syntax-saturation, @syntax-brightness); diff --git a/styles/syntax-variables.less b/styles/syntax-variables.less index 16b35c6..34964d3 100644 --- a/styles/syntax-variables.less +++ b/styles/syntax-variables.less @@ -25,8 +25,8 @@ @syntax-result-marker-color-selected: @syntax-accent; // Gutter colors -@syntax-gutter-text-color: lighten(@syntax-bg, 26%); -@syntax-gutter-text-color-selected: lighten(@syntax-bg, 58%); +@syntax-gutter-text-color: lighten(@syntax-bg, 20%); +@syntax-gutter-text-color-selected: saturate(lighten(@syntax-bg, 60%), 60%); @syntax-gutter-background-color: @syntax-bg; // unused @syntax-gutter-background-color-selected: lighten(@syntax-bg, 2%); From 900afcb493c4737bdeee524018ea30d0682d3f63 Mon Sep 17 00:00:00 2001 From: simurai Date: Thu, 21 May 2015 12:11:23 +0900 Subject: [PATCH 05/12] :sparkles: --- styles/colors.less | 2 +- styles/syntax-variables.less | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/styles/colors.less b/styles/colors.less index 9e940be..7b454e2 100644 --- a/styles/colors.less +++ b/styles/colors.less @@ -5,7 +5,7 @@ @syntax-brightness: 20%; // Base colors ----------------------------------- -@syntax-accent: hsl(@syntax-hue, 100%, 72% ); +@syntax-accent: hsl(@syntax-hue, 100%, 76% ); @syntax-guide: fade(@syntax-fg, 10%); @syntax-fg: @mono-1; @syntax-bg: hsl(@syntax-hue, @syntax-saturation, @syntax-brightness); diff --git a/styles/syntax-variables.less b/styles/syntax-variables.less index 34964d3..771fe19 100644 --- a/styles/syntax-variables.less +++ b/styles/syntax-variables.less @@ -2,7 +2,7 @@ // Custom Syntax Variables ----------------------------------- -@syntax-cursor-line: hsla(@syntax-hue, 100%, 80%, .04); // needs to be semi-transparent to show serach results +@syntax-cursor-line: fade(@syntax-accent, 8%); // needs to be semi-transparent to show serach results @syntax-bracket-matcher-background-color: lighten(@syntax-background-color, 6%); From ea9d340f1c31ad31dc434919efe25129e3651971 Mon Sep 17 00:00:00 2001 From: simurai Date: Thu, 21 May 2015 12:33:00 +0900 Subject: [PATCH 06/12] Lighter background --- styles/colors.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/styles/colors.less b/styles/colors.less index 7b454e2..5515500 100644 --- a/styles/colors.less +++ b/styles/colors.less @@ -2,7 +2,7 @@ // Config ----------------------------------- @syntax-hue: 230; @syntax-saturation: 14%; -@syntax-brightness: 20%; +@syntax-brightness: 22%; // Base colors ----------------------------------- @syntax-accent: hsl(@syntax-hue, 100%, 76% ); From 90bf8e8ea87ac89d3efce3d3f506b005d28e7c79 Mon Sep 17 00:00:00 2001 From: simurai Date: Thu, 21 May 2015 17:25:13 +0900 Subject: [PATCH 07/12] :art: --- styles/languages/python.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/styles/languages/python.less b/styles/languages/python.less index 75bcd50..4c07102 100644 --- a/styles/languages/python.less +++ b/styles/languages/python.less @@ -4,6 +4,6 @@ } .variable.parameter { - color: @orange; + color: @hue-6; } } From e06eb3a450c0a62b7402b65837f4dcd01506b602 Mon Sep 17 00:00:00 2001 From: simurai Date: Thu, 21 May 2015 17:58:14 +0900 Subject: [PATCH 08/12] :art: --- styles/syntax-variables.less | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/styles/syntax-variables.less b/styles/syntax-variables.less index 771fe19..605ab05 100644 --- a/styles/syntax-variables.less +++ b/styles/syntax-variables.less @@ -37,15 +37,15 @@ @syntax-color-removed: hsl(0, 70%, 60%); // For language entity colors -@syntax-color-variable: @hue-5; -@syntax-color-constant: @hue-6; -@syntax-color-property: @syntax-fg; -@syntax-color-value: @syntax-fg; -@syntax-color-function: @hue-2; -@syntax-color-method: @hue-2; -@syntax-color-class: @hue-6-2; -@syntax-color-keyword: @hue-3; -@syntax-color-tag: @hue-5; -@syntax-color-attribute: @hue-6; -@syntax-color-import: @hue-3; -@syntax-color-snippet: @hue-4; +@syntax-color-variable: @hue-5; +@syntax-color-constant: @hue-6; +@syntax-color-property: @syntax-fg; +@syntax-color-value: @syntax-fg; +@syntax-color-function: @hue-2; +@syntax-color-method: @hue-2; +@syntax-color-class: @hue-6-2; +@syntax-color-keyword: @hue-3; +@syntax-color-tag: @hue-5; +@syntax-color-attribute: @hue-6; +@syntax-color-import: @hue-3; +@syntax-color-snippet: @hue-4; From e9b4960eb2f35a12f3bea92ad7e48fb9016139e9 Mon Sep 17 00:00:00 2001 From: simurai Date: Thu, 21 May 2015 18:03:41 +0900 Subject: [PATCH 09/12] :art: --- styles/colors.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/styles/colors.less b/styles/colors.less index 5515500..fde8b5a 100644 --- a/styles/colors.less +++ b/styles/colors.less @@ -11,7 +11,7 @@ @syntax-bg: hsl(@syntax-hue, @syntax-saturation, @syntax-brightness); -// Colors: Mix Base16 Tomorrow with Theme hue ----------------------------------- +// Colors ----------------------------------- @mono-1: hsl(@syntax-hue, 60%, 92%); @mono-2: hsl(@syntax-hue, 24%, 66%); From 22259ebc65a68b680ce252d76a7ae2d431dce3f1 Mon Sep 17 00:00:00 2001 From: simurai Date: Fri, 22 May 2015 17:33:29 +0900 Subject: [PATCH 10/12] Fix changes from master --- styles/language.less | 20 ++++++++++---------- styles/languages/css.less | 4 ++-- styles/languages/json.less | 4 ++-- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/styles/language.less b/styles/language.less index 1c8ca3d..def86f0 100644 --- a/styles/language.less +++ b/styles/language.less @@ -24,7 +24,7 @@ } &.operator { - color: @syntax-text-color; + color: @mono-1; } &.other.special-method { @@ -49,7 +49,7 @@ &.modifier { &.package, &.import { - color: @syntax-text-color; + color: @mono-1; } } } @@ -86,7 +86,7 @@ } &.parameter { - color: @syntax-text-color; + color: @mono-1; } } @@ -124,7 +124,7 @@ &.separator, &.seperator, &.array { - color: @syntax-text-color; + color: @mono-1; } &.heading, @@ -151,7 +151,7 @@ &.method, &.class, &.inner-class { - color: @syntax-text-color; + color: @mono-1; } } } @@ -202,13 +202,13 @@ color: @hue-6-2; &.body { - color: @syntax-text-color; + color: @mono-1; } } &.method-call, &.method { - color: @syntax-text-color; + color: @mono-1; } &.definition { @@ -231,16 +231,16 @@ &.separator { background-color: #373b41; - color: @syntax-text-color; + color: @mono-1; } &.tag { - color: @syntax-text-color; + color: @mono-1; } } .none { - color: @syntax-text-color; + color: @mono-1; } // Languages ------------------------------------------------- diff --git a/styles/languages/css.less b/styles/languages/css.less index 909ef58..1673727 100644 --- a/styles/languages/css.less +++ b/styles/languages/css.less @@ -3,9 +3,9 @@ // highlight properties/values if they are supported .property-name, .property-value { - color: @gray; + color: @mono-2; &.support { - color: @light-gray; + color: @mono-1; } } diff --git a/styles/languages/json.less b/styles/languages/json.less index 623a396..5cce801 100644 --- a/styles/languages/json.less +++ b/styles/languages/json.less @@ -1,12 +1,12 @@ .source.json { .meta.structure.dictionary.json { & > .string.quoted.json, .punctuation.string { - color: @red; + color: @hue-5; } & > .value.json > .string.quoted.json, & > .value.json > .string.quoted.json > .punctuation { - color: @green; + color: @hue-4; } } } From 8c950f9632b70d7b3e558f6179b18198f27c0175 Mon Sep 17 00:00:00 2001 From: simurai Date: Fri, 22 May 2015 17:48:52 +0900 Subject: [PATCH 11/12] :art: --- styles/colors.less | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/styles/colors.less b/styles/colors.less index fde8b5a..f487cfb 100644 --- a/styles/colors.less +++ b/styles/colors.less @@ -10,20 +10,19 @@ @syntax-fg: @mono-1; @syntax-bg: hsl(@syntax-hue, @syntax-saturation, @syntax-brightness); - -// Colors ----------------------------------- - -@mono-1: hsl(@syntax-hue, 60%, 92%); +// Monochrome ----------------------------------- +@mono-1: hsl(@syntax-hue, 60%, 92%); // default text @mono-2: hsl(@syntax-hue, 24%, 66%); @mono-3: hsl(@syntax-hue, 12%, 44%); -@hue-1: hsl(191, 91%, 73%); -@hue-2: hsl(212, 99%, 75%); -@hue-3: hsl(286, 82%, 79%); -@hue-4: hsl(118, 69%, 78%); +// Colors ----------------------------------- +@hue-1: hsl(191, 91%, 73%); // <-cyan +@hue-2: hsl(212, 99%, 75%); // <-blue +@hue-3: hsl(286, 82%, 79%); // <-purple +@hue-4: hsl(118, 69%, 78%); // <-green -@hue-5: hsl( 5, 91%, 73%); -@hue-5-2: hsl(348, 45%, 66%); +@hue-5: hsl( 5, 91%, 73%); // <-red 1 +@hue-5-2: hsl(348, 45%, 66%); // <-red 2 -@hue-6: hsl( 48, 71%, 76%); -@hue-6-2: hsl( 41, 98%, 70%); +@hue-6: hsl( 48, 71%, 76%); // <-orange 1 +@hue-6-2: hsl( 41, 98%, 70%); // <-orange 2 From ade9e5f82ae853a4742845a5f6c731ae457eea4c Mon Sep 17 00:00:00 2001 From: simurai Date: Sat, 23 May 2015 15:38:16 +0900 Subject: [PATCH 12/12] Update variables names after merge with master --- styles/languages/java.less | 4 ++-- styles/languages/json.less | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/styles/languages/java.less b/styles/languages/java.less index 32bcd69..094fa72 100644 --- a/styles/languages/java.less +++ b/styles/languages/java.less @@ -12,10 +12,10 @@ .source.java-properties { .meta.key-pair { - color: @red; + color: @hue-5; & > .punctuation { - color: @syntax-text-color; + color: @mono-1; } } } diff --git a/styles/languages/json.less b/styles/languages/json.less index bc29aa0..6f9278c 100644 --- a/styles/languages/json.less +++ b/styles/languages/json.less @@ -2,20 +2,20 @@ .meta.structure.dictionary.json { & > .string.quoted.json { & > .punctuation.string { - color: @red; + color: @hue-5; } - color: @red; + color: @hue-5; } } .meta.structure.dictionary.json, .meta.structure.array.json { & > .value.json > .string.quoted.json, & > .value.json > .string.quoted.json > .punctuation { - color: @green; + color: @hue-4; } & > .constant.language.json { - color: @cyan; + color: @hue-1; } } }