From 1088d7e720409f02e720d4c682b6dfcf5447ad95 Mon Sep 17 00:00:00 2001 From: Ryan Plant Date: Wed, 11 Jan 2017 10:30:30 +1100 Subject: [PATCH 1/2] Remove :host selectors --- styles/base.less | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/styles/base.less b/styles/base.less index 74362d1..1f39bbf 100644 --- a/styles/base.less +++ b/styles/base.less @@ -1,54 +1,54 @@ @import "syntax-variables"; -atom-text-editor, :host { +atom-text-editor { background-color: @syntax-background-color; color: @syntax-text-color; } -atom-text-editor .gutter, :host .gutter { +atom-text-editor .gutter { background-color: @syntax-gutter-background-color; color: @syntax-gutter-text-color; } -atom-text-editor .gutter .line-number.cursor-line, :host .gutter .line-number.cursor-line { +atom-text-editor .gutter .line-number.cursor-line { background-color: @syntax-gutter-background-color-selected; color: @syntax-gutter-text-color-selected; } -atom-text-editor .gutter .line-number.cursor-line-no-selection, :host .gutter .line-number.cursor-line-no-selection { +atom-text-editor .gutter .line-number.cursor-line-no-selection { color: @syntax-gutter-text-color-selected; } -atom-text-editor .wrap-guide, :host .wrap-guide { +atom-text-editor .wrap-guide { color: @syntax-wrap-guide-color; } -atom-text-editor .indent-guide, :host .indent-guide { +atom-text-editor .indent-guide { color: @syntax-indent-guide-color; } -atom-text-editor .invisible-character, :host .invisible-character { +atom-text-editor .invisible-character { color: @syntax-invisible-character-color; } -atom-text-editor .search-results .marker .region, :host .search-results .marker .region { +atom-text-editor .search-results .marker .region { background-color: transparent; border: @syntax-result-marker-color; } -atom-text-editor .search-results .marker.current-result .region, :host .search-results .marker.current-result .region { +atom-text-editor .search-results .marker.current-result .region { border: @syntax-result-marker-color-selected; } -atom-text-editor.is-focused .cursor, :host(.is-focused) .cursor { +atom-text-editor.is-focused .cursor { border-color: @syntax-cursor-color; } -atom-text-editor.is-focused .selection .region, :host(.is-focused) .selection .region { +atom-text-editor.is-focused .selection .region { background-color: @syntax-selection-color; } -atom-text-editor.is-focused .line-number.cursor-line-no-selection, atom-text-editor.is-focused .line.cursor-line, :host(.is-focused) .line-number.cursor-line-no-selection, :host(.is-focused) .line.cursor-line { +atom-text-editor.is-focused .line-number.cursor-line-no-selection, atom-text-editor.is-focused .line.cursor-line { background-color: #3E3D32; } From c12b7531fa1c2f5a63a7dc7e64f1c66efb7b0041 Mon Sep 17 00:00:00 2001 From: Ryan Plant Date: Wed, 11 Jan 2017 10:32:54 +1100 Subject: [PATCH 2/2] Use new syntax prefixes --- styles/base.less | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/styles/base.less b/styles/base.less index 1f39bbf..9b975b8 100644 --- a/styles/base.less +++ b/styles/base.less @@ -31,12 +31,12 @@ atom-text-editor .invisible-character { color: @syntax-invisible-character-color; } -atom-text-editor .search-results .marker .region { +atom-text-editor .search-results .syntax--marker .region { background-color: transparent; border: @syntax-result-marker-color; } -atom-text-editor .search-results .marker.current-result .region { +atom-text-editor .search-results .syntax--marker.current-result .region { border: @syntax-result-marker-color-selected; } @@ -52,92 +52,92 @@ atom-text-editor.is-focused .line-number.cursor-line-no-selection, atom-text-edi background-color: #3E3D32; } -.comment { +.syntax--comment { color: #E6C000; } -.string { +.syntax--string { color: #FFEA00; } -.constant.numeric { +.syntax--constant.syntax--numeric { color: #C5A3FF; } -.constant.language { +.syntax--constant.syntax--language { color: #C5A3FF; } -.constant.character, .constant.other { +.syntax--constant.syntax--character, .syntax--constant.syntax--other { color: #C5A3FF; } -.variable { +.syntax--variable { } -.keyword { +.syntax--keyword { color: #FFB8D1; } -.storage { +.syntax--storage { color: #FFB8D1; } -.storage.type { +.syntax--storage.syntax--type { font-style: italic; color: #C2FFDF; } -.entity.name.class { +.syntax--entity.syntax--name.syntax--class { text-decoration: underline; color: #FFF352; } -.entity.other.inherited-class { +.syntax--entity.syntax--other.syntax--inherited-class { font-style: italic; text-decoration: underline; color: #FFF352; } -.entity.name.function { +.syntax--entity.syntax--name.syntax--function { color: #FFF352; } -.variable.parameter { +.syntax--variable.syntax--parameter { font-style: italic; color: #FF857F; } -.entity.name.tag { +.syntax--entity.syntax--name.syntax--tag { color: #FFB8D1; } -.entity.other.attribute-name { +.syntax--entity.syntax--other.syntax--attribute-name { color: #FFF352; } -.support.function { +.syntax--support.syntax--function { color: #C2FFDF; } -.support.constant { +.syntax--support.syntax--constant { color: #C2FFDF; } -.support.type, .support.class { +.syntax--support.syntax--type, .syntax--support.syntax--class { font-style: italic; color: #C2FFDF; } -.support.other.variable { +.syntax--support.syntax--other.syntax--variable { } -.invalid { +.syntax--invalid { color: #F8F8F0; background-color: #F92672; } -.invalid.deprecated { +.syntax--invalid.syntax--deprecated { color: #F8F8F0; background-color: #AE81FF; }