diff options
author | Trevor Bramble <inbox@trevorbramble.com> | 2013-06-26 23:31:14 -0700 |
---|---|---|
committer | Trevor Bramble <inbox@trevorbramble.com> | 2013-06-26 23:31:14 -0700 |
commit | 04583c932551d96c76962ebe7040ece53ce54737 (patch) | |
tree | 00c162004a5be3f908b187e78af0e4b73a577389 | |
parent | f9e5943a1de3c79f419135a9bc63af72dc1b0a3b (diff) | |
download | solarized-04583c932551d96c76962ebe7040ece53ce54737.tar.gz |
merge upstream gedit changes
-rw-r--r-- | gedit/README.md | 32 | ||||
-rwxr-xr-x[-rw-r--r--] | gedit/installer | 2 | ||||
-rw-r--r-- | gedit/solarized-dark.xml | 12 | ||||
-rw-r--r-- | gedit/solarized-light.xml | 2 |
4 files changed, 28 insertions, 20 deletions
diff --git a/gedit/README.md b/gedit/README.md index ea5c28c..abbb133 100644 --- a/gedit/README.md +++ b/gedit/README.md @@ -1,6 +1,6 @@ # Solarized for Gedit -## Precision colors for machines and people - **Now with more Gedit!** +## Precision colors for machines and people - _Now with more Gedit!_ --- @@ -24,6 +24,8 @@ found at <http://github.com/mattcan/solarized-gedit>. ### Installation +_Please note that installation has only been tested on Ubuntu 12.10 and Gedit 3_ + You can download the files in one of two ways: * using `git clone git://github.com/mattcan/solarized-gedit.git` @@ -35,21 +37,27 @@ to one of these folders: * if you are the only user on your computer - cp solarized-* ~/.local/share/gedit/styles +``` +mkdir -p ~/.local/share/gedit/styles +cp solarized-* ~/.local/share/gedit/styles +``` -* if you want everyone on your PC to be able to use the styles (_path - below is for Ubuntu_) +* if you want everyone on your PC to be able to use the styles ( _path + below is for Ubuntu_ ) - sudo cp solarized-* /usr/share/gtksourceview-3.0/styles - -You can also use the built installer (_has only been tested with Ubuntu 12.10_) - -### Roadmap +``` +sudo mkdir -p /usr/share/gtksourceview-3.0/styles +sudo cp solarized-* /usr/share/gtksourceview-3.0/styles +``` -There are a few things that still need to be worked out... +* you can also use the installer ( _has only been tested with Ubuntu 12.10_ ) -1. Clean up the **c:** specific style definitions -1. Add support for further custom style definitions +``` +cd wherever/you/extracted +chmod a+x installer +# -a for all users, -l for local +./installer [-a | -l] +``` [ES]: http://ethanschoonover.com [ES-Solarized]: http://ethanschoonover.com/solarized diff --git a/gedit/installer b/gedit/installer index 662b6ee..f91c345 100644..100755 --- a/gedit/installer +++ b/gedit/installer @@ -41,7 +41,7 @@ do ;; a) INSTALLPATH=/usr/share/gtksourceview-3.0/styles - NEEDSUDO=false + NEEDSUDO=true ;; l) INSTALLPATH=$HOME/.local/share/gedit/styles diff --git a/gedit/solarized-dark.xml b/gedit/solarized-dark.xml index 64737f3..0ab5d96 100644 --- a/gedit/solarized-dark.xml +++ b/gedit/solarized-dark.xml @@ -26,7 +26,7 @@ <style-scheme id="solarizeddark" _name="Solarized Dark" version="1.0"> <author>Matthew Cantelon</author> - <_description>Port of the Dark Solarized theme by Ethan Schoonover.</_description> + <_description>Gedit port of the dark version of the Solarized theme. Check https://github.com/mattcan/solarized-gedit for more information.</_description> <!-- Solarized Palette --> <color name="base03" value="#002b36"/> @@ -47,12 +47,12 @@ <color name="green" value="#859900"/> <!-- Global Settings --> - <style name="text" foreground="base0" background="base03"/> + <style name="text" foreground="base1" background="base03"/> <style name="selection" foreground="base03" background="base0"/> - <style name="cursor" foreground="base0"/> + <style name="cursor" foreground="base2"/> <style name="current-line" background="base02"/> - <style name="line-numbers" foreground="base1" background="base02"/> - <style name="draw-spaces" foreground="base1"/> + <style name="line-numbers" foreground="base0" background="base02"/> + <style name="draw-spaces" foreground="base0"/> <!-- Bracket Matching --> <style name="bracket-match" foreground="red" bold="true"/> @@ -64,7 +64,7 @@ <style name="def:doc-comment-element" italic="true"/> <!-- Right Margin --> - <style name="right-margin" foreground="base1" background="base02"/> + <style name="right-margin" foreground="base0" background="base02"/> <!-- Search Matching --> <style name="search-match" foreground="yellow"/> diff --git a/gedit/solarized-light.xml b/gedit/solarized-light.xml index abcb75b..5688264 100644 --- a/gedit/solarized-light.xml +++ b/gedit/solarized-light.xml @@ -26,7 +26,7 @@ <style-scheme id="solarizedlight" _name="Solarized Light" version="1.0"> <author>Matthew Cantelon</author> - <_description>Port of the Dark Solarized theme by Ethan Schoonover.</_description> + <_description>Gedit port of the light version of the Solarized theme. Check https://github.com/mattcan/solarized-gedit for more information.</_description> <!-- Solarized Palette --> <color name="base03" value="#002b36"/> |