Skip to content
Browse files

Merge branch 'master' of github.com:jrunning/github-solarized

  • Loading branch information...
2 parents 4c2df62 + d608e35 commit 941246a2988388ab4893cff9243e1c7857fe3c57 @jrunning committed Apr 20, 2011
Showing with 5 additions and 7 deletions.
  1. +5 −7 NOTES.md
View
12 NOTES.md
@@ -11,23 +11,23 @@ the few files I checked.
* `cm`: Multi-line comment (`/* ... */`)
* `cp`: Declaration e.g. `#include ...` or `<!DOCTYPE ...>`
-* Diffs
+* **Diffs**
* `gd`: Diff deletion
* `gd.x`: Diff inline deletion
* `gi`: Diff insertion
* `gi.x`: Diff inline insertion
-* Keywords
+* **Keywords**
* `k`: Keyword e.g. `this`, `else`, `do`, or CSS's `margin`, `bold`
* `kd`: Variable, function declaration
* `kt`: Type e.g. `int`, `void`
-* Literals
+* **Literals**
* `m`: Literal value e.g. `800px` in CSS
* `mi`: Integer value e.g. `55`, `8L`
* `mf`: Float value e.g. `1.5`
-* Identifiers/variable names
+* **Identifiers/variable names**
* `n`: Generic
* `na`: HTML attr name=
* `nb`: Declarations and special words, e.g. `document` in JavaScript, `require` in Ruby, `NULL` in C
@@ -44,13 +44,11 @@ the few files I checked.
* `p`: Brackets and grouping symbols, e.g. `{}`, `[]`, `()`, `,` in JavaScript, `/` in Haml (e.g. `%br/`)
* `px`: Property in JavaScript, e.g. "log" in `console.log`
-* Strings
+* **Strings**
* `s`: Quoted HTML attribute value
* `s1`: Single-quoted string
* `s2`: Double-quoted string
* `ss`: Ruby symbol (`:through`)
* `se`: `\` in Bash (line continuation)
* `si`: String interpolation
* `sr`: Regular expression
-
-

0 comments on commit 941246a

Please sign in to comment.
Something went wrong with that request. Please try again.