Skip to content

Commit

Permalink
Merge branch 'improvement/ghi-#31-atom-1.13-shadow-dom-removal' into …
Browse files Browse the repository at this point in the history
…develop
  • Loading branch information
arcticicestudio committed Jan 24, 2017
2 parents 262cffe + 0dd8cd3 commit 42d7f7b
Show file tree
Hide file tree
Showing 26 changed files with 219 additions and 222 deletions.
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<p align="center"><img src="https://cdn.rawgit.com/arcticicestudio/nord-atom-syntax/develop/assets/nord-atom-syntax-banner.svg"/></p>

<p align="center"><img src="https://cdn.travis-ci.org/images/favicon-c566132d45ab1a9bcae64d8d90e4378a.svg" width=24 height=24/> <a href="https://travis-ci.org/arcticicestudio/nord-atom-syntax"><img src="https://img.shields.io/travis/arcticicestudio/nord-atom-syntax/develop.svg"/></a> <img src="https://circleci.com/favicon.ico" width=24 height=24/> <a href="https://circleci.com/gh/arcticicestudio/nord-atom-syntax"><img src="https://circleci.com/gh/arcticicestudio/nord-atom-syntax.svg?style=shield&circle-token=63fc45d7300d4fc129c165e1aa2d1291474e5e1c"/></a> <img src="https://assets-cdn.github.com/favicon.ico" width=24 height=24/> <a href="https://github.com/arcticicestudio/nord-atom-syntax/releases/latest"><img src="https://img.shields.io/github/release/arcticicestudio/nord-atom-syntax.svg"/></a> <a href="https://github.com/arcticicestudio/nord/releases/tag/v0.2.0"><img src="https://img.shields.io/badge/Nord-v0.2.0-blue.svg"/></a> <img src="https://atom.io/favicon.ico" width=24 height=24/> <a href="https://atom.io/themes/nord-atom-syntax"><img src="https://img.shields.io/apm/v/nord-atom-syntax.svg"/></a> <a href="https://atom.io/themes/nord-atom-syntax"><img src="https://img.shields.io/apm/dm/nord-atom-syntax.svg"/></a></p>

<p align="center"><img src="https://cdn.travis-ci.org/images/favicon-c566132d45ab1a9bcae64d8d90e4378a.svg" width=24 height=24/> <a href="https://travis-ci.org/arcticicestudio/nord-atom-syntax"><img src="https://img.shields.io/travis/arcticicestudio/nord-atom-syntax/develop.svg"/></a> <img src="https://circleci.com/favicon.ico" width=24 height=24/> <a href="https://circleci.com/gh/arcticicestudio/nord-atom-syntax"><img src="https://circleci.com/gh/arcticicestudio/nord-atom-syntax.svg?style=shield&circle-token=63fc45d7300d4fc129c165e1aa2d1291474e5e1c"/></a> <img src="https://assets-cdn.github.com/favicon.ico" width=24 height=24/> <a href="https://github.com/arcticicestudio/nord-atom-syntax/releases/latest"><img src="https://img.shields.io/github/release/arcticicestudio/nord-atom-syntax.svg"/></a> <a href="https://github.com/arcticicestudio/nord/releases/tag/v0.2.0"><img src="https://img.shields.io/badge/Nord-v0.2.0-blue.svg"/></a> <img src="https://atom.io/favicon.ico" width=24 height=24/> <a href="https://github.com/atom/atom/releases/tag/v1.13.0"><img src="https://img.shields.io/badge/Atom->=v1.13.0-green.svg"/></a> <a href="https://atom.io/themes/nord-atom-syntax"><img src="https://img.shields.io/apm/v/nord-atom-syntax.svg"/></a> <a href="https://atom.io/themes/nord-atom-syntax"><img src="https://img.shields.io/apm/dm/nord-atom-syntax.svg"/></a></p>

<p align="center">A arctic, north-bluish clean and elegant Atom syntax theme.</p>

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,6 @@
],
"license": "MIT",
"engines": {
"atom": ">=1.0.0 <2.0.0"
"atom": ">=1.13.0 <2.0.0"
}
}
4 changes: 1 addition & 3 deletions styles/editor.less
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,7 @@ email development@arcticicestudio.com +
copyright Copyright (C) 2016 +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
*/
atom-text-editor,
atom-text-editor::shadow,
:host {
atom-text-editor {
background-color: @syntax-background-color;
color: @syntax-text-color;

Expand Down
16 changes: 8 additions & 8 deletions styles/languages/c.less
Original file line number Diff line number Diff line change
Expand Up @@ -15,27 +15,27 @@ copyright Copyright (C) 2016 +
Standard C++
(https://isocpp.org)
*/
.source.c,
.source.cpp {
.keyword.operator {
.syntax--source.syntax--c,
.syntax--source.syntax--cpp {
.syntax--keyword.syntax--operator {
color: @syntax-color-keyword;
}

.meta.preprocessor {
.syntax--meta.syntax--preprocessor {
color: @syntax-color-preprocessor;
}

.punctuation {
&.definition.directive {
.syntax--punctuation {
&.syntax--definition.syntax--directive {
color: @syntax-color-keyword;
}

&.separator.pointer-access {
&.syntax--separator.syntax--pointer-access {
color: @syntax-color-operator;
}
}

.string.include {
.syntax--string.syntax--include {
color: @syntax-color-class;
}
}
6 changes: 3 additions & 3 deletions styles/languages/clojure.less
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ copyright Copyright (C) 2016 +
Clojure
(https://clojure.org)
*/
.source.clojure {
.entity.global {
.syntax--source.syntax--clojure {
.syntax--entity.syntax--global {
color: @syntax-color-class;
}

.meta.symbol {
.syntax--meta.syntax--symbol {
color: @syntax-color-variable;
}
}
4 changes: 2 additions & 2 deletions styles/languages/coffeescript.less
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ copyright Copyright (C) 2016 +
CoffeeScript
(http://coffeescript.org)
*/
.source.coffee {
.variable.other.instance {
.syntax--source.syntax--coffee {
.syntax--variable.syntax--other.syntax--instance {
color: @syntax-color-variable;
font-style: italic;
}
Expand Down
8 changes: 4 additions & 4 deletions styles/languages/cs.less
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ copyright Copyright (C) 2016 +
Microsoft .NET Framework
(https://www.microsoft.com/net)
*/
.source.cs {
.meta {
&.method.annotation {
.syntax--source.syntax--cs {
.syntax--meta {
&.syntax--method.syntax--annotation {
color: @syntax-color-annotation;
}

&.namespace.body {
&.syntax--namespace.syntax--body {
color: @syntax-color-class;
}
}
Expand Down
26 changes: 13 additions & 13 deletions styles/languages/css.less
Original file line number Diff line number Diff line change
Expand Up @@ -21,34 +21,34 @@ Sass
W3C
(https://www.w3.org/TR/css3-roadmap)
*/
.source.css,
.source.css.less,
.source.css.scss,
.source.css.sass {
.meta {
&.at-rule {
.punctuation.definition.keyword {
.syntax--source.syntax--css,
.syntax--source.syntax--css.syntax--less,
.syntax--source.syntax--css.syntax--scss,
.syntax--source.syntax--css.syntax--sass {
.syntax--meta {
&.syntax--at-rule {
.syntax--punctuation.syntax--definition.syntax--keyword {
color: @syntax-color-keyword;
}

& > .string.quoted {
& > .syntax--string.syntax--quoted {
color: @syntax-color-class;
}
}

&.property-value {
.punctuation.definition.constant {
&.syntax--property-value {
.syntax--punctuation.syntax--definition.syntax--constant {
color: @syntax-color-keyword;
}
}
}

.support {
&.constant.property-value {
.syntax--support {
&.syntax--constant.syntax--property-value {
color: @syntax-color-keyword;
}

&.type.property-name {
&.syntax--type.syntax--property-name {
color: @syntax-color-css-property;
}
}
Expand Down
12 changes: 6 additions & 6 deletions styles/languages/elixir.less
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,18 @@ copyright Copyright (C) 2016 +
Elixir
(http://elixir-lang.org)
*/
.source.elixir {
.variable.other.readwrite {
&.module {
.syntax--source.syntax--elixir {
.syntax--variable.syntax--other.syntax--readwrite {
&.syntax--module {
color: @syntax-color-annotation;
}

&.constant {
&.syntax--constant {
color: @syntax-color-class;
}
}
.punctuation.definition.variable {

.syntax--punctuation.syntax--definition.syntax--variable {
color: @syntax-color-annotation;
}
}
12 changes: 6 additions & 6 deletions styles/languages/gfm.less
Original file line number Diff line number Diff line change
Expand Up @@ -15,23 +15,23 @@ copyright Copyright (C) 2016 +
GitHub
(https://github.com/adam-p/markdown-here/wiki/Markdown-Cheatsheet)
*/
.source.gfm {
.comment.hr {
.syntax--source.syntax--gfm {
.syntax--comment.syntax--hr {
color: @syntax-color-gfm-hr;
}
.link .entity {
.syntax--link .syntax--entity {
color: @syntax-color-gfm-link;
}

.punctuation.definition {
.syntax--punctuation.syntax--definition {
color: @syntax-color-gfm-punctuation;
}

.variable.unordered.list {
.syntax--variable.syntax--unordered.syntax--list {
color: @syntax-color-gfm-punctuation;
}

.support {
.syntax--support {
color: @syntax-color-markup-code;
}
}
6 changes: 3 additions & 3 deletions styles/languages/glsl.less
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ copyright Copyright (C) 2016 +
OpenGL
(https://www.opengl.org/documentation/glsl)
*/
.source.glsl {
.punctuation.definition.directive {
.syntax--source.syntax--glsl {
.syntax--punctuation.syntax--definition.syntax--directive {
color: @syntax-color-keyword;
}

.string.include {
.syntax--string.syntax--include {
color: @syntax-color-class;
}
}
6 changes: 3 additions & 3 deletions styles/languages/go.less
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ copyright Copyright (C) 2016 +
Go
(https://golang.org)
*/
.source.go {
.entity.name.package {
.syntax--source.syntax--go {
.syntax--entity.syntax--name.syntax--package {
color: @syntax-color-import;
}

.storage.type.string {
.syntax--storage.syntax--type.syntax--string {
color: @syntax-color-class;
}
}
16 changes: 8 additions & 8 deletions styles/languages/haml.less
Original file line number Diff line number Diff line change
Expand Up @@ -15,28 +15,28 @@ copyright Copyright (C) 2016 +
HAML
(http://haml.info)
*/
.text.haml {
.meta {
&.prolog {
.syntax--text.syntax--haml {
.syntax--meta {
&.syntax--prolog {
color: @syntax-color-preprocessor;
}

&.section.object {
&.syntax--section.syntax--object {
color: @syntax-color-class;
}
}

.punctuation.definition {
&.prolog {
.syntax--punctuation.syntax--definition {
&.syntax--prolog {
color: @syntax-color-keyword;
}

&.tag {
&.syntax--tag {
color: @syntax-color-tag;
}
}

.variable.other.instance {
.syntax--variable.syntax--other.syntax--instance {
color: @syntax-color-variable;
font-style: italic;
}
Expand Down
12 changes: 6 additions & 6 deletions styles/languages/haskell.less
Original file line number Diff line number Diff line change
Expand Up @@ -15,24 +15,24 @@ copyright Copyright (C) 2016 +
Haskell
(https://www.haskell.org)
*/
.source.haskell {
.entity.name.function.infix {
.syntax--source.syntax--haskell {
.syntax--entity.syntax--name.syntax--function.syntax--infix {
color: @syntax-color-keyword;
}

.identifier {
.syntax--identifier {
color: @syntax-color-variable;
}

.meta.preprocessor {
.syntax--meta.syntax--preprocessor {
color: @syntax-color-preprocessor;
}

.punctuation.definition.directive {
.syntax--punctuation.syntax--definition.syntax--directive {
color: @syntax-color-keyword;
}

.support.other.module {
.syntax--support.syntax--other.syntax--module {
color: @syntax-color-class;
}
}
34 changes: 17 additions & 17 deletions styles/languages/java.less
Original file line number Diff line number Diff line change
Expand Up @@ -29,28 +29,28 @@ Scala
/*+------+
+ Java +
+------+*/
.source.java {
.keyword.operator.instanceof {
.syntax--source.syntax--java {
.syntax--keyword.syntax--operator.syntax--instanceof {
color: @syntax-color-keyword;
}

.punctuation.bracket.angle {
.syntax--punctuation.syntax--bracket.syntax--angle {
color: @syntax-color-java-bracket-angle;
}

.storage {
&.modifier.import {
.syntax--storage {
&.syntax--modifier.syntax--import {
color: @syntax-color-import;
}

&.type {
&.syntax--type {
color: @syntax-color-class;

&.annotation {
&.syntax--annotation {
color: @syntax-color-annotation;
}

&.primitive {
&.syntax--primitive {
color: @syntax-color-keyword;
}
}
Expand All @@ -60,23 +60,23 @@ Scala
/*+-------+
+ Scala +
+-------+*/
.source.scala {
.entity.name.package {
.syntax--source.syntax--scala {
.syntax--entity.syntax--name.syntax--package {
color: @syntax-color-class;
}

.meta.import {
.syntax--meta.syntax--import {
color: @syntax-color-class;

.variable {
.syntax--variable {
color: @syntax-color-class;
}
}

.scala.type {
.syntax--scala.syntax--type {
color: @syntax-color-class;

.class {
.syntax--class {
color: @syntax-color-class;
}
}
Expand All @@ -85,11 +85,11 @@ Scala
/*+-----------------+
+ Java Properties +
+-----------------+*/
.source.java-properties {
.meta.key-pair {
.syntax--source.syntax--java-properties {
.syntax--meta.syntax--key-pair {
color: @syntax-color-keyword;

& > .punctuation {
& > .syntax--punctuation {
color: @syntax-color-punctuation;
}
}
Expand Down
Loading

0 comments on commit 42d7f7b

Please sign in to comment.