From 30bf4c70e1d2223ff3068b9f62ccd3873b14592e Mon Sep 17 00:00:00 2001 From: nakajmg Date: Thu, 9 Jun 2016 14:14:58 +0900 Subject: [PATCH 1/5] update syntax color --- .../css/highlight/duotone-light.css | 367 ------------------ .../aigis_assets/css/highlight/monokai.css | 138 ------- .../aigis_assets/css/highlight/okadia.css | 123 ++++++ examples/aigis_assets/css/theme.css | 8 +- examples/template_ejs/index.ejs | 2 +- 5 files changed, 129 insertions(+), 509 deletions(-) delete mode 100644 examples/aigis_assets/css/highlight/duotone-light.css delete mode 100644 examples/aigis_assets/css/highlight/monokai.css create mode 100644 examples/aigis_assets/css/highlight/okadia.css diff --git a/examples/aigis_assets/css/highlight/duotone-light.css b/examples/aigis_assets/css/highlight/duotone-light.css deleted file mode 100644 index 9fdf1cf..0000000 --- a/examples/aigis_assets/css/highlight/duotone-light.css +++ /dev/null @@ -1,367 +0,0 @@ -@import 'styles/languages/css'; -atom-text-editor, -:host { - color: #896724; - background-color: #faf8f5; -} -atom-text-editor .line.cursor-line, -:host .line.cursor-line { - background-color: rgba(229, 221, 204, 0.26); -} -atom-text-editor .invisible, -:host .invisible { - color: #896724; -} -atom-text-editor .cursor, -:host .cursor { - border-color: #477eeb; - border-left-width: 2px; -} -atom-text-editor .selection .region, -:host .selection .region { - background-color: #e5ddcc; -} -atom-text-editor .bracket-matcher .region, -:host .bracket-matcher .region { - border-bottom: 1px solid #477eeb; - margin-top: -1px; - opacity: .7; -} -atom-text-editor .invisible-character, -:host .invisible-character { - color: #e9e1d3; - -webkit-font-smoothing: antialiased; -} -atom-text-editor .indent-guide, -:host .indent-guide { - color: #e9e1d3; -} -atom-text-editor .wrap-guide, -:host .wrap-guide { - background-color: #e9e1d3; -} -atom-text-editor .gutter .line-number, -:host .gutter .line-number { - color: #b6ad9a; - -webkit-font-smoothing: antialiased; -} -atom-text-editor .gutter .line-number.git-line-removed:before, -:host .gutter .line-number.git-line-removed:before { - bottom: -3px; -} -atom-text-editor .gutter .line-number.git-line-removed:after, -:host .gutter .line-number.git-line-removed:after { - content: ""; - position: absolute; - left: 0px; - bottom: 0px; - width: 25px; - border-bottom: 1px dotted rgba(224, 82, 82, 0.5); - pointer-events: none; -} -atom-text-editor .gutter .line-number.cursor-line, -:host .gutter .line-number.cursor-line { - color: #b29762; - background-color: #f5f1eb; -} -atom-text-editor .gutter .line-number.cursor-line-no-selection, -:host .gutter .line-number.cursor-line-no-selection { - background-color: transparent; -} -atom-text-editor .gutter .line-number .icon-right, -:host .gutter .line-number .icon-right { - color: #896724; -} -atom-text-editor .gutter .line-number .icon-right, -:host .gutter .line-number .icon-right { - color: #896724; -} -atom-text-editor .gutter .line-number.folded, -:host .gutter .line-number.folded, -atom-text-editor .gutter .line-number:after, -:host .gutter .line-number:after, -atom-text-editor .fold-marker:after, -:host .fold-marker:after { - color: #b29762; -} -.uno-1 { - color: #2d2006; -} -.uno-2 { - color: #896724; -} -.uno-3 { - color: #b29762; -} -.uno-4 { - color: #b6ad9a; -} -.duo-1 { - color: #063289; -} -.duo-2 { - color: #728fcb; -} -.duo-3 { - color: #aeb1b7; -} -.meta { - color: #b6ad9a; -} -.html.elements, -.entity, -.tag, -.function-call { - color: #2d2006; -} -.variable, -.character.escape, -.html.attribute-name, -.css.pseudo-element { - color: #896724; -} -.support { - color: #b29762; -} -.string, -.constant, -.storage.type { - color: #063289; -} -.keyword, -.storage { - color: #728fcb; -} -.punctuation, -.bracket, -.brace { - color: #b6ad9a; -} -.string .punctuation { - color: #aeb1b7; -} -.comment { - color: #aeb1b7; -} -.bold { - font-weight: bold; -} -.italic { - font-style: italic; -} -.c .parens, -.c .block { - color: #896724; -} -.c .parens .punctuation, -.c .block .punctuation, -.c .parens .bracket, -.c .block .bracket, -.c .parens .brace, -.c .block .brace { - color: #b6ad9a; -} -.c .parens .string .punctuation, -.c .block .string .punctuation { - color: #aeb1b7; -} -.c .comment { - color: #aeb1b7; -} -.coffee.source { - color: #b29762; -} -.gfm { - color: #2d2006; -} -.gfm .punctuation, -.gfm .bracket, -.gfm .brace { - color: #b6ad9a; -} -.gfm .string .punctuation { - color: #aeb1b7; -} -.gfm.markup, -.gfm .link { - color: #896724; -} -.gfm.markup.raw, -.gfm.markup .support { - color: #aeb1b7; -} -.gfm.variable, -.gfm.entity { - color: #063289; -} -.gfm.support { - color: #728fcb; -} -.gfm.comment { - color: #aeb1b7; -} -.gfm.heading-1 { - color: #063289; -} -.gfm.heading-2 { - color: #728fcb; -} -.gfm.heading-3 { - color: #2d2006; -} -.gfm.heading-4 { - color: #896724; -} -.gfm.heading-5 { - color: #b29762; -} -.gfm.heading-6 { - color: #b6ad9a; -} -.gfm.bold { - font-weight: bold; -} -.gfm.italic { - font-style: italic; -} -.haskell.source { - color: #896724; -} -.haskell.source .punctuation, -.haskell.source .bracket, -.haskell.source .brace { - color: #b6ad9a; -} -.haskell.source .string .punctuation { - color: #aeb1b7; -} -.html.meta { - color: #b6ad9a; -} -.html.text { - color: #b29762; -} -.html .string .id { - color: #063289; -} -.java .method { - color: #896724; -} -.java .method .punctuation, -.java .method .bracket, -.java .method .brace { - color: #b6ad9a; -} -.java .method .string .punctuation { - color: #aeb1b7; -} -.java .dereference { - color: #b6ad9a; -} -.js.source { - color: #896724; -} -.js.source .punctuation, -.js.source .bracket, -.js.source .brace { - color: #b6ad9a; -} -.js.source .string .punctuation { - color: #aeb1b7; -} -.json .string { - color: #896724; -} -.json .string .punctuation { - color: #b6ad9a; -} -.json .value > .string { - color: #063289; -} -.json .value > .string .punctuation { - color: #b6ad9a; -} -.json .value .constant { - color: #728fcb; -} -.less.variable:first-child { - color: #2d2006; -} -.less .mixin { - color: #728fcb; -} -.mediawiki { - color: #2d2006; -} -.mediawiki .punctuation, -.mediawiki .bracket, -.mediawiki .brace { - color: #b6ad9a; -} -.mediawiki .string .punctuation { - color: #aeb1b7; -} -.mediawiki .wiki-link { - color: #896724; -} -.mediawiki .heading { - color: #063289; -} -.mediawiki .function-call { - color: #728fcb; -} -.mediawiki .value { - color: #063289; -} -.mediawiki .fix_this_later { - color: #896724; -} -.mediawiki .pipe, -.mediawiki .link, -.mediawiki .tag { - color: #b6ad9a; -} -.php .string-contents { - color: #063289; -} -.sass .at-rule, -.sass .at-rule > .punctuation { - color: #2d2006; -} -.sass .mixin > .variable, -.sass .include > .variable { - color: #728fcb; -} -.scss .at-rule .at-rule, -.scss .at-rule .at-rule > .punctuation { - color: #2d2006; -} -.scss .mixin + .function, -.scss .include + .function { - color: #728fcb; -} -.stylus .function .name { - color: #728fcb; -} -.tex .other { - color: #728fcb; -} -.tex .reference { - color: #896724; -} -.plain .text { - color: #2d2006; -} -.yaml .tag { - color: #896724; -} -.yaml .constant { - color: #728fcb; -} -.yaml .punctuation { - color: #b6ad9a; -} -.editor.editor-colors { - background-color: #FAF8F5; - color: #545454; -} diff --git a/examples/aigis_assets/css/highlight/monokai.css b/examples/aigis_assets/css/highlight/monokai.css deleted file mode 100644 index a9e0484..0000000 --- a/examples/aigis_assets/css/highlight/monokai.css +++ /dev/null @@ -1,138 +0,0 @@ -.editor .invisible-character { - color: #3d3d3d; -} -.editor .indent-guide { - color: #3d3d3d; -} -.editor .wrap-guide { - background-color: #3d3d3d; -} -.editor .gutter { - background-color: #242729; -} -.editor .gutter .cursor-line { - background-color: #49483e; -} -.editor .line-number.cursor-line-no-selection { - background-color: #49483e; -} -.editor .invisible { - color: #f8f8f2; -} -.editor .cursor { - border-color: #f8f8f0; -} -.editor .selection .region { - background-color: #49483e; -} -.editor .search-results .marker .region { - background-color: transparent; - border: 1px solid #888888; -} -.editor .search-results .marker.current-result .region { - border: 1px solid white; -} -.editor .comment { - color: #75715E; -} -.editor .string { - color: #E6DB74; -} -.editor .constant.numeric { - color: #AE81FF; -} -.editor .constant.language { - color: #AE81FF; -} -.editor .constant.character, -.editor .constant.other { - color: #AE81FF; -} -.editor .keyword { - color: #F92672; -} -.editor .storage { - color: #F92672; -} -.editor .storage.type { - font-style: italic; - color: #66D9EF; -} -.editor .entity.name.class { - text-decoration: underline; - color: #A6E22E; -} -.editor .entity.other.inherited-class { - font-style: italic; - text-decoration: underline; - color: #A6E22E; -} -.editor .entity.name.function { - color: #A6E22E; -} -.editor .entity.name.instance { - color: #66D9EF; -} -.editor .variable.parameter { - font-style: italic; - color: #FD971F; -} -.editor .entity.name.tag { - color: #F92672; -} -.editor .entity.other.attribute-name { - color: #A6E22E; -} -.editor .support.function { - color: #66D9EF; -} -.editor .support.constant { - color: #66D9EF; -} -.editor .support.type, -.editor .support.class { - font-style: italic; - color: #66D9EF; -} -.editor .invalid { - color: #F8F8F0; - background-color: #F92672; -} -.editor .invalid.deprecated { - color: #F8F8F0; - background-color: #AE81FF; -} -.editor .class.jade { - color: #AE81FF; -} -.editor .gfm .markup.heading { - color: #A6E22E; - font-weight: bold; -} -.editor .gfm .markup.underline { - color: #E6DB74; - text-decoration: underline; -} -.editor .gfm .bold { - font-weight: bold; -} -.editor .gfm .italic { - font-style: italic; -} -.editor .gfm .raw { - color: #66D9EF; -} -.editor .gfm .variable.list { - color: #F92672; - font-weight: bold; -} -.editor .gfm .link { - color: #CCC; -} -.editor .gfm .link .entity { - color: #AE81FF; -} -.editor.editor-colors { - background-color: #1d1f21; - color: #f8f8f2; -} diff --git a/examples/aigis_assets/css/highlight/okadia.css b/examples/aigis_assets/css/highlight/okadia.css new file mode 100644 index 0000000..74da73f --- /dev/null +++ b/examples/aigis_assets/css/highlight/okadia.css @@ -0,0 +1,123 @@ +/* http://prismjs.com/download.html?themes=prism-okaidia&languages=markup+css+clike+javascript+abap+actionscript+apacheconf+apl+applescript+asciidoc+aspnet+autoit+autohotkey+bash+basic+batch+c+brainfuck+bro+bison+csharp+cpp+coffeescript+ruby+css-extras+d+dart+diff+docker+eiffel+elixir+erlang+fsharp+fortran+gherkin+git+glsl+go+groovy+haml+handlebars+haskell+haxe+http+icon+inform7+ini+j+jade+java+json+julia+keyman+kotlin+latex+less+lolcode+lua+makefile+markdown+matlab+mel+mizar+monkey+nasm+nginx+nim+nix+nsis+objectivec+ocaml+oz+parigp+parser+pascal+perl+php+php-extras+powershell+processing+prolog+protobuf+puppet+pure+python+q+qore+r+jsx+rest+rip+roboconf+crystal+rust+sas+sass+scss+scala+scheme+smalltalk+smarty+sql+stylus+swift+tcl+textile+twig+typescript+verilog+vhdl+vim+wiki+yaml */ +/** + * okaidia theme for JavaScript, CSS and HTML + * Loosely based on Monokai textmate theme by http://www.monokai.nl/ + * @author ocodia + */ + +code[class*="language-"], +pre[class*="language-"] { + color: #f8f8f2; + background: none; + text-shadow: 0 1px rgba(0, 0, 0, 0.3); + font-family: Consolas, Monaco, 'Andale Mono', 'Ubuntu Mono', monospace; + text-align: left; + white-space: pre; + word-spacing: normal; + word-break: normal; + word-wrap: normal; + line-height: 1.5; + + -moz-tab-size: 4; + -o-tab-size: 4; + tab-size: 4; + + -webkit-hyphens: none; + -moz-hyphens: none; + -ms-hyphens: none; + hyphens: none; +} + +/* Code blocks */ +pre[class*="language-"] { + padding: 1em; + margin: .5em 0; + overflow: auto; + border-radius: 0.3em; +} + +:not(pre) > code[class*="language-"], +pre[class*="language-"] { + background: #272822; +} + +/* Inline code */ +:not(pre) > code[class*="language-"] { + padding: .1em; + border-radius: .3em; + white-space: normal; +} + +.token.comment, +.token.prolog, +.token.doctype, +.token.cdata { + color: slategray; +} + +.token.punctuation { + color: #f8f8f2; +} + +.namespace { + opacity: .7; +} + +.token.property, +.token.tag, +.token.constant, +.token.symbol, +.token.deleted { + color: #f92672; +} + +.token.boolean, +.token.number { + color: #ae81ff; +} + +.token.selector, +.token.attr-name, +.token.string, +.token.char, +.token.builtin, +.token.inserted { + color: #a6e22e; +} + +.token.operator, +.token.entity, +.token.url, +.language-css .token.string, +.style .token.string, +.token.variable { + color: #f8f8f2; +} + +.token.atrule, +.token.attr-value, +.token.function { + color: #e6db74; +} + +.token.keyword { + color: #66d9ef; +} + +.token.regex, +.token.important { + color: #fd971f; +} + +.token.important, +.token.bold { + font-weight: bold; +} +.token.italic { + font-style: italic; +} + +.token.entity { + cursor: help; +} + diff --git a/examples/aigis_assets/css/theme.css b/examples/aigis_assets/css/theme.css index badd1d2..fb59685 100644 --- a/examples/aigis_assets/css/theme.css +++ b/examples/aigis_assets/css/theme.css @@ -136,12 +136,14 @@ tag: latest ``` */ -pre pre.editor { +.aigis-module > pre { + background-color: #272822; + color: #f8f8f2; font-size: 14px; position: relative; padding: 0.5em; border-radius: 3px; - margin: 0 auto; + margin: 0 auto 1em; overflow: scroll; border: 1px solid #A0A0A0; } @@ -154,7 +156,7 @@ pre pre.editor { margin: 0; margin-top: 10px; } -.aigis-preview + pre pre.editor { +.aigis-preview + pre { border-radius: 0 0 3px 3px; border-top: none; } diff --git a/examples/template_ejs/index.ejs b/examples/template_ejs/index.ejs index 5f71631..19c9223 100644 --- a/examples/template_ejs/index.ejs +++ b/examples/template_ejs/index.ejs @@ -3,7 +3,7 @@ - + From 66432648729c8f56c59d5a7b2842ec516d9a45d4 Mon Sep 17 00:00:00 2001 From: nakajmg Date: Thu, 9 Jun 2016 14:16:39 +0900 Subject: [PATCH 2/5] bump version aigis-makred --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index cb5a7cb..370caeb 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,7 @@ "url": "https://github.com/pxgrid/aigis/issues" }, "dependencies": { - "aigis-marked": "0.0.15", + "aigis-marked": "0.1.1", "bluebird": "^2.9.14", "colors": "^1.1.2", "ejs": "^2.4.1", From 67246af55149ec4a9c0874119643882f8f434101 Mon Sep 17 00:00:00 2001 From: nakajmg Date: Thu, 9 Jun 2016 14:23:19 +0900 Subject: [PATCH 3/5] bump minor version v1.1.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 370caeb..7817d63 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "node-aigis", - "version": "1.0.5", + "version": "1.1.0", "description": "For documenting CSS and generating styleguide", "homepage": "https://pxgrid.github.io/aigis", "author": { From 0484c59f2bb2c2a3d4e79d79c06525e953f538f7 Mon Sep 17 00:00:00 2001 From: nakajmg Date: Thu, 9 Jun 2016 14:24:54 +0900 Subject: [PATCH 4/5] update template --- examples/template_hbs/index.hbs | 2 +- examples/template_jade/index.jade | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/template_hbs/index.hbs b/examples/template_hbs/index.hbs index ac9d4d4..836a432 100644 --- a/examples/template_hbs/index.hbs +++ b/examples/template_hbs/index.hbs @@ -3,7 +3,7 @@ - + diff --git a/examples/template_jade/index.jade b/examples/template_jade/index.jade index 9faf07a..cca4c89 100644 --- a/examples/template_jade/index.jade +++ b/examples/template_jade/index.jade @@ -3,7 +3,7 @@ html head meta(charset='utf-8') meta(name='viewport', content='width=device-width') - link(href=root + 'aigis_assets/css/highlight/monokai.css', rel='stylesheet') + link(href=root + 'aigis_assets/css/highlight/okadia.css', rel='stylesheet') link(href=root + 'aigis_assets/css/theme.css', rel='stylesheet') link(href=root + 'css/style.css', rel='stylesheet') body From 2fe429b717ade366c85272845ccd968f51f61751 Mon Sep 17 00:00:00 2001 From: nakajmg Date: Thu, 9 Jun 2016 15:02:03 +0900 Subject: [PATCH 5/5] update theme style --- examples/aigis_assets/css/theme.css | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/examples/aigis_assets/css/theme.css b/examples/aigis_assets/css/theme.css index fb59685..bcc12f0 100644 --- a/examples/aigis_assets/css/theme.css +++ b/examples/aigis_assets/css/theme.css @@ -143,7 +143,7 @@ tag: latest position: relative; padding: 0.5em; border-radius: 3px; - margin: 0 auto 1em; + margin: 0 auto 3em; overflow: scroll; border: 1px solid #A0A0A0; } @@ -158,7 +158,8 @@ tag: latest .aigis-preview + pre { border-radius: 0 0 3px 3px; - border-top: none; } + border-top: none; + margin-top: 0; } /* ---