From 17a5014381bec2e30591865ec9471b52c6101f35 Mon Sep 17 00:00:00 2001 From: Michael Aguiar Date: Fri, 10 Feb 2017 11:58:31 -0700 Subject: [PATCH 1/2] Deprecated class fix --- CHANGELOG.md | 9 +- README.md | 4 +- package.json | 63 ++++++++-- sample-files/CSS.css | 6 +- sample-files/Gruntfile.js | 2 +- sample-files/Gulpfile.js | 40 +++---- sample-files/Handlebars.hbs | 2 +- sample-files/JavaScript.js | 2 +- sample-files/Markdown.md | 2 +- sample-files/Mustache.mustache | 2 +- sample-files/Procfile | 2 +- sample-files/React.jsx | 6 +- sample-files/Stache.stache | 2 +- sample-files/Typescript.ts | 2 +- styles/colors.less | 2 +- styles/editor.less | 6 +- styles/languages/html.less | 20 ++-- styles/languages/jade.less | 32 ++--- styles/languages/json.less | 26 ++--- styles/languages/markdown.less | 16 +-- styles/languages/mustache.less | 6 +- styles/languages/styles.less | 18 +-- styles/languages/yaml.less | 10 +- styles/syntax-variables.less | 2 +- styles/syntax.less | 206 ++++++++++++++++----------------- 25 files changed, 265 insertions(+), 223 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 270c316..c3d858c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,3 @@ -## 1.1.0 - Update -* Add Screenshots -* Update README - -## 1.0.0 - First Release -* Create Theme +## 0.1.0 - First Release +* Every feature added +* Every bug fixed diff --git a/README.md b/README.md index 37b10d7..7fe4650 100644 --- a/README.md +++ b/README.md @@ -6,9 +6,7 @@ An out of this world theme composed of all the colors of the galaxy. For the cod Use `apm` to get galactic real quick -``` -apm install galaxy-syntax -``` + apm install galaxy-syntax ## More Galaxy diff --git a/package.json b/package.json index d810ddf..66db505 100644 --- a/package.json +++ b/package.json @@ -1,15 +1,64 @@ { - "name": "galaxy-syntax", - "theme": "syntax", - "version": "1.1.0", + "_args": [ + [ + { + "raw": "/private/var/folders/q7/slcqrh_14_n8ptg3lr311jl00000gn/T/d-1161029-2575-138tz0s/package.tgz", + "scope": null, + "escapedName": null, + "name": null, + "rawSpec": "/private/var/folders/q7/slcqrh_14_n8ptg3lr311jl00000gn/T/d-1161029-2575-138tz0s/package.tgz", + "spec": "/private/var/folders/q7/slcqrh_14_n8ptg3lr311jl00000gn/T/d-1161029-2575-138tz0s/package.tgz", + "type": "local" + }, + "/private/var/folders/q7/slcqrh_14_n8ptg3lr311jl00000gn/T/apm-install-dir-1161029-2575-1oaqrpw" + ] + ], + "_from": "../d-1161029-2575-138tz0s/package.tgz", + "_id": "galaxy-syntax@1.1.0", + "_inCache": true, + "_installable": true, + "_location": "/galaxy-syntax", + "_phantomChildren": {}, + "_requested": { + "raw": "/private/var/folders/q7/slcqrh_14_n8ptg3lr311jl00000gn/T/d-1161029-2575-138tz0s/package.tgz", + "scope": null, + "escapedName": null, + "name": null, + "rawSpec": "/private/var/folders/q7/slcqrh_14_n8ptg3lr311jl00000gn/T/d-1161029-2575-138tz0s/package.tgz", + "spec": "/private/var/folders/q7/slcqrh_14_n8ptg3lr311jl00000gn/T/d-1161029-2575-138tz0s/package.tgz", + "type": "local" + }, + "_requiredBy": [ + "#USER" + ], + "_resolved": "file:../d-1161029-2575-138tz0s/package.tgz", + "_shasum": "56f4776c7f3f1dada67badf0e55aa4b3c5b54f4a", + "_shrinkwrap": null, + "_spec": "/private/var/folders/q7/slcqrh_14_n8ptg3lr311jl00000gn/T/d-1161029-2575-138tz0s/package.tgz", + "_where": "/private/var/folders/q7/slcqrh_14_n8ptg3lr311jl00000gn/T/apm-install-dir-1161029-2575-1oaqrpw", + "bugs": { + "url": "https://github.com/rossedman/galaxy-syntax/issues" + }, + "dependencies": {}, "description": "A theme made of intergalactic colors and spacedust. For the code voyagers.", + "devDependencies": {}, + "engines": { + "atom": ">=0.174.0 <2.0.0" + }, + "homepage": "https://github.com/rossedman/galaxy-syntax#readme", "keywords": [ "syntax", "theme" ], - "repository": "https://github.com/rossedman/galaxy-syntax", "license": "MIT", - "engines": { - "atom": ">=0.174.0 <2.0.0" - } + "name": "galaxy-syntax", + "optionalDependencies": {}, + "readme": "# Galaxy Atom Syntax Theme\n\nAn out of this world theme composed of all the colors of the galaxy. For the code voyagers of this world. This syntax contains support and customized highlighting for HTML, LESS, Jade, JSON, Markdown, Mustache, YAML and more!\n\n## Installation\n\nUse `apm` to get galactic real quick\n\n apm install galaxy-syntax\n\n## More Galaxy\n\nI'm pretty OCD about my whole desktop matching, that being said I have also created an iTerm theme, a Sublime Text 3 Theme & UITheme as well as Galaxy Light. Also, an Atom UI theme is in the works. Get all of that great stuff here:\n\n- [Sublime Text Theme & UI](https://github.com/rossedman/galaxy-theme)\n- [iTerm Theme](https://github.com/rossedman/galaxy-iterm)\n- [Atom Galaxy Syntax Light](https://github.com/rossedman/galaxy-light-syntax)\n\n## Screenshots\n\nHere are some screenshots below. This is using Atom's One Dark UI kit and is highly recommended!\n\n![A screenshot of your theme](https://github.com/rossedman/galaxy-syntax/blob/master/screenshots/galaxy-php.png?raw=true)\n![A screenshot of your theme](https://github.com/rossedman/galaxy-syntax/blob/master/screenshots/galaxy-ruby.png?raw=true)\n![A screenshot of your theme](https://github.com/rossedman/galaxy-syntax/blob/master/screenshots/galaxy-javascript.png?raw=true)\n![A screenshot of your theme](https://github.com/rossedman/galaxy-syntax/blob/master/screenshots/galaxy-markdown.png?raw=true)\n![A screenshot of your theme](https://github.com/rossedman/galaxy-syntax/blob/master/screenshots/galaxy-html.png?raw=true)\n", + "readmeFilename": "README.md", + "repository": { + "type": "git", + "url": "git+https://github.com/rossedman/galaxy-syntax.git" + }, + "theme": "syntax", + "version": "1.1.0" } diff --git a/sample-files/CSS.css b/sample-files/CSS.css index 04633bc..b18ea17 100755 --- a/sample-files/CSS.css +++ b/sample-files/CSS.css @@ -231,13 +231,13 @@ pre { .content { padding: 30px; } -.block { +.syntax--block { display: block; } -.inline { +.syntax--inline { display: inline; } -.inline-block { +.syntax--inline-block { display: inline-block; } .bad { diff --git a/sample-files/Gruntfile.js b/sample-files/Gruntfile.js index 7a7c55d..e57d129 100755 --- a/sample-files/Gruntfile.js +++ b/sample-files/Gruntfile.js @@ -2,7 +2,7 @@ module.exports = function(grunt) { grunt.initConfig({ jshint: { - files: ['Gruntfile.js', 'src/**/*.js', 'test/**/*.js'], + files: ['Gruntfile.syntax--js', 'src/**/*.syntax--js', 'test/**/*.syntax--js'], options: { globals: { jQuery: true diff --git a/sample-files/Gulpfile.js b/sample-files/Gulpfile.js index 5c0333e..c09da96 100755 --- a/sample-files/Gulpfile.js +++ b/sample-files/Gulpfile.js @@ -42,11 +42,11 @@ var AUTOPREFIXER_BROWSERS = [ // Lint JavaScript gulp.task('jshint', function () { - return gulp.src('app/scripts/**/*.js') + return gulp.src('app/scripts/**/*.syntax--js') .pipe(reload({stream: true, once: true})) - .pipe($.jshint()) - .pipe($.jshint.reporter('jshint-stylish')) - .pipe($.if(!browserSync.active, $.jshint.reporter('fail'))); + .pipe($.syntax--jshint()) + .pipe($.syntax--jshint.reporter('jshint-stylish')) + .pipe($.if(!browserSync.active, $.syntax--jshint.reporter('fail'))); }); // Optimize Images @@ -64,7 +64,7 @@ gulp.task('images', function () { gulp.task('copy', function () { return gulp.src([ 'app/*', - '!app/*.html', + '!app/*.syntax--html', 'node_modules/apache-server-configs/dist/.htaccess' ], { dot: true @@ -84,20 +84,20 @@ gulp.task('styles', function () { // For best performance, don't add Sass partials to `gulp.src` return gulp.src([ 'app/styles/*.scss', - 'app/styles/**/*.css', + 'app/styles/**/*.syntax--css', 'app/styles/components/components.scss' ]) - .pipe($.sourcemaps.init()) - .pipe($.changed('.tmp/styles', {extension: '.css'})) + .pipe($.syntax--sourcemaps.init()) + .pipe($.syntax--changed('.tmp/styles', {extension: '.syntax--css'})) .pipe($.sass({ precision: 10, onError: console.error.bind(console, 'Sass error:') })) .pipe($.autoprefixer({browsers: AUTOPREFIXER_BROWSERS})) - .pipe($.sourcemaps.write()) + .pipe($.syntax--sourcemaps.write()) .pipe(gulp.dest('.tmp/styles')) // Concatenate And Minify Styles - .pipe($.if('*.css', $.csso())) + .pipe($.if('*.syntax--css', $.syntax--csso())) .pipe(gulp.dest('dist/styles')) .pipe($.size({title: 'styles'})); }); @@ -106,17 +106,17 @@ gulp.task('styles', function () { gulp.task('html', function () { var assets = $.useref.assets({searchPath: '{.tmp,app}'}); - return gulp.src('app/**/*.html') + return gulp.src('app/**/*.syntax--html') .pipe(assets) // Concatenate And Minify JavaScript - .pipe($.if('*.js', $.uglify({preserveComments: 'some'}))) + .pipe($.if('*.syntax--js', $.uglify({preserveComments: 'some'}))) // Remove Any Unused CSS // Note: If not using the Style Guide, you can delete it from // the next line to only include styles your project uses. - .pipe($.if('*.css', $.uncss({ + .pipe($.if('*.syntax--css', $.uncss({ html: [ - 'app/index.html', - 'app/styleguide.html' + 'app/index.syntax--html', + 'app/styleguide.syntax--html' ], // CSS Selectors for UnCSS to ignore ignore: [ @@ -126,13 +126,13 @@ gulp.task('html', function () { }))) // Concatenate And Minify Styles // In case you are still using useref build blocks - .pipe($.if('*.css', $.csso())) + .pipe($.if('*.syntax--css', $.syntax--csso())) .pipe(assets.restore()) .pipe($.useref()) // Update Production Style Guide Paths - .pipe($.replace('components/components.css', 'components/main.min.css')) + .pipe($.replace('components/components.syntax--css', 'components/main.min.syntax--css')) // Minify Any HTML - .pipe($.if('*.html', $.minifyHtml())) + .pipe($.if('*.syntax--html', $.minifyHtml())) // Output Files .pipe(gulp.dest('dist')) .pipe($.size({title: 'html'})); @@ -154,9 +154,9 @@ gulp.task('serve', ['styles'], function () { server: ['.tmp', 'app'] }); - gulp.watch(['app/**/*.html'], reload); + gulp.watch(['app/**/*.syntax--html'], reload); gulp.watch(['app/styles/**/*.{scss,css}'], ['styles', reload]); - gulp.watch(['app/scripts/**/*.js'], ['jshint']); + gulp.watch(['app/scripts/**/*.syntax--js'], ['jshint']); gulp.watch(['app/images/**/*'], reload); }); diff --git a/sample-files/Handlebars.hbs b/sample-files/Handlebars.hbs index 484d799..01edea1 100755 --- a/sample-files/Handlebars.hbs +++ b/sample-files/Handlebars.hbs @@ -2,7 +2,7 @@

Hello!

-

Welcome to {{site.name}}

+

Welcome to {{site.syntax--name}}

{{> footer}} diff --git a/sample-files/JavaScript.js b/sample-files/JavaScript.js index 2299ea9..67969bf 100755 --- a/sample-files/JavaScript.js +++ b/sample-files/JavaScript.js @@ -25,4 +25,4 @@ app.use(function *(){ this.body = 'Hello World'; }); -app.listen(3000); +app.syntax--listen(3000); diff --git a/sample-files/Markdown.md b/sample-files/Markdown.md index 9cc90a8..1ebbb0d 100755 --- a/sample-files/Markdown.md +++ b/sample-files/Markdown.md @@ -9,7 +9,7 @@ the aid of their country. __This is__ just a regular paragraph. The quick brown fox **jumped** over the lazy -dog's back. [Link](http://www.link.com) +dog's back. [Link](http://www.syntax--link.com) ### Header 3 diff --git a/sample-files/Mustache.mustache b/sample-files/Mustache.mustache index 484d799..01edea1 100755 --- a/sample-files/Mustache.mustache +++ b/sample-files/Mustache.mustache @@ -2,7 +2,7 @@

Hello!

-

Welcome to {{site.name}}

+

Welcome to {{site.syntax--name}}

{{> footer}} diff --git a/sample-files/Procfile b/sample-files/Procfile index 1da0cd6..0ab69c5 100755 --- a/sample-files/Procfile +++ b/sample-files/Procfile @@ -1 +1 @@ -web: node index.js +web: node index.syntax--js diff --git a/sample-files/React.jsx b/sample-files/React.jsx index eefd982..be59977 100755 --- a/sample-files/React.jsx +++ b/sample-files/React.jsx @@ -11,11 +11,11 @@ var TodoApp = React.createClass({ return {items: [], text: ''}; }, onChange: function(e) { - this.setState({text: e.target.value}); + this.setState({text: e.target.syntax--value}); }, handleSubmit: function(e) { e.preventDefault(); - var nextItems = this.state.items.concat([this.state.text]); + var nextItems = this.state.items.concat([this.state.syntax--text]); var nextText = ''; this.setState({items: nextItems, text: nextText}); }, @@ -25,7 +25,7 @@ var TodoApp = React.createClass({

TODO

- +
diff --git a/sample-files/Stache.stache b/sample-files/Stache.stache index 484d799..01edea1 100755 --- a/sample-files/Stache.stache +++ b/sample-files/Stache.stache @@ -2,7 +2,7 @@

Hello!

-

Welcome to {{site.name}}

+

Welcome to {{site.syntax--name}}

{{> footer}} diff --git a/sample-files/Typescript.ts b/sample-files/Typescript.ts index d7d97bc..adc435e 100755 --- a/sample-files/Typescript.ts +++ b/sample-files/Typescript.ts @@ -12,7 +12,7 @@ module Sayings { var greeter = new Sayings.Greeter("world"); var button = document.createElement('button'); -button.textContent = "Say Hello"; +button.syntax--textContent = "Say Hello"; button.onclick = function() { alert(greeter.greet()); }; diff --git a/styles/colors.less b/styles/colors.less index f67de9c..21fb98a 100644 --- a/styles/colors.less +++ b/styles/colors.less @@ -31,7 +31,7 @@ @constant: @orange; // true of var x = true, {{}} of {{> hbs_include}} @variable: @green; // foo or function(foo), hbs_include of {{> hbs_include}}, http://dom.com/ of url(http://dom.com/) @support: @purple; // module of module.exports, color of color: rgb(0,0,0) -@entity: @silver; // exports of module.exports,
, . of .className +@entity: @silver; // exports of module.exports,
, . of .syntax--className @keyword: @gray; // = of var a = b, if of if a = b, px of font-size: 13px; @storage: darken(@gray, 10%); // var of var a = b; @meta: @code-font-color; // none of border: none; diff --git a/styles/editor.less b/styles/editor.less index 82b24ab..32964a0 100755 --- a/styles/editor.less +++ b/styles/editor.less @@ -1,13 +1,13 @@ @import "colors.less"; // EDITOR BACKGROUND & FONT COLORS -.atom-text-editor, :host { +.atom-text-editor,atom-text-editor { background-color: @code-background; color: @code-font-color; } // MAIN CODE EDITOR STYLES -.atom-text-editor, :host { +.atom-text-editor,atom-text-editor { background-color: @code-background; color: @code-font-color; @@ -101,8 +101,6 @@ // SELECTED LINE STYLE .line.cursor-line { background: @selected-line !important; - padding-left: 10px; - margin-left: -10px; } diff --git a/styles/languages/html.less b/styles/languages/html.less index 232fc27..43f554c 100644 --- a/styles/languages/html.less +++ b/styles/languages/html.less @@ -1,34 +1,34 @@ @import "colors"; -.html { +.syntax--html { - .meta.tag.any { + .syntax--meta.syntax--tag.syntax--any { color: @gray; } - .entity.name.tag { - &.block, &.inline, &.name { + .syntax--entity.syntax--name.syntax--tag { + &.syntax--block, &.syntax--inline, &.syntax--name { color: @tag; } } - .entity.other.attribute-name.id.html { + .syntax--entity.syntax--other.syntax--attribute-name.syntax--id.syntax--html { color: @id; } - .punctuation.separator.key-value { + .syntax--punctuation.syntax--separator.syntax--key-value { color: @gray; } - .string.quoted.double { + .syntax--string.syntax--quoted.syntax--double { color: lighten(@gray, 10%); - .punctuation.definition.string { - &.begin, &.end { + .syntax--punctuation.syntax--definition.syntax--string { + &.syntax--begin, &.syntax--end { color: @gray; } - .separator.key-value.html { + .syntax--separator.syntax--key-value.syntax--html { color: @gray; } diff --git a/styles/languages/jade.less b/styles/languages/jade.less index e1c6120..57e749f 100644 --- a/styles/languages/jade.less +++ b/styles/languages/jade.less @@ -1,65 +1,65 @@ @import "colors"; -.jade { +.syntax--jade { color: @code-font-color; - .comment.jade { + .syntax--comment.syntax--jade { color: @comment; } - .storage.type.function.jade { + .syntax--storage.syntax--type.syntax--function.syntax--jade { color: @keyword; } - .meta.control.flow.jade { + .syntax--meta.syntax--control.syntax--flow.syntax--jade { color: @red; } - .source.script { - .meta.brace.round.js, .meta.brace.curly.js { + .syntax--source.syntax--script { + .syntax--meta.syntax--brace.syntax--round.syntax--js, .syntax--meta.syntax--brace.syntax--curly.syntax--js { color: @brackets; } } - .entity { + .syntax--entity { - &.name.tag.jade { + &.syntax--name.syntax--tag.syntax--jade { color: @tag; } } - .storage.type.import.include.jade { + .syntax--storage.syntax--type.syntax--import.syntax--include.syntax--jade { color: lighten(@green, 20%); } - .variable.control.import.include.jade { + .syntax--variable.syntax--control.syntax--import.syntax--include.syntax--jade { color: @green; } - .constant { + .syntax--constant { - &.id { + &.syntax--id { color: @yellow; } - &.language.js { + &.syntax--language.syntax--js { color: @purple; } } - .text.jade { + .syntax--text.syntax--jade { color: @code-font-color; } - .punctuation.separator.key-value.jade { + .syntax--punctuation.syntax--separator.syntax--key-value.syntax--jade { color: @tag; } - .string.quoted.jade { + .syntax--string.syntax--quoted.syntax--jade { color: @code-font-color; } diff --git a/styles/languages/json.less b/styles/languages/json.less index 0e5cb4a..ccfcd21 100644 --- a/styles/languages/json.less +++ b/styles/languages/json.less @@ -1,46 +1,46 @@ @import "colors"; -.source.json { +.syntax--source.syntax--json { - .constant.language { + .syntax--constant.syntax--language { color: @constant; } - .meta.structure.dictionary.json { + .syntax--meta.syntax--structure.syntax--dictionary.syntax--json { - .string.quoted.json { + .syntax--string.syntax--quoted.syntax--json { color: @tag; } - .meta.structure.dictionary.value.json { + .syntax--meta.syntax--structure.syntax--dictionary.syntax--value.syntax--json { // background-color: pink; - .string.quoted.json { + .syntax--string.syntax--quoted.syntax--json { color: @code-font-color; - .punctuation.definition.string { + .syntax--punctuation.syntax--definition.syntax--string { color: @code-font-color; } } - .meta.structure.dictionary.json { + .syntax--meta.syntax--structure.syntax--dictionary.syntax--json { // background-color: yellow; - .string.quoted.json { + .syntax--string.syntax--quoted.syntax--json { color: @tag; - .punctuation.definition.string { + .syntax--punctuation.syntax--definition.syntax--string { color: @tag; } } - .meta.structure.dictionary.value.json { + .syntax--meta.syntax--structure.syntax--dictionary.syntax--value.syntax--json { // background-color: orange; - .string.quoted.json { + .syntax--string.syntax--quoted.syntax--json { color: @code-font-color; - .punctuation.definition.string { + .syntax--punctuation.syntax--definition.syntax--string { color: @code-font-color; } } diff --git a/styles/languages/markdown.less b/styles/languages/markdown.less index 82ae0f7..1c642ca 100644 --- a/styles/languages/markdown.less +++ b/styles/languages/markdown.less @@ -1,21 +1,21 @@ @import "colors"; -.gfm { - .comment { +.syntax--gfm { + .syntax--comment { color: @gray; } - .support.quote { + .syntax--support.syntax--quote { color: darken(@gray, 30%); } - .heading, - .bold { + .syntax--heading, + .syntax--bold { color: @green!important; } - .link, - .entity { + .syntax--link, + .syntax--entity { color: @blue; } - .source { + .syntax--source { color: lighten(@purple, 20%); } } diff --git a/styles/languages/mustache.less b/styles/languages/mustache.less index 4c288cc..bdb9201 100644 --- a/styles/languages/mustache.less +++ b/styles/languages/mustache.less @@ -1,11 +1,11 @@ @import "colors"; -.mustache { +.syntax--mustache { - .meta.tag.template { + .syntax--meta.syntax--tag.syntax--template { color: @green; - .entity.name.tag { + .syntax--entity.syntax--name.syntax--tag { color: lighten(@green, 20%); } diff --git a/styles/languages/styles.less b/styles/languages/styles.less index 34e27aa..67b87db 100644 --- a/styles/languages/styles.less +++ b/styles/languages/styles.less @@ -1,24 +1,24 @@ @import "colors"; -.css { - .entity.name.tag { +.syntax--css { + .syntax--entity.syntax--name.syntax--tag { color: @keyword; } - .support.type.property-name { + .syntax--support.syntax--type.syntax--property-name { color: @entity; } - .punctuation.definition, - .punctuation.separator.operator, - .entity.other.attribute-name.pseudo-class { + .syntax--punctuation.syntax--definition, + .syntax--punctuation.syntax--separator.syntax--operator, + .syntax--entity.syntax--other.syntax--attribute-name.syntax--pseudo-class { color: lighten(@keyword, 20%); } - .meta.selector { + .syntax--meta.syntax--selector { color: lighten(@keyword, 30%); } } -.less { - .punctuation.definition.comment { +.syntax--less { + .syntax--punctuation.syntax--definition.syntax--comment { color: @comment; } } diff --git a/styles/languages/yaml.less b/styles/languages/yaml.less index 9307d02..0736ecc 100644 --- a/styles/languages/yaml.less +++ b/styles/languages/yaml.less @@ -1,16 +1,16 @@ @import "colors"; -.yaml { - .entity.name.tag { +.syntax--yaml { + .syntax--entity.syntax--name.syntax--tag { color: @silver; } - .string { + .syntax--string { color: @gray; } - .punctuation.definition.entry { + .syntax--punctuation.syntax--definition.syntax--entry { color: @green; } - .numeric { + .syntax--numeric { color: @green; } } diff --git a/styles/syntax-variables.less b/styles/syntax-variables.less index 25c3c55..eb9cc9a 100755 --- a/styles/syntax-variables.less +++ b/styles/syntax-variables.less @@ -1,7 +1,7 @@ @import "colors"; // This defines all syntax variables that syntax themes must implement when they -// include a syntax-variables.less file. +// include a syntax-variables.syntax--less file. // General colors @syntax-text-color: @code-font-color; diff --git a/styles/syntax.less b/styles/syntax.less index f7946e9..14e1eca 100755 --- a/styles/syntax.less +++ b/styles/syntax.less @@ -1,105 +1,105 @@ @import "colors.less"; // COMENTS, DUHR -.comment { +.syntax--comment { color: @comment; background: @comment-bg; } -.keyword { +.syntax--keyword { // @ of @font-face & @media color: @keyword; // try, catch, if, else, return (js) - &.control { + &.syntax--control { color: @keyword; } // =, +, -, ?, :, !=. &&, in (js) - &.operator { + &.syntax--operator { color: @keyword; } // can't tell what this does :/ - &.other.special-method { + &.syntax--other.syntax--special-method { color: @keyword; } // can't tell what this does :/ - &.other.unit { + &.syntax--other.syntax--unit { color: @keyword; } } // STORAGE | -.storage { +.syntax--storage { color: @storage; // var of var a = b; - &.modifier { + &.syntax--modifier { color: @storage; } } -.constant { +.syntax--constant { // true, false, null, undefined color: @constant; // \ of ("what\'s") - &.character.escape { + &.syntax--character.syntax--escape { color: @constant; } // all the numbers! - &.numeric { + &.syntax--numeric { color: @numeric; } // can't tell what this does :/ - &.other.color { + &.syntax--other.syntax--color { color: @constant; } // can't tell what this does :/ - &.other.symbol { + &.syntax--other.syntax--symbol { color: @constant; } } -.variable { +.syntax--variable { // this (js), @varable_name (sass), http://web.com of url(http://web.com), variable of {{variable}} (handlebars) color: @variable; // can't tell what this does - &.interpolation { + &.syntax--interpolation { color: @variable; } // foo & bar of function name(foo, bar) - &.parameter.function { + &.syntax--parameter.syntax--function { color: @function-param; } } // INVALID TEXT -.invalid.illegal, .invalid.deprecated { +.syntax--invalid.syntax--illegal, .syntax--invalid.syntax--deprecated { background: none; color: @error; } -.string { +.syntax--string { - .json { + .syntax--json { } @@ -107,109 +107,109 @@ color: @string; // REGEX - [\da-z] of /-([\da-z])/gi (js) - .constant { + .syntax--constant { color: @regex; } - &.regexp { + &.syntax--regexp { // ?:input, select, textarea, button of /^(?:input|select|textarea|button)$/i, color: @regex; - .constant.character.escape, - .source.ruby.embedded, - .string.regexp.arbitrary-repitition { + .syntax--constant.syntax--character.syntax--escape, + .syntax--source.syntax--ruby.syntax--embedded, + .syntax--string.syntax--regexp.syntax--arbitrary-repitition { color: @regex; } - &.group { + &.syntax--group { color: @regex; } - &.character-class { + &.syntax--character-class { color: @regex; } - .source.ruby.embedded { + .syntax--source.syntax--ruby.syntax--embedded { color: @regex; } } // site.dir in {{site.dir}} - .variable { + .syntax--variable { color: @variable; } // can't tell what this does :/ - &.other.link { + &.syntax--other.syntax--link { color: @string; } } // String interpolation in Ruby, CoffeeScript, and others -.source .string { - .source, - .meta.embedded.line { +.syntax--source .syntax--string { + .syntax--source, + .syntax--meta.syntax--embedded.line { color: @string; } - .punctuation.section.embedded { + .syntax--punctuation.syntax--section.syntax--embedded { color: @string; - .source { + .syntax--source { color: @string; // Required for the end of embedded strings in Ruby # 716 } } } // MISC PUNCTUATION -.punctuation { +.syntax--punctuation { - &.terminator { + &.syntax--terminator { color: @punctuation; } - &.separator { + &.syntax--separator { color: @punctuation; } - &.definition { + &.syntax--definition { color: @punctuation; - &.comment { + &.syntax--comment { color: @comment-punc; } // QUOTES - &.string, - &.variable, - &.array { + &.syntax--string, + &.syntax--variable, + &.syntax--array { color: @string; } - &.parameters { + &.syntax--parameters { color: @code-font-color; } - &.heading, - &.identity { + &.syntax--heading, + &.syntax--identity { color: @code-font-color; } - &.bold { + &.syntax--bold { color: @code-font-color; font-weight: bold; } - &.italic { + &.syntax--italic { color: @code-font-color; font-style: italic; } } - &.section.embedded { + &.syntax--section.syntax--embedded { color: @code-font-color; } @@ -217,87 +217,87 @@ -.support { +.syntax--support { // background of background: none, color: @support; // SUPPORT | module of module.exports - &.class { + &.syntax--class { color: @support; } - &.function { + &.syntax--function { color: @support; // .log of console.log, url of url(http://web.com) // can't tell what this does :/ - &.any-method { + &.syntax--any-method { color: @support; } } // {{}} of {{ variable }} - &.constant { + &.syntax--constant { color: @constant; // none of text-decoration: none; } - &.type.property-name.css { + &.syntax--type.syntax--property-name.syntax--css { color: @support; } } -// .class names in css & scss -.source .entity.name.tag, .source .entity.other.attribute-name, .meta.tag.inline, .meta.tag.inline .entity { +// .syntax--class names in css & scss +.syntax--source .syntax--entity.syntax--name.syntax--tag, .syntax--source .syntax--entity.syntax--other.syntax--attribute-name, .syntax--meta.syntax--tag.syntax--inline, .syntax--meta.syntax--tag.syntax--inline .syntax--entity { color: @class; } - &.tag, - &.tag .entity { + &.syntax--tag, + &.syntax--tag .syntax--entity { color: @tag-entity; } -.html { +.syntax--html { - .string { + .syntax--string { color: @code-font-color; } // inline elements - - .meta { + .syntax--meta { } - .punctuation.definition.tag { + .syntax--punctuation.syntax--definition.syntax--tag { color: @tag; } - .entity { + .syntax--entity { - &.name.tag { + &.syntax--name.syntax--tag { text-decoration: done; // structural elements - - &.structure { + &.syntax--structure { color: @tag; } // block level elements -
,

- &.block { + &.syntax--block { color: @tag; } // inline elements - - &.script { + &.syntax--script { // color: @tag; } } - &.other { - &.attribute-name { + &.syntax--other { + &.syntax--attribute-name { color: @element-attr; } } @@ -306,144 +306,144 @@ } -// ENTITY | exports of module.exports,
, . of .className -.entity { +// ENTITY | exports of module.exports,
, . of .syntax--className +.syntax--entity { color: @entity; // console of console.log (js) - &.name.type { + &.syntax--name.syntax--type { color: @entity; text-decoration: none; } - &.other.inherited-class { + &.syntax--other.syntax--inherited-class { color: @entity; } // init in init: function(){} (js) - &.name.function { + &.syntax--name.syntax--function { color: @entity; } - &.name.class, &.name.type.class { + &.syntax--name.syntax--class, &.syntax--name.syntax--type.syntax--class { color: @entity; } - &.name.section { + &.syntax--name.syntax--section { color: @entity; } // div of
(html), body of body{} (css) - &.name.tag { + &.syntax--name.syntax--tag { color: @tag; text-decoration: done; } // CSS CLASSES - &.other.attribute-name { + &.syntax--other.syntax--attribute-name { color: @element-attr; // CSS ID's - &.id { + &.syntax--id { color: @id; } } } -.meta { +.syntax--meta { - &.link { + &.syntax--link { color: @meta; } - &.require { + &.syntax--require { color: @meta; } - &.brace { + &.syntax--brace { // curly braces - {} - &.curly { + &.syntax--curly { color: @brackets; } // parenthesis - () - &.round { + &.syntax--round { color: @code-font-color; } } - &.comma { + &.syntax--comma { color: @punctuation; } - // .css files | commas, ([controls]) of audio:not([controls]) - &.selector { + // .syntax--css files | commas, ([controls]) of audio:not([controls]) + &.syntax--selector { color: @punctuation; } - &.separator { + &.syntax--separator { background-color: @punctuation; color: @punctuation; } } -.none { +.syntax--none { color: @code-font-color; } -.markup { - &.bold { +.syntax--markup { + &.syntax--bold { color: @markup; font-weight: bold; } - &.changed { + &.syntax--changed { color: @markup; } - &.deleted { + &.syntax--deleted { color: @markup; } - &.italic { + &.syntax--italic { color: @markup; font-style: italic; } - &.heading .punctuation.definition.heading { + &.syntax--heading .syntax--punctuation.syntax--definition.syntax--heading { color: @markup; } - &.inserted { + &.syntax--inserted { color: @markup; } - &.list { + &.syntax--list { color: @markup; } - &.quote { + &.syntax--quote { color: @markup; } - &.raw.inline { + &.syntax--raw.syntax--inline { color: @markup; } } -.source.gfm .markup { +.syntax--source.syntax--gfm .syntax--markup { -webkit-font-smoothing: auto; - &.heading { + &.syntax--heading { color: @code-font-color; } } -atom-text-editor[mini], :host(.mini) { +atom-text-editor[mini],atom-text-editor { .scroll-view { padding-left: 1px; } From aad92d9cdbf54aac66e0a85eb8a164e6792ac15d Mon Sep 17 00:00:00 2001 From: Michael Aguiar Date: Fri, 10 Feb 2017 12:03:00 -0700 Subject: [PATCH 2/2] reverted --- CHANGELOG.md | 9 +++-- README.md | 4 ++- package.json | 63 ++++------------------------------ sample-files/CSS.css | 6 ++-- sample-files/Gruntfile.js | 2 +- sample-files/Gulpfile.js | 40 ++++++++++----------- sample-files/Handlebars.hbs | 2 +- sample-files/JavaScript.js | 2 +- sample-files/Markdown.md | 2 +- sample-files/Mustache.mustache | 2 +- sample-files/Procfile | 2 +- sample-files/React.jsx | 6 ++-- sample-files/Stache.stache | 2 +- sample-files/Typescript.ts | 2 +- 14 files changed, 50 insertions(+), 94 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c3d858c..270c316 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ -## 0.1.0 - First Release -* Every feature added -* Every bug fixed +## 1.1.0 - Update +* Add Screenshots +* Update README + +## 1.0.0 - First Release +* Create Theme diff --git a/README.md b/README.md index 7fe4650..37b10d7 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,9 @@ An out of this world theme composed of all the colors of the galaxy. For the cod Use `apm` to get galactic real quick - apm install galaxy-syntax +``` +apm install galaxy-syntax +``` ## More Galaxy diff --git a/package.json b/package.json index 66db505..d810ddf 100644 --- a/package.json +++ b/package.json @@ -1,64 +1,15 @@ { - "_args": [ - [ - { - "raw": "/private/var/folders/q7/slcqrh_14_n8ptg3lr311jl00000gn/T/d-1161029-2575-138tz0s/package.tgz", - "scope": null, - "escapedName": null, - "name": null, - "rawSpec": "/private/var/folders/q7/slcqrh_14_n8ptg3lr311jl00000gn/T/d-1161029-2575-138tz0s/package.tgz", - "spec": "/private/var/folders/q7/slcqrh_14_n8ptg3lr311jl00000gn/T/d-1161029-2575-138tz0s/package.tgz", - "type": "local" - }, - "/private/var/folders/q7/slcqrh_14_n8ptg3lr311jl00000gn/T/apm-install-dir-1161029-2575-1oaqrpw" - ] - ], - "_from": "../d-1161029-2575-138tz0s/package.tgz", - "_id": "galaxy-syntax@1.1.0", - "_inCache": true, - "_installable": true, - "_location": "/galaxy-syntax", - "_phantomChildren": {}, - "_requested": { - "raw": "/private/var/folders/q7/slcqrh_14_n8ptg3lr311jl00000gn/T/d-1161029-2575-138tz0s/package.tgz", - "scope": null, - "escapedName": null, - "name": null, - "rawSpec": "/private/var/folders/q7/slcqrh_14_n8ptg3lr311jl00000gn/T/d-1161029-2575-138tz0s/package.tgz", - "spec": "/private/var/folders/q7/slcqrh_14_n8ptg3lr311jl00000gn/T/d-1161029-2575-138tz0s/package.tgz", - "type": "local" - }, - "_requiredBy": [ - "#USER" - ], - "_resolved": "file:../d-1161029-2575-138tz0s/package.tgz", - "_shasum": "56f4776c7f3f1dada67badf0e55aa4b3c5b54f4a", - "_shrinkwrap": null, - "_spec": "/private/var/folders/q7/slcqrh_14_n8ptg3lr311jl00000gn/T/d-1161029-2575-138tz0s/package.tgz", - "_where": "/private/var/folders/q7/slcqrh_14_n8ptg3lr311jl00000gn/T/apm-install-dir-1161029-2575-1oaqrpw", - "bugs": { - "url": "https://github.com/rossedman/galaxy-syntax/issues" - }, - "dependencies": {}, + "name": "galaxy-syntax", + "theme": "syntax", + "version": "1.1.0", "description": "A theme made of intergalactic colors and spacedust. For the code voyagers.", - "devDependencies": {}, - "engines": { - "atom": ">=0.174.0 <2.0.0" - }, - "homepage": "https://github.com/rossedman/galaxy-syntax#readme", "keywords": [ "syntax", "theme" ], + "repository": "https://github.com/rossedman/galaxy-syntax", "license": "MIT", - "name": "galaxy-syntax", - "optionalDependencies": {}, - "readme": "# Galaxy Atom Syntax Theme\n\nAn out of this world theme composed of all the colors of the galaxy. For the code voyagers of this world. This syntax contains support and customized highlighting for HTML, LESS, Jade, JSON, Markdown, Mustache, YAML and more!\n\n## Installation\n\nUse `apm` to get galactic real quick\n\n apm install galaxy-syntax\n\n## More Galaxy\n\nI'm pretty OCD about my whole desktop matching, that being said I have also created an iTerm theme, a Sublime Text 3 Theme & UITheme as well as Galaxy Light. Also, an Atom UI theme is in the works. Get all of that great stuff here:\n\n- [Sublime Text Theme & UI](https://github.com/rossedman/galaxy-theme)\n- [iTerm Theme](https://github.com/rossedman/galaxy-iterm)\n- [Atom Galaxy Syntax Light](https://github.com/rossedman/galaxy-light-syntax)\n\n## Screenshots\n\nHere are some screenshots below. This is using Atom's One Dark UI kit and is highly recommended!\n\n![A screenshot of your theme](https://github.com/rossedman/galaxy-syntax/blob/master/screenshots/galaxy-php.png?raw=true)\n![A screenshot of your theme](https://github.com/rossedman/galaxy-syntax/blob/master/screenshots/galaxy-ruby.png?raw=true)\n![A screenshot of your theme](https://github.com/rossedman/galaxy-syntax/blob/master/screenshots/galaxy-javascript.png?raw=true)\n![A screenshot of your theme](https://github.com/rossedman/galaxy-syntax/blob/master/screenshots/galaxy-markdown.png?raw=true)\n![A screenshot of your theme](https://github.com/rossedman/galaxy-syntax/blob/master/screenshots/galaxy-html.png?raw=true)\n", - "readmeFilename": "README.md", - "repository": { - "type": "git", - "url": "git+https://github.com/rossedman/galaxy-syntax.git" - }, - "theme": "syntax", - "version": "1.1.0" + "engines": { + "atom": ">=0.174.0 <2.0.0" + } } diff --git a/sample-files/CSS.css b/sample-files/CSS.css index b18ea17..04633bc 100755 --- a/sample-files/CSS.css +++ b/sample-files/CSS.css @@ -231,13 +231,13 @@ pre { .content { padding: 30px; } -.syntax--block { +.block { display: block; } -.syntax--inline { +.inline { display: inline; } -.syntax--inline-block { +.inline-block { display: inline-block; } .bad { diff --git a/sample-files/Gruntfile.js b/sample-files/Gruntfile.js index e57d129..7a7c55d 100755 --- a/sample-files/Gruntfile.js +++ b/sample-files/Gruntfile.js @@ -2,7 +2,7 @@ module.exports = function(grunt) { grunt.initConfig({ jshint: { - files: ['Gruntfile.syntax--js', 'src/**/*.syntax--js', 'test/**/*.syntax--js'], + files: ['Gruntfile.js', 'src/**/*.js', 'test/**/*.js'], options: { globals: { jQuery: true diff --git a/sample-files/Gulpfile.js b/sample-files/Gulpfile.js index c09da96..5c0333e 100755 --- a/sample-files/Gulpfile.js +++ b/sample-files/Gulpfile.js @@ -42,11 +42,11 @@ var AUTOPREFIXER_BROWSERS = [ // Lint JavaScript gulp.task('jshint', function () { - return gulp.src('app/scripts/**/*.syntax--js') + return gulp.src('app/scripts/**/*.js') .pipe(reload({stream: true, once: true})) - .pipe($.syntax--jshint()) - .pipe($.syntax--jshint.reporter('jshint-stylish')) - .pipe($.if(!browserSync.active, $.syntax--jshint.reporter('fail'))); + .pipe($.jshint()) + .pipe($.jshint.reporter('jshint-stylish')) + .pipe($.if(!browserSync.active, $.jshint.reporter('fail'))); }); // Optimize Images @@ -64,7 +64,7 @@ gulp.task('images', function () { gulp.task('copy', function () { return gulp.src([ 'app/*', - '!app/*.syntax--html', + '!app/*.html', 'node_modules/apache-server-configs/dist/.htaccess' ], { dot: true @@ -84,20 +84,20 @@ gulp.task('styles', function () { // For best performance, don't add Sass partials to `gulp.src` return gulp.src([ 'app/styles/*.scss', - 'app/styles/**/*.syntax--css', + 'app/styles/**/*.css', 'app/styles/components/components.scss' ]) - .pipe($.syntax--sourcemaps.init()) - .pipe($.syntax--changed('.tmp/styles', {extension: '.syntax--css'})) + .pipe($.sourcemaps.init()) + .pipe($.changed('.tmp/styles', {extension: '.css'})) .pipe($.sass({ precision: 10, onError: console.error.bind(console, 'Sass error:') })) .pipe($.autoprefixer({browsers: AUTOPREFIXER_BROWSERS})) - .pipe($.syntax--sourcemaps.write()) + .pipe($.sourcemaps.write()) .pipe(gulp.dest('.tmp/styles')) // Concatenate And Minify Styles - .pipe($.if('*.syntax--css', $.syntax--csso())) + .pipe($.if('*.css', $.csso())) .pipe(gulp.dest('dist/styles')) .pipe($.size({title: 'styles'})); }); @@ -106,17 +106,17 @@ gulp.task('styles', function () { gulp.task('html', function () { var assets = $.useref.assets({searchPath: '{.tmp,app}'}); - return gulp.src('app/**/*.syntax--html') + return gulp.src('app/**/*.html') .pipe(assets) // Concatenate And Minify JavaScript - .pipe($.if('*.syntax--js', $.uglify({preserveComments: 'some'}))) + .pipe($.if('*.js', $.uglify({preserveComments: 'some'}))) // Remove Any Unused CSS // Note: If not using the Style Guide, you can delete it from // the next line to only include styles your project uses. - .pipe($.if('*.syntax--css', $.uncss({ + .pipe($.if('*.css', $.uncss({ html: [ - 'app/index.syntax--html', - 'app/styleguide.syntax--html' + 'app/index.html', + 'app/styleguide.html' ], // CSS Selectors for UnCSS to ignore ignore: [ @@ -126,13 +126,13 @@ gulp.task('html', function () { }))) // Concatenate And Minify Styles // In case you are still using useref build blocks - .pipe($.if('*.syntax--css', $.syntax--csso())) + .pipe($.if('*.css', $.csso())) .pipe(assets.restore()) .pipe($.useref()) // Update Production Style Guide Paths - .pipe($.replace('components/components.syntax--css', 'components/main.min.syntax--css')) + .pipe($.replace('components/components.css', 'components/main.min.css')) // Minify Any HTML - .pipe($.if('*.syntax--html', $.minifyHtml())) + .pipe($.if('*.html', $.minifyHtml())) // Output Files .pipe(gulp.dest('dist')) .pipe($.size({title: 'html'})); @@ -154,9 +154,9 @@ gulp.task('serve', ['styles'], function () { server: ['.tmp', 'app'] }); - gulp.watch(['app/**/*.syntax--html'], reload); + gulp.watch(['app/**/*.html'], reload); gulp.watch(['app/styles/**/*.{scss,css}'], ['styles', reload]); - gulp.watch(['app/scripts/**/*.syntax--js'], ['jshint']); + gulp.watch(['app/scripts/**/*.js'], ['jshint']); gulp.watch(['app/images/**/*'], reload); }); diff --git a/sample-files/Handlebars.hbs b/sample-files/Handlebars.hbs index 01edea1..484d799 100755 --- a/sample-files/Handlebars.hbs +++ b/sample-files/Handlebars.hbs @@ -2,7 +2,7 @@

Hello!

-

Welcome to {{site.syntax--name}}

+

Welcome to {{site.name}}

{{> footer}} diff --git a/sample-files/JavaScript.js b/sample-files/JavaScript.js index 67969bf..2299ea9 100755 --- a/sample-files/JavaScript.js +++ b/sample-files/JavaScript.js @@ -25,4 +25,4 @@ app.use(function *(){ this.body = 'Hello World'; }); -app.syntax--listen(3000); +app.listen(3000); diff --git a/sample-files/Markdown.md b/sample-files/Markdown.md index 1ebbb0d..9cc90a8 100755 --- a/sample-files/Markdown.md +++ b/sample-files/Markdown.md @@ -9,7 +9,7 @@ the aid of their country. __This is__ just a regular paragraph. The quick brown fox **jumped** over the lazy -dog's back. [Link](http://www.syntax--link.com) +dog's back. [Link](http://www.link.com) ### Header 3 diff --git a/sample-files/Mustache.mustache b/sample-files/Mustache.mustache index 01edea1..484d799 100755 --- a/sample-files/Mustache.mustache +++ b/sample-files/Mustache.mustache @@ -2,7 +2,7 @@

Hello!

-

Welcome to {{site.syntax--name}}

+

Welcome to {{site.name}}

{{> footer}} diff --git a/sample-files/Procfile b/sample-files/Procfile index 0ab69c5..1da0cd6 100755 --- a/sample-files/Procfile +++ b/sample-files/Procfile @@ -1 +1 @@ -web: node index.syntax--js +web: node index.js diff --git a/sample-files/React.jsx b/sample-files/React.jsx index be59977..eefd982 100755 --- a/sample-files/React.jsx +++ b/sample-files/React.jsx @@ -11,11 +11,11 @@ var TodoApp = React.createClass({ return {items: [], text: ''}; }, onChange: function(e) { - this.setState({text: e.target.syntax--value}); + this.setState({text: e.target.value}); }, handleSubmit: function(e) { e.preventDefault(); - var nextItems = this.state.items.concat([this.state.syntax--text]); + var nextItems = this.state.items.concat([this.state.text]); var nextText = ''; this.setState({items: nextItems, text: nextText}); }, @@ -25,7 +25,7 @@ var TodoApp = React.createClass({

TODO

- +
diff --git a/sample-files/Stache.stache b/sample-files/Stache.stache index 01edea1..484d799 100755 --- a/sample-files/Stache.stache +++ b/sample-files/Stache.stache @@ -2,7 +2,7 @@

Hello!

-

Welcome to {{site.syntax--name}}

+

Welcome to {{site.name}}

{{> footer}} diff --git a/sample-files/Typescript.ts b/sample-files/Typescript.ts index adc435e..d7d97bc 100755 --- a/sample-files/Typescript.ts +++ b/sample-files/Typescript.ts @@ -12,7 +12,7 @@ module Sayings { var greeter = new Sayings.Greeter("world"); var button = document.createElement('button'); -button.syntax--textContent = "Say Hello"; +button.textContent = "Say Hello"; button.onclick = function() { alert(greeter.greet()); };