Permalink
Browse files

Merge remote-tracking branch 'upstream/master'

  • Loading branch information...
2 parents 471f9de + f017b38 commit 058dd1fc2f749b31e1072a70eef0002e6abe15fb @tobinibot committed Oct 22, 2011
Showing with 706 additions and 41 deletions.
  1. +20 −5 README.md
  2. +409 −29 Solarized Dark.xml
  3. +277 −7 Solarized Light.xml
  4. BIN settings.jar
View
@@ -52,7 +52,7 @@ for which the syntax highlighting has been adapted to the Solarized color scheme
</tr>
<tr>
<td>Groovy</td>
- <td align="center">No</td>
+ <td align="center"><b>Yes</b></td>
</tr>
<tr>
<td>Scala</td>
@@ -114,6 +114,14 @@ for which the syntax highlighting has been adapted to the Solarized color scheme
<td>File Status</td>
<td align="center">No</td>
</tr>
+ <tr>
+ <td>Google Go</td>
+ <td align="center"><b>Yes</b></td>
+ </tr>
+ <tr>
+ <td>Coffeescript</td>
+ <td align="center"><i>Only Solarized Dark</i></td>
+ </tr>
</table>
@@ -133,9 +141,16 @@ color themes.
### Option 2: Manual installation
1. Copy `Solarized Dark.xml` and `Solarized Light.xml` to your IntelliJ IDEA preferences
-color directory.
-On Mac OS X this is typically located in `~/Library/Preferences/IntelliJIdea10/colors` or `~/Library/Preferences/IntelliJIdea10CE/colors` (for the Community Edition).
-On Windows it is in `Documents and Settings/<user>/.IntelliJIdea10/config/colors`.
+ color directory. The directory varies, depending on which JetBrains IDE you are using. It
+ is typically in:
+
+ *Mac OS X*
+ * `~/Library/Preferences/IntelliJIdea10/colors` (IntelliJ IDEA)
+ * `~/Library/Preferences/IntelliJIdea10CE/colors` (IntelliJ IDEA Community Edition),
+ * `~/Library/Preferences/WebIDE10/colors` (WebIDE or PHPStorm).
+
+ *Windows*
+ * `Documents and Settings/<user>/.IntelliJIdea10/config/colors` (IntelliJ IDEA)
2. Restart IntelliJ IDEA
@@ -152,4 +167,4 @@ Note About Committing Changes
-----------------------------
If you want to commit updates to the XML color scheme files, make sure to run the `buildjar.sh` script before committing to generate
an updated `settings.jar` file as well.
-*The script has been tested on OS X, on other operating systems you're on your own.*
+*The script has been tested on OS X, on other operating systems you're on your own.*
Oops, something went wrong.

0 comments on commit 058dd1f

Please sign in to comment.