Skip to content

Commit

Permalink
➡️ Migrate core package 'solarized-dark-syntax' into ./packages
Browse files Browse the repository at this point in the history
  • Loading branch information
ryanolsonx committed Dec 7, 2018
1 parent aad7705 commit 935d33e
Show file tree
Hide file tree
Showing 24 changed files with 1,095 additions and 6 deletions.
3 changes: 1 addition & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@
"settings-view": "https://www.atom.io/api/packages/settings-view/versions/0.257.3/tarball",
"sinon": "1.17.4",
"snippets": "https://www.atom.io/api/packages/snippets/versions/1.4.0/tarball",
"solarized-dark-syntax": "https://www.atom.io/api/packages/solarized-dark-syntax/versions/1.3.0/tarball",
"solarized-dark-syntax": "file:packages/solarized-dark-syntax",
"solarized-light-syntax": "https://www.atom.io/api/packages/solarized-light-syntax/versions/1.3.0/tarball",
"spell-check": "https://www.atom.io/api/packages/spell-check/versions/0.74.2/tarball",
"status-bar": "https://www.atom.io/api/packages/status-bar/versions/1.8.15/tarball",
Expand Down Expand Up @@ -181,7 +181,7 @@
"one-light-ui": "file:./packages/one-light-ui",
"one-dark-syntax": "file:./packages/one-dark-syntax",
"one-light-syntax": "file:./packages/one-light-syntax",
"solarized-dark-syntax": "1.3.0",
"solarized-dark-syntax": "file:./packages/solarized-dark-syntax",
"solarized-light-syntax": "1.3.0",
"about": "file:./packages/about",
"archive-view": "0.65.1",
Expand Down
3 changes: 1 addition & 2 deletions packages/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ See [RFC 003](https://github.com/atom/atom/blob/master/docs/rfcs/003-consolidate
| **package-generator** | [`atom/package-generator`][package-generator] | [#18279](https://github.com/atom/atom/issues/18279) |
| **settings-view** | [`atom/settings-view`][settings-view] | |
| **snippets** | [`atom/snippets`][snippets] | |
| **solarized-dark-syntax** | [`atom/solarized-dark-syntax`][solarized-dark-syntax] | [#18280](https://github.com/atom/atom/issues/18280) |
| **solarized-dark-syntax** | [`./solarized-dark-syntax`](./solarized-dark-syntax) | [#18280](https://github.com/atom/atom/issues/18280) |
| **solarized-light-syntax** | [`atom/solarized-light-syntax`][solarized-light-syntax] | [#18281](https://github.com/atom/atom/issues/18281) |
| **spell-check** | [`atom/spell-check`][spell-check] | |
| **status-bar** | [`atom/status-bar`][status-bar] | [#18282](https://github.com/atom/atom/issues/18282) |
Expand Down Expand Up @@ -158,7 +158,6 @@ See [RFC 003](https://github.com/atom/atom/blob/master/docs/rfcs/003-consolidate
[package-generator]: https://github.com/atom/package-generator
[settings-view]: https://github.com/atom/settings-view
[snippets]: https://github.com/atom/snippets
[solarized-dark-syntax]: https://github.com/atom/solarized-dark-syntax
[solarized-light-syntax]: https://github.com/atom/solarized-light-syntax
[spell-check]: https://github.com/atom/spell-check
[status-bar]: https://github.com/atom/status-bar
Expand Down
20 changes: 20 additions & 0 deletions packages/solarized-dark-syntax/LICENSE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
Copyright (c) 2014 GitHub Inc.

Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
"Software"), to deal in the Software without restriction, including
without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Software, and to
permit persons to whom the Software is furnished to do so, subject to
the following conditions:

The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
9 changes: 9 additions & 0 deletions packages/solarized-dark-syntax/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# Solarized Dark Syntax theme

Atom theme using the ever popular dark [solarized](http://ethanschoonover.com/solarized) colors.

<img alt="screenshot" src="https://cloud.githubusercontent.com/assets/378023/12602908/9c252b08-c4f0-11e5-8833-6aad91b8fa34.png" srcset="https://cloud.githubusercontent.com/assets/378023/12602909/9c25b366-c4f0-11e5-9f5d-aa6a517f7d7e.png 2x">

This theme is installed by default with Atom and can be activated by going to
the _Themes_ section in the Settings view (`cmd-,`) and selecting it from the
_Syntax Themes_ dropdown menu.
22 changes: 22 additions & 0 deletions packages/solarized-dark-syntax/index.less
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
// Solarized Syntax Theme

@import "styles/syntax-variables.less";

// Editor
@import "styles/editor.less";

// Languages
@import "styles/syntax/_base.less";
@import "styles/syntax/c.less";
@import "styles/syntax/coffee.less";
@import "styles/syntax/css.less";
@import "styles/syntax/go.less";
@import "styles/syntax/java.less";
@import "styles/syntax/javascript.less";
@import "styles/syntax/markdown.less";
@import "styles/syntax/markup.less";
@import "styles/syntax/php.less";
@import "styles/syntax/python.less";
@import "styles/syntax/ruby.less";
@import "styles/syntax/scala.less";
@import "styles/syntax/typescript.less";
11 changes: 11 additions & 0 deletions packages/solarized-dark-syntax/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"name": "solarized-dark-syntax",
"theme": "syntax",
"version": "1.3.0",
"description": "A dark syntax theme using the solarized colors",
"repository": "https://github.com/atom/atom",
"license": "MIT",
"engines": {
"atom": ">0.50.0"
}
}
27 changes: 27 additions & 0 deletions packages/solarized-dark-syntax/styles/colors.less
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@

// Solarized color scheme
// http://ethanschoonover.com/solarized#the-values

// Background/Foreground Tones
@base03: #002b36;
@base02: #073642;

// Content Tones
@base01: #586e75;
@base00: #657b83;
@base0: #839496;
@base1: #93a1a1;

// Background/Foreground Tones
@base2: #eee8d5;
@base3: #fdf6e3;

// Accent Colors
@yellow: #b58900;
@orange: #cb4b16;
@red: #dc322f;
@magenta: #d33682;
@violet: #6c71c4;
@blue: #268bd2;
@cyan: #2aa198;
@green: #859900;
44 changes: 44 additions & 0 deletions packages/solarized-dark-syntax/styles/editor.less
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
atom-text-editor {
color: @syntax-text-color;
background-color: @syntax-background-color;

.gutter {
color: @syntax-gutter-text-color;
background-color: @syntax-gutter-background-color;

.line-number {
&.cursor-line {
background-color: @syntax-gutter-background-color-selected;
}
}
}

.invisible-character {
color: @syntax-invisible-character-color;
}

.indent-guide {
color: @syntax-indent-guide-color;
}

.cursor {
border-color: @syntax-cursor-color;
}

.cursor-line {
background-color: @syntax-cursor-line;
}

.selection .region {
background-color: @syntax-selection-color;
}

.fold-marker:after,
.gutter .line-number.folded {
color: @magenta;
}

.bracket-matcher .region {
border-color: @magenta;
}
}
55 changes: 55 additions & 0 deletions packages/solarized-dark-syntax/styles/syntax-variables.less
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
@import "colors.less";

// This defines all syntax variables that syntax themes must implement when they
// include a syntax-variables.less file.

// General colors
@syntax-text-color: @base0;
@syntax-cursor-color: @base3;
@syntax-selection-color: lighten(@base02, 1%);
@syntax-selection-flash-color: @base1;
@syntax-background-color: @base03;

// Guide colors
@syntax-wrap-guide-color: lighten(@base02, 6%);
@syntax-indent-guide-color: lighten(@base02, 6%);
@syntax-invisible-character-color: lighten(@base02, 6%);

// For find and replace markers
@syntax-result-marker-color: @cyan;
@syntax-result-marker-color-selected: @base3;

// Gutter colors
@syntax-gutter-text-color: @base0;
@syntax-gutter-text-color-selected: @base2;
@syntax-gutter-background-color: @base02;
@syntax-gutter-background-color-selected: lighten(@base02, 6%);

// For git diff info. i.e. in the gutter
@syntax-color-added: @green;
@syntax-color-renamed: @blue;
@syntax-color-modified: @yellow;
@syntax-color-removed: @red;

// For language entity colors
@syntax-color-variable: @blue;
@syntax-color-constant: @yellow;
@syntax-color-property: @yellow;
@syntax-color-value: @cyan;
@syntax-color-function: @blue;
@syntax-color-method: @blue;
@syntax-color-class: @blue;
@syntax-color-keyword: @green;
@syntax-color-tag: @blue;
@syntax-color-attribute: @syntax-comment-color;
@syntax-color-import: @red;
@syntax-color-snippet: @syntax-color-keyword;


// Custom variables
// Warning: Don't use in packages

@syntax-comment-color: @base01;
@syntax-subtle-color: @base00;
@syntax-emphasized-color: @base1;
@syntax-cursor-line: fade(lighten(@syntax-background-color, 30%), 8%); // needs to be semi-transparent
100 changes: 100 additions & 0 deletions packages/solarized-dark-syntax/styles/syntax/_base.less
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
.syntax--comment {
color: @syntax-comment-color;
font-style: italic;

.syntax--markup.syntax--link {
color: @syntax-comment-color;
}
}

.syntax--string {
color: @cyan;
&.syntax--regexp {
color: @red;
}
}

.syntax--constant {
&.syntax--numeric {
color: @magenta;
}
&.syntax--language {
color: @yellow;
}
&.syntax--character,
&.syntax--other,
&.syntax--support {
color: @orange;
}
}

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

.syntax--keyword {
color: @green;
}

.syntax--storage {
color: @green;
}

.syntax--meta.syntax--class {
color: @blue;
}

.syntax--entity {
&.syntax--name {
&.syntax--class,
&.syntax--function,
&.syntax--section,
&.syntax--type {
color: @blue;
}
}
&.syntax--other.syntax--attribute-name {
color: @syntax-subtle-color;
}
}

.syntax--support {
&.syntax--function {
color: @blue;
&.syntax--builtin {
color: @green;
}
}
&.syntax--type,
&.syntax--class {
color: @green;
}
}

.syntax--tag {
&.syntax--entity.syntax--name {
color: @blue;
}
&.syntax--punctuation.syntax--definition {
&.syntax--html,
&.syntax--begin,
&.syntax--end {
color: @syntax-comment-color;
}
}
}

.syntax--invalid {
&.syntax--deprecated {
color: @yellow;
text-decoration: underline;
}
&.syntax--illegal {
color: @red;
text-decoration: underline;
}
}

.syntax--none {
color: @syntax-text-color;
}
44 changes: 44 additions & 0 deletions packages/solarized-dark-syntax/styles/syntax/c.less
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
.syntax--source.syntax--c,
.syntax--source.syntax--cpp {
.syntax--meta.syntax--preprocessor {
color: @red;
}
.syntax--keyword.syntax--control.syntax--directive {
color: @orange;
}
.syntax--punctuation.syntax--string {
color: @cyan;
}
.syntax--constant {
color: @orange;

&.syntax--numeric, &.syntax--language.syntax--c {
color: @cyan;
}
}
.syntax--storage {
color: @yellow;
}
.syntax--entity {
color: @syntax-text-color;

&.syntax--name.syntax--function.syntax--preprocessor {
color: @red;
}
}
.syntax--support.syntax--type {
color: @yellow;

&.syntax--posix-reserved {
color: @syntax-text-color;
}
}
.syntax--variable {
&.syntax--other.syntax--dot-access {
color: @syntax-text-color;
}
&.syntax--parameter.syntax--preprocessor {
color: @red;
}
}
}
Loading

0 comments on commit 935d33e

Please sign in to comment.