diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..e69de29 diff --git a/CHANGELOG.mkd b/CHANGELOG.mkd index b04f42d..ec00a76 100644 --- a/CHANGELOG.mkd +++ b/CHANGELOG.mkd @@ -68,13 +68,14 @@ These changes may require you to change your configuration. * **VIM : IMPROVEMENT : New Toggle Background Plugin** Added new Toggle Background plugin. Will load automatically and show up as - a menu item in the `Window` menu in gui vim. Automatically maps to if - available (won't clobber that mapping if you're using it). Also available - as a command `:ToggleBG`. To manually map to something other than : + a menu item in the `Window` menu in gui vim. Automatically maps to + `` if available (won't clobber that mapping if you're using it). + Also available as a command `:ToggleBG`. To manually map to + something other than ``: To set your own mapping in your .vimrc file, simply add the following line - to support normal, insert and visual mode usage, changing the "" value - to the key or key combination you wish to use: + to support normal, insert and visual mode usage, changing the + "``" value to the key or key combination you wish to use: call togglebg#map("") @@ -86,13 +87,13 @@ These changes may require you to change your configuration. displayed using ":set list" can be set to one of three levels depending on your needs. - g:solarized_visibility = "normal"| "high" or "low" + let g:solarized_visibility = "normal"| "high" or "low" I'll be honest: I still prefer low visibility. I like them barely there. They show up in lines that are highlighted as by the cursor line, which works for me. If you are with me on this, put the following in your .vimrc: - g:solarized_visibility = "low" + let g:solarized_visibility = "low" ### Non Critical Changes diff --git a/README.md b/README.md index 5272f98..d18ee94 100644 --- a/README.md +++ b/README.md @@ -14,31 +14,31 @@ Solarized ## Precision colors for machines and people -[![solarized dualmode](https://github.com/altercation/solarized/raw/master/img/solarized-yinyang.png)](#features)\ +[![solarized dualmode](https://github.com/altercation/solarized/raw/master/img/solarized-yinyang.png)](#features) - -Solarized is a sixteen color palette (eight monotones, eight accent colors) -designed for use with terminal and gui applications. It has several [unique -properties](#features). I designed this colorscheme with both precise -[CIELAB](http://en.wikipedia.org/wiki/Lab_color_space) lightness relationships -and a refined set of hues based on fixed color wheel relationships. It has been -tested extensively in real world use on color calibrated displays (as well as -uncalibrated/intentionally miscalibrated displays) and in a variety of lighting +Solarized is a sixteen color palette (eight monotones, eight accent colors) +designed for use with terminal and gui applications. It has several [unique +properties](#features). I designed this colorscheme with both precise +[CIELAB](http://en.wikipedia.org/wiki/Lab_color_space) lightness relationships +and a refined set of hues based on fixed color wheel relationships. It has been +tested extensively in real world use on color calibrated displays (as well as +uncalibrated/intentionally miscalibrated displays) and in a variety of lighting conditions. ***See the [changelog] for what's new in the most recent release.*** -![solarized palette](https://github.com/altercation/solarized/raw/master/img/solarized-palette.png)\ -![solarized vim](https://github.com/altercation/solarized/raw/master/img/solarized-vim.png)\ +![solarized palette](https://github.com/altercation/solarized/raw/master/img/solarized-palette.png) + +![solarized vim](https://github.com/altercation/solarized/raw/master/img/solarized-vim.png) Currently available in formats for (cf [screenshots](#screenshots) below): ### Editors & IDEs -* **Vim** by [me] (the Vim-only portion of Solarized is - [available here][Vim Repository], for use with Pathogen, etc.). - See also the [Vim README]. -* **Emacs** courtesy of [Greg Pfeil](http://blog.technomadic.org) +* **Vim** by [me](https://github.com/altercation) (the Vim-only portion of Solarized is + [available here](https://github.com/altercation/vim-colors-solarized), for use with + Pathogen, etc.). See also the [Vim README](http://ethanschoonover.com/solarized/vim-colors-solarized). +* **Emacs** courtesy of [Greg Pfeil](http://blog.technomadic.org) ([@sellout](http://twitter.com/sellout)) in the main repo and in a [standalone repository][Emacs Repository] * **IntelliJ IDEA** @@ -48,24 +48,24 @@ Currently available in formats for (cf [screenshots](#screenshots) below): * **NetBeans** courtesy of [Brian Fenton](https://github.com/fentie) and in the main repo and in a [standalone repository][NetBeans Repository] * **SeeStyle theme for Coda & SubEthaEdit** courtesy of - [Justin Hileman](http://justinhileman.com/) + [Justin Hileman](http://justinhileman.com/) ([@bobthecow](http://twitter.com/bobthecow)), in the main repo and in a [standalone repository][SeeStyle-Coda-SubEthaEdit Repository] * **TextMate** --- ***NOTE:*** Dark Theme is work in progress\ - courtesy of [Tom Martin](http://thedeplorableword.net/) + courtesy of [Tom Martin](http://thedeplorableword.net/) ([@deplorableword](http://twitter.com/deplorableword)) in the main repo and in a [standalone repository][TextMate Repository] - (with key work from [Mark Story](http://mark-story.com) + (with key work from [Mark Story](http://mark-story.com) and [Brian Mathiyakom](http://brian.rarevisions.net)) * **TextWrangler & BBEdit** courtesy of [Rui Carmo](http://the.taoofmac.com) ([@taoofmac](http://twitter.com/taoofmac)) in the main repo and in a [standalone repository][TextWrangler-BBEdit Repository] -* **Visual Studio** courtesy of [David Thibault](http://www.leddt.com) +* **Visual Studio** courtesy of [David Thibault](http://www.leddt.com) ([@leddt](http://twitter.com/leddt)) in the main repo and in a [standalone repository][Visual Studio Repository] -* **Xcode** work in progress ports are available for [Xcode 3] and [Xcode 4] +* **Xcode** work in progress ports are available for [Xcode 3] and [Xcode 4] and will be pulled into the main Solarized project soon. ### Terminal Emulators @@ -75,6 +75,8 @@ Currently available in formats for (cf [screenshots](#screenshots) below): * **OS X Terminal.app** * **Putty** courtesy [Brant Bobby](http://www.control-v.net) and on [GitHub](https://github.com/brantb) +* **Xfce terminal** courtesy [Sasha Gerrand](http://sgerrand.com) + and on [GitHub](https://github.com/sgerrand) ### Other Applications @@ -87,10 +89,10 @@ Currently available in formats for (cf [screenshots](#screenshots) below): * **Apple Color Picker** Palettes * **GIMP** Palette -Don't see the application you want to use it in? Download the palettes (or pull -the values from the table below) and create your own. Submit it back and I'll -happily note the contribution and include it on this page. See also the -[Usage & Development](#usage-development) section below for details on the +Don't see the application you want to use it in? Download the palettes (or pull +the values from the table below) and create your own. Submit it back and I'll +happily note the contribution and include it on this page. See also the +[Usage & Development](#usage-development) section below for details on the specific values to be used in different contexts. Download @@ -98,12 +100,12 @@ Download ### [Click here to download latest version](http://ethanschoonover.com/solarized/files/solarized.zip) -Current release is **v1.0.0beta2**. See the [changelog] for details on what's +Current release is **v1.0.0beta2**. See the [changelog] for details on what's new in this release. ### Fresh Code on GitHub -You can also use the following links to access application specific downloads +You can also use the following links to access application specific downloads and git repositories: * **Canonical Project Page:** @@ -120,7 +122,7 @@ and git repositories: * **Application Specific Repositories:** - You can clone repositories specific to many of the application specific + You can clone repositories specific to many of the application specific color themes. See links in the list above or select from this list: * [Vim Repository] @@ -144,57 +146,57 @@ Features 1. **Selective contrast** - On a sunny summer day I love to read a book outside. Not right in the sun; - that's too bright. I'll hunt for a shady spot under a tree. The shaded - paper contrasts with the crisp text nicely. If you were to actually measure - the contrast between the two, you'd find it is much lower than black text + On a sunny summer day I love to read a book outside. Not right in the sun; + that's too bright. I'll hunt for a shady spot under a tree. The shaded + paper contrasts with the crisp text nicely. If you were to actually measure + the contrast between the two, you'd find it is much lower than black text on a white background (or white on black) on your display device of choice. - Black text on white from a computer display is akin to reading a book in + Black text on white from a computer display is akin to reading a book in direct sunlight and tires the eye. - ![solarized selective contrast](https://github.com/altercation/solarized/raw/master/img/solarized-selcon.png)\ + ![solarized selective contrast](https://github.com/altercation/solarized/raw/master/img/solarized-selcon.png) - Solarized reduces *brightness contrast* but, unlike many low contrast - colorschemes, retains *contrasting hues* (based on colorwheel relations) + Solarized reduces *brightness contrast* but, unlike many low contrast + colorschemes, retains *contrasting hues* (based on colorwheel relations) for syntax highlighting readability. 2. **Both sides of the force** - ![solarized dualmode](https://github.com/altercation/solarized/raw/master/img/solarized-dualmode.png)\ + ![solarized dualmode](https://github.com/altercation/solarized/raw/master/img/solarized-dualmode.png) I often switch between dark and light modes when editing text and code. - Solarized retains the same selective contrast relationships and overall - feel when switching between the light and dark background modes. A *lot* of - thought, planning and testing has gone into making both modes feel like + Solarized retains the same selective contrast relationships and overall + feel when switching between the light and dark background modes. A *lot* of + thought, planning and testing has gone into making both modes feel like part of a unified colorscheme. 3. **16/5 palette modes** - ![solarized palettes](https://github.com/altercation/solarized/raw/master/img/solarized-165.png)\ + ![solarized palettes](https://github.com/altercation/solarized/raw/master/img/solarized-165.png) Solarized works as a sixteen color palette for compatibility with common - terminal based applications / emulators. In addition, it has been carefully - designed to scale down to a variety of five color palettes (four base + terminal based applications / emulators. In addition, it has been carefully + designed to scale down to a variety of five color palettes (four base monotones plus one accent color) for use in design work such as web design. In every case it retains a strong personality but doesn't overwhelm. 5. **Precision, symmetry** - ![solarized symmetry](https://github.com/altercation/solarized/raw/master/img/solarized-sym.png)\ + ![solarized symmetry](https://github.com/altercation/solarized/raw/master/img/solarized-sym.png) - The monotones have symmetric CIELAB lightness differences, so switching - from dark to light mode retains the same perceived contrast in brightness - between each value. Each mode is equally readable. The accent colors are - based off specific colorwheel relations and subsequently translated to - CIELAB to ensure perceptual uniformity in terms of lightness. The hues - themselves, as with the monotone \*a\*b values, have been adjusted within + The monotones have symmetric CIELAB lightness differences, so switching + from dark to light mode retains the same perceived contrast in brightness + between each value. Each mode is equally readable. The accent colors are + based off specific colorwheel relations and subsequently translated to + CIELAB to ensure perceptual uniformity in terms of lightness. The hues + themselves, as with the monotone \*a\*b values, have been adjusted within a small range to achieve the most pleasing combination of colors. - See also the [Usage & Development](#usage-development) section below for + See also the [Usage & Development](#usage-development) section below for details on the specific values to be used in different contexts. - This makes colorscheme inversion trivial. Here, for instance, is a sass - (scss) snippet that inverts solarized based on the class of the html tag + This makes colorscheme inversion trivial. Here, for instance, is a sass + (scss) snippet that inverts solarized based on the class of the html tag (e.g. `` to give a dark background with red accent): $base03: #002b36; @@ -213,7 +215,7 @@ Features $blue: #268bd2; $cyan: #2aa198; $green: #859900; - @mixin rebase($rebase03,$rebase02,$rebase01,$rebase00,$rebase0,$rebase1,$rebase2,$rebase3) + @mixin rebase($rebase03,$rebase02,$rebase01,$rebase00,$rebase0,$rebase1,$rebase2,$rebase3) { background-color:$rebase03; color:$rebase0; @@ -238,15 +240,15 @@ Features Installation ------------ -Installation instructions for each version of the colorscheme are included in -the subdirectory README files. Note that for Vim (and possibly for Mutt) you -may want to clone the specific repository (for instance if you are using +Installation instructions for each version of the colorscheme are included in +the subdirectory README files. Note that for Vim (and possibly for Mutt) you +may want to clone the specific repository (for instance if you are using Pathogen). See the links at the top of this file. Font Samples ------------ -Solarized has been designed to handle fonts of various weights and retain +Solarized has been designed to handle fonts of various weights and retain readability, from the classic Terminus to the beefy Menlo. ![font samples - light](https://github.com/altercation/solarized/raw/master/img/solarized-fontsamples-light.png) @@ -254,7 +256,7 @@ readability, from the classic Terminus to the beefy Menlo. Clockwise from upper left: Menlo, Letter Gothic, Terminus, Andale Mono. -Preview all code samples in specific font faces by selecting a link from this +Preview all code samples in specific font faces by selecting a link from this list: * [DejaVu Sans 18](http://ethanschoonover.com/solarized/img/dejavusans18/) @@ -344,7 +346,7 @@ These screen shots show Vim running with my own [Pandoc Kit Syntax](http://ethan The Values ---------- -L\*a\*b values are canonical (White D65, Reference D50), other values are +L\*a\*b values are canonical (White D65, Reference D50), other values are matched in sRGB space. SOLARIZED HEX 16/8 TERMCOL XTERM/HEX L*A*B RGB HSB @@ -369,28 +371,28 @@ matched in sRGB space. Usage & Development ------------------- -If you are considering developing a port for Solarized, please see also the -[developer notes](http://ethanschoonover.com/solarized/DEVELOPERS) for +If you are considering developing a port for Solarized, please see also the +[developer notes](http://ethanschoonover.com/solarized/DEVELOPERS) for information about optional repository structure and readme formats. -Solarized flips between light and dark modes. In each mode, four monotones form +Solarized flips between light and dark modes. In each mode, four monotones form the core values (with an optional fifth for emphasized content). -![value samples - dark](https://github.com/altercation/solarized/raw/master/img/solarized-values-dark.png)\ +![value samples - dark](https://github.com/altercation/solarized/raw/master/img/solarized-values-dark.png) -![value samples - light](https://github.com/altercation/solarized/raw/master/img/solarized-values-light.png)\ +![value samples - light](https://github.com/altercation/solarized/raw/master/img/solarized-values-light.png) -Thus in the case of a dark background colorscheme, the normal relationship for -background and body text is `base03:base0` (please note that body text is -**not** `base00`). Note also that in cases where the background and foreground -can be specified as a pair value, text can be highlighted using a combination -of `base02:base1`. The L\*a\*b lightness difference between `base03:base0` and -`base02:base1` is identical by design, resulting in identical readability -against both normal and highlighted backgrounds. An example use case is folded -text in Vim which uses `base02` for the background and `base1` for the +Thus in the case of a dark background colorscheme, the normal relationship for +background and body text is `base03:base0` (please note that body text is +**not** `base00`). Note also that in cases where the background and foreground +can be specified as a pair value, text can be highlighted using a combination +of `base02:base1`. The L\*a\*b lightness difference between `base03:base0` and +`base02:base1` is identical by design, resulting in identical readability +against both normal and highlighted backgrounds. An example use case is folded +text in Vim which uses `base02` for the background and `base1` for the foreground. -The values in this example are simply inverted in the case of a light +The values in this example are simply inverted in the case of a light background. diff --git a/gedit/README.md b/gedit/README.md new file mode 100644 index 0000000..abbb133 --- /dev/null +++ b/gedit/README.md @@ -0,0 +1,67 @@ +# Solarized for Gedit + +## Precision colors for machines and people - _Now with more Gedit!_ + +--- + +### Solarized + +Solarized was created by [Ethan Schoonover][ES] and you can find out more +about the design work that went into it on his [project page][ES-solarized]. If +you would like to use Solarized in editors other than Gedit or on your terminal, +Ethan hosts the [main repository][SolarizedRepo] which combines all the available +ports in one place. + +### Solarized for Gedit + +Solarized was initially ported for Gedit by [Matthew Cantelon][MC] and can be +found at . + +### Screenshots + +![Light theme][LightImg] +![Dark theme][DarkImg] + +### 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` +* using the **Download** button to get the ZIP file and extracting the files to + a folder + +Once the files are on your PC, copy `solarized-light.xml` and `solarized-dark.xml` +to one of these folders: + +* if you are the only user on your computer + +``` +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_ ) + +``` +sudo mkdir -p /usr/share/gtksourceview-3.0/styles +sudo cp solarized-* /usr/share/gtksourceview-3.0/styles +``` + +* you can also use the installer ( _has only been tested with Ubuntu 12.10_ ) + +``` +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 +[SolarizedRepo]: https://github.com/altercation/solarized +[MC]: http://matthewcantelon.ca +[LightImg]: https://github.com/mattcan/solarized-gedit/raw/master/img/solarized_light.png +[DarkImg]: https://github.com/mattcan/solarized-gedit/raw/master/img/solarized_dark.png diff --git a/gedit/img/solarized_dark.png b/gedit/img/solarized_dark.png new file mode 100644 index 0000000..0f79cff Binary files /dev/null and b/gedit/img/solarized_dark.png differ diff --git a/gedit/img/solarized_light.png b/gedit/img/solarized_light.png new file mode 100644 index 0000000..9f495f9 Binary files /dev/null and b/gedit/img/solarized_light.png differ diff --git a/gedit/installer b/gedit/installer new file mode 100755 index 0000000..f91c345 --- /dev/null +++ b/gedit/installer @@ -0,0 +1,62 @@ +#!/bin/bash + +# shows usage instructions +usage() +{ +cat << EOF +usage: $0 [options] + +This script installs the Solarized styles for gedit. + +OPTIONS: + -h Shows this message + -a Install for all users + -l Install only for you +EOF +} + +chkdir() +{ +if [ ! -d "$INSTALLPATH" ]; then + if [ "$NEEDSUDO" == true ]; then + sudo mkdir -p "$INSTALLPATH" + else + mkdir -p "$INSTALLPATH" + fi +fi +} + +# path to install to +INSTALLPATH=$HOME/.local/share/gedit/styles +# will need to use sudo to install for all users +NEEDSUDO=false + +# loop through passed arguments +while getopts "hal" OPTION +do + case $OPTION in + h) + usage + exit 1 + ;; + a) + INSTALLPATH=/usr/share/gtksourceview-3.0/styles + NEEDSUDO=true + ;; + l) + INSTALLPATH=$HOME/.local/share/gedit/styles + ;; + ?) + INSTALLPATH=$HOME/.local/share/gedit/styles + ;; + esac +done + +# install for all users when sudo set to true +if [ "$NEEDSUDO" == true ]; then + chkdir + sudo cp solarized-*.xml "$INSTALLPATH" +else + chkdir + cp solarized-*.xml "$INSTALLPATH" +fi diff --git a/gedit/solarized-dark.xml b/gedit/solarized-dark.xml new file mode 100644 index 0000000..0ab5d96 --- /dev/null +++ b/gedit/solarized-dark.xml @@ -0,0 +1,131 @@ + + + + + + Matthew Cantelon + <_description>Gedit port of the dark version of the Solarized theme. Check https://github.com/mattcan/solarized-gedit for more information. + + + + + + + + + + + + + + + + + + + + +