diff --git a/README.md b/README.md index 55052f8..ba39026 100644 --- a/README.md +++ b/README.md @@ -1,277 +1,36 @@ -Solarized -========= +Solarized Changelog +=================== -### [See official homepage for full content](http://ethanschoonover.com/solarized) - -## Precision colors for machines and people - -[![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 -conditions. - -![solarized palette](https://github.com/altercation/solarized/raw/master/img/solarized-palette.png)\ - -Currently available in formats for (cf [screenshots](#screenshots) below): - -* **Vim** (the Vim-only portion of Solarized is [available -here](https://github.com/altercation/vim-colors-solarized), for use with -Pathogen, etc.) -* **Mutt** e-mail client (*just* the Mutt colorscheme is [available -here](https://github.com/altercation/mutt-colors-solarized)) -* **Xresources** / Xdefaults -* **iTerm2** -* OS X **Terminal.app** -* Adobe Photoshop Palette (inc. L\*a\*b values) -* Apple Color Picker Palette -* 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. - -**Note:** I am still tweaking the Vim highlighting for specific syntaxes and -welcome feedback on these. - -Download --------- - -### [Click here to download latest version](http://ethanschoonover.com/files/solarized/solarized.tar.gz) - -Or use the following links to access application specific downloads and git -repositories: - -* **Git repo:** - - The full git repository is at: - Get it using the following command: - - $ git clone git://github.com/altercation/solarized.git - -* **Vim only:** - - The vim-only colorscheme (Pathogen ready) is available at: - . - - $ git clone git://github.com/altercation/vim-colors-solarized.git - - You can also download it from [vim.org](http://www.vim.org/scripts/script.php?script_id=3520). - -* **Mutt only:** - - The mutt-only variants can be cloned from - - - $ git clone git://github.com/altercation/mutt-colors-solarized.git - -* **Canonical Project Page:** - - Downloads, screenshots and more information are always available from the - project page: - -Note that through the magic of -[git-subtree](https://github.com/apenwarr/git-subtree) these repositories are -all kept in sync, so you can pull any of them and get the most up-to-date -version. - -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 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 - direct sunlight and tires the eye. - - ![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) - for syntax highlighting readability. - -2. **Both sides of the force** - - ![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 - part of a unified colorscheme. - -3. **16/5 palette modes** - - ![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 carefull - 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)\ - - 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. - - 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; - $base02: #073642; - $base01: #586e75; - $base00: #657b83; - $base0: #839496; - $base1: #93a1a1; - $base2: #eee8d5; - $base3: #fdf6e3; - $yellow: #b58900; - $orange: #cb4b16; - $red: #d30102; - $magenta: #d33682; - $violet: #6c71c4; - $blue: #268bd2; - $cyan: #2aa198; - $green: #859900; - @mixin rebase($rebase03,$rebase02,$rebase01,$rebase00,$rebase0,$rebase1,$rebase2,$rebase3) - { - background-color:$rebase03; - color:$rebase0; - * { color:$rebase0; } - h1,h2,h3,h4,h5,h6 { color:$rebase1; border-color: $rebase0; } - a, a:active, a:visited { color: $rebase1; } - } - @mixin accentize($accent) { - a, a:active, a:visited, code.url { color: $accent; } - h1,h2,h3,h4,h5,h6 {color:$accent} - } - /* light is default mode, so pair with general html definition */ - html, .light { @include rebase($base3,$base2,$base1,$base0,$base00,$base01,$base02,$base03)} - .dark { @include rebase($base03,$base02,$base01,$base00,$base0,$base1,$base2,$base3)} - html * { - color-profile: sRGB; - rendering-intent: auto; - } - -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 -Pathogen). See the links at the top of this file. - -Font Samples ------------- - -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) -![font samples - dark](https://github.com/altercation/solarized/raw/master/img/solarized-fontsamples-dark.png) - -Clockwise from upper left: Menlo, Letter Gothic, Terminus, Andale Mono - -Screenshots ------------ - -Click to view. - -### Mutt - -[![mutt dark](https://github.com/altercation/solarized/raw/master/img/solarized-screen-mutt-dark-th.png)](https://github.com/altercation/solarized/raw/master/img/solarized-screen-mutt-dark.png) -[![mutt light](https://github.com/altercation/solarized/raw/master/img/solarized-screen-mutt-light-th.png)](https://github.com/altercation/solarized/raw/master/img/solarized-screen-mutt-light.png) - -### C (Vim) - -[![c dark](https://github.com/altercation/solarized/raw/master/img/solarized-screen-c-dark-th.png)](https://github.com/altercation/solarized/raw/master/img/solarized-screen-c-dark.png) -[![c light](https://github.com/altercation/solarized/raw/master/img/solarized-screen-c-light-th.png)](https://github.com/altercation/solarized/raw/master/img/solarized-screen-c-light.png) - -### Haskell (Vim) - -[![haskell dark](https://github.com/altercation/solarized/raw/master/img/solarized-screen-haskell-dark-th.png)](https://github.com/altercation/solarized/raw/master/img/solarized-screen-haskell-dark.png) -[![haskell light](https://github.com/altercation/solarized/raw/master/img/solarized-screen-haskell-light-th.png)](https://github.com/altercation/solarized/raw/master/img/solarized-screen-haskell-light.png) - -### HTML (Vim) - -[![html dark](https://github.com/altercation/solarized/raw/master/img/solarized-screen-html-dark-th.png)](https://github.com/altercation/solarized/raw/master/img/solarized-screen-html-dark.png) -[![html light](https://github.com/altercation/solarized/raw/master/img/solarized-screen-html-light-th.png)](https://github.com/altercation/solarized/raw/master/img/solarized-screen-html-light.png) - -### Java (Vim) - -[![java dark](https://github.com/altercation/solarized/raw/master/img/solarized-screen-java-dark-th.png)](https://github.com/altercation/solarized/raw/master/img/solarized-screen-java-dark.png) -[![java light](https://github.com/altercation/solarized/raw/master/img/solarized-screen-java-light-th.png)](https://github.com/altercation/solarized/raw/master/img/solarized-screen-java-light.png) - -### Pandoc Markdown (Vim) - -These screen shots show Vim running with my own [Pandoc Kit -Syntax](/pandockit). - -[![pandoc dark](https://github.com/altercation/solarized/raw/master/img/solarized-screen-pandoc-dark-th.png)](https://github.com/altercation/solarized/raw/master/img/solarized-screen-pandoc-dark.png) -[![pandoc light](https://github.com/altercation/solarized/raw/master/img/solarized-screen-pandoc-light-th.png)](https://github.com/altercation/solarized/raw/master/img/solarized-screen-pandoc-light.png) - -### Perl (Vim) - -[![perl dark](https://github.com/altercation/solarized/raw/master/img/solarized-screen-perl-dark-th.png)](https://github.com/altercation/solarized/raw/master/img/solarized-screen-perl-dark.png) -[![perl light](https://github.com/altercation/solarized/raw/master/img/solarized-screen-perl-light-th.png)](https://github.com/altercation/solarized/raw/master/img/solarized-screen-perl-light.png) - -### Python (Vim) - -[![python dark](https://github.com/altercation/solarized/raw/master/img/solarized-screen-python-dark-th.png)](https://github.com/altercation/solarized/raw/master/img/solarized-screen-python-dark.png) -[![python light](https://github.com/altercation/solarized/raw/master/img/solarized-screen-python-light-th.png)](https://github.com/altercation/solarized/raw/master/img/solarized-screen-python-light.png) - -### Ruby (Vim) - -[![ruby dark](https://github.com/altercation/solarized/raw/master/img/solarized-screen-ruby-dark-th.png)](https://github.com/altercation/solarized/raw/master/img/solarized-screen-ruby-dark.png) -[![ruby light](https://github.com/altercation/solarized/raw/master/img/solarized-screen-ruby-light-th.png)](https://github.com/altercation/solarized/raw/master/img/solarized-screen-ruby-light.png) - -### TeX (Vim) - -[![tex dark](https://github.com/altercation/solarized/raw/master/img/solarized-screen-tex-dark-th.png)](https://github.com/altercation/solarized/raw/master/img/solarized-screen-tex-dark.png) -[![tex light](https://github.com/altercation/solarized/raw/master/img/solarized-screen-tex-light-th.png)](https://github.com/altercation/solarized/raw/master/img/solarized-screen-tex-light.png) - - -The Values +1.0.0beta2 ---------- -L\*a\*b values are canonical (White D65, Reference D50), other values are -matched in sRGB space. +Changes: + +* Modified red from L\*a\*b lightness value 45 to 50 to bring it in line with + the other accent colors and address bleed into dark background on some + displays, as well as reducing shift of red against base03 when viewed with + glasses. All instances of the colorscheme and palettes pdated to new red. + +* Changed default OS X color picker palatte swatches to tagged colors (sRGB) + and included alternate palette with untagged color swatches for advanced + users. + +* Removed default italicized font in terminal mode in the Solarized Vim + colorscheme (many terminal emulators display Vim italics as reversed type). + Italics still used in GUI mode by default and can still be turned off in both + modes by setting a variable: `let g:solarized_italic=0`. + +1.0.0beta1 +---------- + +First public release. Including: + +* Adobe Photoshop Swatches +* Apple Color Picker Palette +* Gimp Palette +* iTerm2 colorschemes +* Mutt mail client colorschemes +* OS X Terminal.app colors +* Vim Colorscheme +* Xresources colors - SOLARIZED HEX 16/8 TERMCOL XTERM/HEX L*A*B RGB HSB - --------- ------- ---- ------- ----------- ---------- ----------- ----------- - base03 #002b36 8/4 brblack 234 #1c1c1c 15 -12 -12 0 43 54 193 100 21 - base02 #073642 0/4 black 235 #262626 20 -12 -12 7 54 66 192 90 26 - base01 #586e75 10/7 brgreen 240 #585858 45 -07 -07 88 110 117 194 25 46 - base00 #657b83 11/7 bryellow 241 #626262 50 -07 -07 101 123 131 195 23 51 - base0 #839496 12/6 brblue 244 #808080 60 -06 -03 131 148 150 186 13 59 - base1 #93a1a1 14/4 brcyan 245 #8a8a8a 65 -05 -02 147 161 161 180 9 63 - base2 #eee8d5 7/7 white 254 #e4e4e4 92 -00 10 238 232 213 44 11 93 - base3 #fdf6e3 15/7 brwhite 230 #ffffd7 97 00 10 253 246 227 44 10 99 - yellow #b58900 3/3 yellow 136 #af8700 60 10 65 181 137 0 45 100 71 - orange #cb4b16 9/3 brred 166 #d75f00 50 50 55 203 75 22 18 89 80 - red #d30102 1/1 red 124 #af0000 45 70 60 211 1 2 0 99 83 - magenta #d33682 5/5 magenta 125 #af005f 50 65 -05 211 54 130 331 74 83 - violet #6c71c4 13/5 brmagenta 61 #5f5faf 50 15 -45 108 113 196 237 45 77 - blue #268bd2 4/4 blue 33 #0087ff 55 -10 -45 38 139 210 205 82 82 - cyan #2aa198 6/6 cyan 37 #00afaf 60 -35 -05 42 161 152 175 74 63 - green #859900 2/2 green 64 #5f8700 60 -20 65 133 153 0 68 100 60 - diff --git a/adobe-swatches-solarized/README.md b/adobe-swatches-solarized/README.md index 681ac56..1908589 100644 --- a/adobe-swatches-solarized/README.md +++ b/adobe-swatches-solarized/README.md @@ -14,19 +14,19 @@ The Values 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 + SOLARIZED HEX 16/8 TERMCOL XTERM/HEX L*A*B sRGB HSB --------- ------- ---- ------- ----------- ---------- ----------- ----------- base03 #002b36 8/4 brblack 234 #1c1c1c 15 -12 -12 0 43 54 193 100 21 base02 #073642 0/4 black 235 #262626 20 -12 -12 7 54 66 192 90 26 - base01 #586e75 10/7 brgreen 240 #585858 45 -07 -07 88 110 117 194 25 46 - base00 #657b83 11/7 bryellow 241 #626262 50 -07 -07 101 123 131 195 23 51 + base01 #586e75 10/7 brgreen 240 #4e4e4e 45 -07 -07 88 110 117 194 25 46 + base00 #657b83 11/7 bryellow 241 #585858 50 -07 -07 101 123 131 195 23 51 base0 #839496 12/6 brblue 244 #808080 60 -06 -03 131 148 150 186 13 59 base1 #93a1a1 14/4 brcyan 245 #8a8a8a 65 -05 -02 147 161 161 180 9 63 - base2 #eee8d5 7/7 white 254 #e4e4e4 92 -00 10 238 232 213 44 11 93 + base2 #eee8d5 7/7 white 254 #d7d7af 92 -00 10 238 232 213 44 11 93 base3 #fdf6e3 15/7 brwhite 230 #ffffd7 97 00 10 253 246 227 44 10 99 yellow #b58900 3/3 yellow 136 #af8700 60 10 65 181 137 0 45 100 71 orange #cb4b16 9/3 brred 166 #d75f00 50 50 55 203 75 22 18 89 80 - red #d30102 1/1 red 124 #af0000 45 70 60 211 1 2 0 99 83 + red #dc322f 1/1 red 160 #d70000 50 65 45 220 50 47 1 79 86 magenta #d33682 5/5 magenta 125 #af005f 50 65 -05 211 54 130 331 74 83 violet #6c71c4 13/5 brmagenta 61 #5f5faf 50 15 -45 108 113 196 237 45 77 blue #268bd2 4/4 blue 33 #0087ff 55 -10 -45 38 139 210 205 82 82 diff --git a/adobe-swatches-solarized/solarized.ase b/adobe-swatches-solarized/solarized.ase index 80979af..c903433 100644 Binary files a/adobe-swatches-solarized/solarized.ase and b/adobe-swatches-solarized/solarized.ase differ diff --git a/apple-colorpalette-solarized/README.md b/apple-colorpalette-solarized/README.md index 4b419c9..1e46117 100644 --- a/apple-colorpalette-solarized/README.md +++ b/apple-colorpalette-solarized/README.md @@ -13,25 +13,67 @@ Use the included colorpicker launcher to confirm installation. Launch the the third icon from the left) and select 'Solarized' from the drop-down palette list. Click the cancel button to dismiss the color picker. +Alternate Palette +------------------ + +NOT FOR USE UNLESS YOU UNDERSTAND THE HELL THAT IS COLOR MANAGEMENT. + +The `alternate palettes` directory contains two Apple Color Picker palettes. +The "tagged" palette is identical to the main Solarized.clr palette. The +untagged palette contains untagged sRGB values (Apple calls untagged values +"device colors"). Don't use this unless you are using an application that +otherwise can't handle tagged values. + +An example: If you are a web developer working on OS X and you wish to use one +of the Solarized hex values, you have a couple choices: + +1. Enter the code manually (easy, you should do this) +2. Use the color picker (possible, but do it the right way! See below...) + +A popular colorpicker plugin is the "Hex Color Picker" from +. If you wish to use this with the +colorpicker and a preset palette like Solarized, here's what you do: + +1. Instead of the plain old "solarized.clr" palette, use the "solarized-tagged" + and "solarized-untagged" palettes (solarized-tagged is the same as + solarized.clr, just renamed for clarity). + +2. In the Hex Color picker (inside the Apple Color Picker) click the options + button and ensure that "Don't generate calibrated colors" is **checked**. + Ideally, Hex Color Picker would be aware of a particular color being + untagged (a "device" color in Apple parlance) and hand it over to you in + unaltered form, even if it was otherwise pulling calibrated colors off your + display. + +3. If you desire a Solarized color **for web use** (not for use in an + application that uses Mac color swatches) then you switch to the + Solarized-untagged palette in Color Picker, choose a color, switch to the + Hex Color Picker tab and grab the correct color. Double check against the + chart below to confirm it's working as expected. + +This is just one of many examples of how, even with applications/plugins that +deal exclusively with color, there are unexpected or unintuitive exceptions to +take into account. + The Values ---------- 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 + SOLARIZED HEX 16/8 TERMCOL XTERM/HEX L*A*B sRGB HSB --------- ------- ---- ------- ----------- ---------- ----------- ----------- base03 #002b36 8/4 brblack 234 #1c1c1c 15 -12 -12 0 43 54 193 100 21 base02 #073642 0/4 black 235 #262626 20 -12 -12 7 54 66 192 90 26 - base01 #586e75 10/7 brgreen 240 #585858 45 -07 -07 88 110 117 194 25 46 - base00 #657b83 11/7 bryellow 241 #626262 50 -07 -07 101 123 131 195 23 51 + base01 #586e75 10/7 brgreen 240 #4e4e4e 45 -07 -07 88 110 117 194 25 46 + base00 #657b83 11/7 bryellow 241 #585858 50 -07 -07 101 123 131 195 23 51 base0 #839496 12/6 brblue 244 #808080 60 -06 -03 131 148 150 186 13 59 base1 #93a1a1 14/4 brcyan 245 #8a8a8a 65 -05 -02 147 161 161 180 9 63 - base2 #eee8d5 7/7 white 254 #e4e4e4 92 -00 10 238 232 213 44 11 93 + base2 #eee8d5 7/7 white 254 #d7d7af 92 -00 10 238 232 213 44 11 93 base3 #fdf6e3 15/7 brwhite 230 #ffffd7 97 00 10 253 246 227 44 10 99 yellow #b58900 3/3 yellow 136 #af8700 60 10 65 181 137 0 45 100 71 orange #cb4b16 9/3 brred 166 #d75f00 50 50 55 203 75 22 18 89 80 - red #d30102 1/1 red 124 #af0000 45 70 60 211 1 2 0 99 83 + red #dc322f 1/1 red 160 #d70000 50 65 45 220 50 47 1 79 86 magenta #d33682 5/5 magenta 125 #af005f 50 65 -05 211 54 130 331 74 83 violet #6c71c4 13/5 brmagenta 61 #5f5faf 50 15 -45 108 113 196 237 45 77 blue #268bd2 4/4 blue 33 #0087ff 55 -10 -45 38 139 210 205 82 82 diff --git a/apple-colorpalette-solarized/alternate palettes/README.md b/apple-colorpalette-solarized/alternate palettes/README.md new file mode 100644 index 0000000..618d0e1 --- /dev/null +++ b/apple-colorpalette-solarized/alternate palettes/README.md @@ -0,0 +1,66 @@ +Alternate Palette +------------------ + +NOT FOR USE UNLESS YOU UNDERSTAND THE HELL THAT IS COLOR MANAGEMENT. + +The `alternate palettes` directory contains two Apple Color Picker palettes. +The "tagged" palette is identical to the main Solarized.clr palette. The +untagged palette contains untagged sRGB values (Apple calls untagged values +"device colors"). Don't use this unless you are using an application that +otherwise can't handle tagged values. + +An example: If you are a web developer working on OS X and you wish to use one +of the Solarized hex values, you have a couple choices: + +1. Enter the code manually (easy, you should do this) +2. Use the color picker (possible, but do it the right way! See below...) + +A popular colorpicker plugin is the "Hex Color Picker" from +. If you wish to use this with the +colorpicker and a preset palette like Solarized, here's what you do: + +1. Instead of the plain old "solarized.clr" palette, use the "solarized-tagged" + and "solarized-untagged" palettes (solarized-tagged is the same as + solarized.clr, just renamed for clarity). + +2. In the Hex Color picker (inside the Apple Color Picker) click the options + button and ensure that "Don't generate calibrated colors" is **checked**. + Ideally, Hex Color Picker would be aware of a particular color being + untagged (a "device" color in Apple parlance) and hand it over to you in + unaltered form, even if it was otherwise pulling calibrated colors off your + display. + +3. If you desire a Solarized color **for web use** (not for use in an + application that uses Mac color swatches) then you switch to the + Solarized-untagged palette in Color Picker, choose a color, switch to the + Hex Color Picker tab and grab the correct color. Double check against the + chart below to confirm it's working as expected. + +This is just one of many examples of how, even with applications/plugins that +deal exclusively with color, there are unexpected or unintuitive exceptions to +take into account. + +The Values +---------- + +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 sRGB HSB + --------- ------- ---- ------- ----------- ---------- ----------- ----------- + base03 #002b36 8/4 brblack 234 #1c1c1c 15 -12 -12 0 43 54 193 100 21 + base02 #073642 0/4 black 235 #262626 20 -12 -12 7 54 66 192 90 26 + base01 #586e75 10/7 brgreen 240 #4e4e4e 45 -07 -07 88 110 117 194 25 46 + base00 #657b83 11/7 bryellow 241 #585858 50 -07 -07 101 123 131 195 23 51 + base0 #839496 12/6 brblue 244 #808080 60 -06 -03 131 148 150 186 13 59 + base1 #93a1a1 14/4 brcyan 245 #8a8a8a 65 -05 -02 147 161 161 180 9 63 + base2 #eee8d5 7/7 white 254 #d7d7af 92 -00 10 238 232 213 44 11 93 + base3 #fdf6e3 15/7 brwhite 230 #ffffd7 97 00 10 253 246 227 44 10 99 + yellow #b58900 3/3 yellow 136 #af8700 60 10 65 181 137 0 45 100 71 + orange #cb4b16 9/3 brred 166 #d75f00 50 50 55 203 75 22 18 89 80 + red #dc322f 1/1 red 160 #d70000 50 65 45 220 50 47 1 79 86 + magenta #d33682 5/5 magenta 125 #af005f 50 65 -05 211 54 130 331 74 83 + violet #6c71c4 13/5 brmagenta 61 #5f5faf 50 15 -45 108 113 196 237 45 77 + blue #268bd2 4/4 blue 33 #0087ff 55 -10 -45 38 139 210 205 82 82 + cyan #2aa198 6/6 cyan 37 #00afaf 60 -35 -05 42 161 152 175 74 63 + green #859900 2/2 green 64 #5f8700 60 -20 65 133 153 0 68 100 60 diff --git a/apple-colorpalette-solarized/alternate palettes/Solarized tagged.clr b/apple-colorpalette-solarized/alternate palettes/Solarized tagged.clr new file mode 100644 index 0000000..45d015c Binary files /dev/null and b/apple-colorpalette-solarized/alternate palettes/Solarized tagged.clr differ diff --git a/apple-colorpalette-solarized/alternate palettes/Solarized untagged.clr b/apple-colorpalette-solarized/alternate palettes/Solarized untagged.clr new file mode 100644 index 0000000..6b4051c Binary files /dev/null and b/apple-colorpalette-solarized/alternate palettes/Solarized untagged.clr differ diff --git a/apple-colorpalette-solarized/solarized.clr b/apple-colorpalette-solarized/solarized.clr index 824c623..d5b03be 100644 Binary files a/apple-colorpalette-solarized/solarized.clr and b/apple-colorpalette-solarized/solarized.clr differ diff --git a/gimp-palette-solarized/README.md b/gimp-palette-solarized/README.md index 7b03648..28e91bd 100644 --- a/gimp-palette-solarized/README.md +++ b/gimp-palette-solarized/README.md @@ -3,25 +3,32 @@ Solarized - Gimp Palette ### [See official homepage for full content](http://ethanschoonover.com/solarized) +Note that GIMP doesn't tag its color palettes in a colorspace, which is much +like me giving you a temperature by which to set your thermostat and forgetting +to tell you if it is Celsius or Fahrenheit. Really, how different could 40 +degrees be between two systems, right? + +These are, for what it's worth, sRGB values. + The Values ---------- 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 + SOLARIZED HEX 16/8 TERMCOL XTERM/HEX L*A*B sRGB HSB --------- ------- ---- ------- ----------- ---------- ----------- ----------- base03 #002b36 8/4 brblack 234 #1c1c1c 15 -12 -12 0 43 54 193 100 21 base02 #073642 0/4 black 235 #262626 20 -12 -12 7 54 66 192 90 26 - base01 #586e75 10/7 brgreen 240 #585858 45 -07 -07 88 110 117 194 25 46 - base00 #657b83 11/7 bryellow 241 #626262 50 -07 -07 101 123 131 195 23 51 + base01 #586e75 10/7 brgreen 240 #4e4e4e 45 -07 -07 88 110 117 194 25 46 + base00 #657b83 11/7 bryellow 241 #585858 50 -07 -07 101 123 131 195 23 51 base0 #839496 12/6 brblue 244 #808080 60 -06 -03 131 148 150 186 13 59 base1 #93a1a1 14/4 brcyan 245 #8a8a8a 65 -05 -02 147 161 161 180 9 63 - base2 #eee8d5 7/7 white 254 #e4e4e4 92 -00 10 238 232 213 44 11 93 + base2 #eee8d5 7/7 white 254 #d7d7af 92 -00 10 238 232 213 44 11 93 base3 #fdf6e3 15/7 brwhite 230 #ffffd7 97 00 10 253 246 227 44 10 99 yellow #b58900 3/3 yellow 136 #af8700 60 10 65 181 137 0 45 100 71 orange #cb4b16 9/3 brred 166 #d75f00 50 50 55 203 75 22 18 89 80 - red #d30102 1/1 red 124 #af0000 45 70 60 211 1 2 0 99 83 + red #dc322f 1/1 red 160 #d70000 50 65 45 220 50 47 1 79 86 magenta #d33682 5/5 magenta 125 #af005f 50 65 -05 211 54 130 331 74 83 violet #6c71c4 13/5 brmagenta 61 #5f5faf 50 15 -45 108 113 196 237 45 77 blue #268bd2 4/4 blue 33 #0087ff 55 -10 -45 38 139 210 205 82 82 diff --git a/gimp-palette-solarized/solarized.gpl b/gimp-palette-solarized/solarized.gpl index c6264ee..40b86e5 100644 --- a/gimp-palette-solarized/solarized.gpl +++ b/gimp-palette-solarized/solarized.gpl @@ -12,7 +12,7 @@ Columns: 16 253 246 227 solarized-base3 181 137 0 solarized-yellow 203 75 22 solarized-orange -211 1 2 solarized-red +220 50 47 solarized-red 211 54 130 solarized-magenta 108 113 196 solarized-violet 38 139 210 solarized-blue diff --git a/iterm2-colors-solarized/README.md b/iterm2-colors-solarized/README.md index b50e463..fb3010b 100644 --- a/iterm2-colors-solarized/README.md +++ b/iterm2-colors-solarized/README.md @@ -22,11 +22,20 @@ applied them. To apply them, simply select an existing profile from the profile list window on the left, or create a new profile. Then select the Solarized Dark or Solarized Light preset from the "Load Presets" drop down. -Please note that my experience with iTerm2 color management has been insane. It -doesn't come close to getting color management right at all. I did extensive -testing of various tagged colors for use with iTerm 2, but unfortunately it -bakes in the color management at the time of preset creation. The current -presets should be acceptable in most cases. +Ok, I've gone crazy with iTerm2 color management but you are going to be ok. +Just realize two things: + +1. Like other apps (Chrome as of this writing) on the Mac, iTerm2 locks in + a target color space when you create a new window. If you switch your + monitor color space, relaunch iTerm2 and it will pick up the new target + color space. + +2. The colors in iTerm2 currently cannot be device colors. They are baked in as + generic rgb (which, despite the name, is an actual, specific color space + from Apple and is used as a default just like other systems use sRGB as + a default). I've switch Solarized Apple Color Picker palettes to use tagged + colors by default, so for the most part iTerm2 will match up with other apps + where you use Color Picker swatches. The Values ---------- diff --git a/iterm2-colors-solarized/Solarized Dark.itermcolors b/iterm2-colors-solarized/Solarized Dark.itermcolors index 1fefb3c..ed31a4a 100644 --- a/iterm2-colors-solarized/Solarized Dark.itermcolors +++ b/iterm2-colors-solarized/Solarized Dark.itermcolors @@ -14,11 +14,11 @@ Ansi 1 Color Blue Component - 0.02895711176097393 + 0.14145714044570923 Green Component - 0.0 + 0.10840655118227005 Red Component - 0.77703577280044556 + 0.81926977634429932 Ansi 10 Color diff --git a/iterm2-colors-solarized/Solarized Light.itermcolors b/iterm2-colors-solarized/Solarized Light.itermcolors index 3a180b0..9918963 100644 --- a/iterm2-colors-solarized/Solarized Light.itermcolors +++ b/iterm2-colors-solarized/Solarized Light.itermcolors @@ -14,11 +14,11 @@ Ansi 1 Color Blue Component - 0.02895711176097393 + 0.14145712554454803 Green Component - 0.0 + 0.10840645432472229 Red Component - 0.77703577280044556 + 0.81926983594894409 Ansi 10 Color diff --git a/mutt-colors-solarized/README.md b/mutt-colors-solarized/README.md index c2ae64a..d1062ea 100644 --- a/mutt-colors-solarized/README.md +++ b/mutt-colors-solarized/README.md @@ -53,6 +53,31 @@ The 256 color versions provide an approximate experience of the colorscheme in most regards, though the carefully selected monotones are crudely replaced by neutral tones. +The Values +---------- + +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 sRGB HSB + --------- ------- ---- ------- ----------- ---------- ----------- ----------- + base03 #002b36 8/4 brblack 234 #1c1c1c 15 -12 -12 0 43 54 193 100 21 + base02 #073642 0/4 black 235 #262626 20 -12 -12 7 54 66 192 90 26 + base01 #586e75 10/7 brgreen 240 #4e4e4e 45 -07 -07 88 110 117 194 25 46 + base00 #657b83 11/7 bryellow 241 #585858 50 -07 -07 101 123 131 195 23 51 + base0 #839496 12/6 brblue 244 #808080 60 -06 -03 131 148 150 186 13 59 + base1 #93a1a1 14/4 brcyan 245 #8a8a8a 65 -05 -02 147 161 161 180 9 63 + base2 #eee8d5 7/7 white 254 #d7d7af 92 -00 10 238 232 213 44 11 93 + base3 #fdf6e3 15/7 brwhite 230 #ffffd7 97 00 10 253 246 227 44 10 99 + yellow #b58900 3/3 yellow 136 #af8700 60 10 65 181 137 0 45 100 71 + orange #cb4b16 9/3 brred 166 #d75f00 50 50 55 203 75 22 18 89 80 + red #dc322f 1/1 red 160 #d70000 50 65 45 220 50 47 1 79 86 + magenta #d33682 5/5 magenta 125 #af005f 50 65 -05 211 54 130 331 74 83 + violet #6c71c4 13/5 brmagenta 61 #5f5faf 50 15 -45 108 113 196 237 45 77 + blue #268bd2 4/4 blue 33 #0087ff 55 -10 -45 38 139 210 205 82 82 + cyan #2aa198 6/6 cyan 37 #00afaf 60 -35 -05 42 161 152 175 74 63 + green #859900 2/2 green 64 #5f8700 60 -20 65 133 153 0 68 100 60 + License ------- Copyright (c) 2011 Ethan Schoonover diff --git a/mutt-colors-solarized/mutt-colors-solarized-dark-256.muttrc b/mutt-colors-solarized/mutt-colors-solarized-dark-256.muttrc index d886d9b..b318651 100644 --- a/mutt-colors-solarized/mutt-colors-solarized-dark-256.muttrc +++ b/mutt-colors-solarized/mutt-colors-solarized-dark-256.muttrc @@ -18,17 +18,17 @@ #color index J_magent color234 "~x \"(mithrandir|aragorn)\\.aperiodic\\.net|thorin\\.hillmgt\\.com\" !~N !~T !~F !~p !~P" #color index J_magent color230 "~x \"(mithrandir|aragorn)\\.aperiodic\\.net|thorin\\.hillmgt\\.com\" ~N !~T !~F !~p !~P" #color index J_magent color37 "~x \"(mithrandir|aragorn)\\.aperiodic\\.net|thorin\\.hillmgt\\.com\" ~T !~F !~p !~P" -#color index J_magent color124 "~x \"(mithrandir|aragorn)\\.aperiodic\\.net|thorin\\.hillmgt\\.com\" ~F !~p !~P" +#color index J_magent color160 "~x \"(mithrandir|aragorn)\\.aperiodic\\.net|thorin\\.hillmgt\\.com\" ~F !~p !~P" # for background in 16 color terminal, valid background colors include: # base03, bg, black, any of the non brights # basic colors --------------------------------------------------------- color normal color241 color234 -color error color124 color234 +color error color160 color234 color tilde color235 color234 color message color37 color234 -color markers color124 color254 +color markers color160 color254 color attachment color254 color234 color search color61 color234 #color status J_black J_status @@ -44,12 +44,12 @@ mono error bold # index ---------------------------------------------------------------- -#color index color124 color234 "~D(!~p|~p)" # deleted +#color index color160 color234 "~D(!~p|~p)" # deleted #color index color235 color234 ~F # flagged #color index color166 color234 ~= # duplicate messages #color index color240 color234 "~A!~N!~T!~p!~Q!~F!~D!~P" # the rest #color index J_base color234 "~A~N!~T!~p!~Q!~F!~D" # the rest, new -color index color124 color234 "~A" # all messages +color index color160 color234 "~A" # all messages color index color166 color234 "~E" # expired messages color index color33 color234 "~N" # new messages color index color33 color234 "~O" # old messages @@ -63,27 +63,27 @@ color index color37 color234 "~p!~F" color index color37 color234 "~N~p!~F" # new messages to me color index color37 color234 "~U~p!~F" # unread messages to me color index color240 color234 "~R~p!~F" # messages to me -color index color124 color234 "~F" # flagged messages -color index color124 color234 "~F~p" # flagged messages to me -color index color124 color234 "~N~F" # new flagged messages -color index color124 color234 "~N~F~p" # new flagged messages to me -color index color124 color234 "~U~F~p" # new flagged messages to me -color index color235 color124 "~D" # deleted messages +color index color160 color234 "~F" # flagged messages +color index color160 color234 "~F~p" # flagged messages to me +color index color160 color234 "~N~F" # new flagged messages +color index color160 color234 "~N~F~p" # new flagged messages to me +color index color160 color234 "~U~F~p" # new flagged messages to me +color index color235 color160 "~D" # deleted messages color index color245 color234 "~v~(!~N)" # collapsed thread with no unread color index color136 color234 "~v~(~N)" # collapsed thread with some unread color index color64 color234 "~N~v~(~N)" # collapsed thread with unread parent # statusbg used to indicated flagged when foreground color shows other status # for collapsed thread -color index color124 color235 "~v~(~F)!~N" # collapsed thread with flagged, no unread +color index color160 color235 "~v~(~F)!~N" # collapsed thread with flagged, no unread color index color136 color235 "~v~(~F~N)" # collapsed thread with some unread & flagged color index color64 color235 "~N~v~(~F~N)" # collapsed thread with unread parent & flagged color index color64 color235 "~N~v~(~F)" # collapsed thread with unread parent, no unread inside, but some flagged color index color37 color235 "~v~(~p)" # collapsed thread with unread parent, no unread inside, some to me directly -color index color136 color124 "~v~(~D)" # thread with deleted (doesn't differentiate between all or partial) +color index color136 color160 "~v~(~D)" # thread with deleted (doesn't differentiate between all or partial) #color index color136 color234 "~(~N)" # messages in threads with some unread #color index color64 color234 "~S" # superseded messages -#color index color124 color234 "~T" # tagged messages -#color index color166 color124 "~=" # duplicated messages +#color index color160 color234 "~T" # tagged messages +#color index color166 color160 "~=" # duplicated messages # message headers ------------------------------------------------------ @@ -97,7 +97,7 @@ color header color33 color234 "^(Subject)" color quoted color33 color234 color quoted1 color37 color234 color quoted2 color136 color234 -color quoted3 color124 color234 +color quoted3 color160 color234 color quoted4 color166 color234 color signature color240 color234 @@ -115,16 +115,16 @@ color body color245 color234 "[ ]?[*][^*]*[*][ ]" # more ## pgp -color body color124 color234 "(BAD signature)" +color body color160 color234 "(BAD signature)" color body color37 color234 "(Good signature)" color body color234 color234 "^gpg: Good signature .*" color body color241 color234 "^gpg: " -color body color241 color124 "^gpg: BAD signature from.*" +color body color241 color160 "^gpg: BAD signature from.*" mono body bold "^gpg: Good signature" mono body bold "^gpg: BAD signature from.*" # yes, an insance URL regex -color body color124 color234 "([a-z][a-z0-9+-]*://(((([a-z0-9_.!~*'();:&=+$,-]|%[0-9a-f][0-9a-f])*@)?((([a-z0-9]([a-z0-9-]*[a-z0-9])?)\\.)*([a-z]([a-z0-9-]*[a-z0-9])?)\\.?|[0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+)(:[0-9]+)?)|([a-z0-9_.!~*'()$,;:@&=+-]|%[0-9a-f][0-9a-f])+)(/([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*(;([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*)*(/([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*(;([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*)*)*)?(\\?([a-z0-9_.!~*'();/?:@&=+$,-]|%[0-9a-f][0-9a-f])*)?(#([a-z0-9_.!~*'();/?:@&=+$,-]|%[0-9a-f][0-9a-f])*)?|(www|ftp)\\.(([a-z0-9]([a-z0-9-]*[a-z0-9])?)\\.)*([a-z]([a-z0-9-]*[a-z0-9])?)\\.?(:[0-9]+)?(/([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*(;([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*)*(/([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*(;([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*)*)*)?(\\?([-a-z0-9_.!~*'();/?:@&=+$,]|%[0-9a-f][0-9a-f])*)?(#([-a-z0-9_.!~*'();/?:@&=+$,]|%[0-9a-f][0-9a-f])*)?)[^].,:;!)? \t\r\n<>\"]" +color body color160 color234 "([a-z][a-z0-9+-]*://(((([a-z0-9_.!~*'();:&=+$,-]|%[0-9a-f][0-9a-f])*@)?((([a-z0-9]([a-z0-9-]*[a-z0-9])?)\\.)*([a-z]([a-z0-9-]*[a-z0-9])?)\\.?|[0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+)(:[0-9]+)?)|([a-z0-9_.!~*'()$,;:@&=+-]|%[0-9a-f][0-9a-f])+)(/([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*(;([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*)*(/([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*(;([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*)*)*)?(\\?([a-z0-9_.!~*'();/?:@&=+$,-]|%[0-9a-f][0-9a-f])*)?(#([a-z0-9_.!~*'();/?:@&=+$,-]|%[0-9a-f][0-9a-f])*)?|(www|ftp)\\.(([a-z0-9]([a-z0-9-]*[a-z0-9])?)\\.)*([a-z]([a-z0-9-]*[a-z0-9])?)\\.?(:[0-9]+)?(/([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*(;([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*)*(/([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*(;([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*)*)*)?(\\?([-a-z0-9_.!~*'();/?:@&=+$,]|%[0-9a-f][0-9a-f])*)?(#([-a-z0-9_.!~*'();/?:@&=+$,]|%[0-9a-f][0-9a-f])*)?)[^].,:;!)? \t\r\n<>\"]" # and a heavy handed email regex #color body J_magent color234 "((@(([0-9a-z-]+\\.)*[0-9a-z-]+\\.?|#[0-9]+|\\[[0-9]?[0-9]?[0-9]\\.[0-9]?[0-9]?[0-9]\\.[0-9]?[0-9]?[0-9]\\.[0-9]?[0-9]?[0-9]\\]),)*@(([0-9a-z-]+\\.)*[0-9a-z-]+\\.?|#[0-9]+|\\[[0-9]?[0-9]?[0-9]\\.[0-9]?[0-9]?[0-9]\\.[0-9]?[0-9]?[0-9]\\.[0-9]?[0-9]?[0-9]\\]):)?[0-9a-z_.+%$-]+@(([0-9a-z-]+\\.)*[0-9a-z-]+\\.?|#[0-9]+|\\[[0-2]?[0-9]?[0-9]\\.[0-2]?[0-9]?[0-9]\\.[0-2]?[0-9]?[0-9]\\.[0-2]?[0-9]?[0-9]\\])" diff --git a/mutt-colors-solarized/mutt-colors-solarized-light-256.muttrc b/mutt-colors-solarized/mutt-colors-solarized-light-256.muttrc index 15d6292..4b3861d 100644 --- a/mutt-colors-solarized/mutt-colors-solarized-light-256.muttrc +++ b/mutt-colors-solarized/mutt-colors-solarized-light-256.muttrc @@ -18,17 +18,17 @@ #color index J_magent color233 "~x \"(mithrandir|aragorn)\\.aperiodic\\.net|thorin\\.hillmgt\\.com\" !~N !~T !~F !~p !~P" #color index J_magent color233 "~x \"(mithrandir|aragorn)\\.aperiodic\\.net|thorin\\.hillmgt\\.com\" ~N !~T !~F !~p !~P" #color index J_magent color37 "~x \"(mithrandir|aragorn)\\.aperiodic\\.net|thorin\\.hillmgt\\.com\" ~T !~F !~p !~P" -#color index J_magent color124 "~x \"(mithrandir|aragorn)\\.aperiodic\\.net|thorin\\.hillmgt\\.com\" ~F !~p !~P" +#color index J_magent color160 "~x \"(mithrandir|aragorn)\\.aperiodic\\.net|thorin\\.hillmgt\\.com\" ~F !~p !~P" # for background in 16 color terminal, valid background colors include: # base03, bg, black, any of the non brights # basic colors --------------------------------------------------------- color normal color244 color233 -color error color124 color233 +color error color160 color233 color tilde color254 color233 color message color37 color233 -color markers color124 color234 +color markers color160 color234 color attachment color234 color233 color search color61 color233 #color status J_black J_status @@ -44,12 +44,12 @@ mono error bold # index ---------------------------------------------------------------- -#color index color124 color233 "~D(!~p|~p)" # deleted +#color index color160 color233 "~D(!~p|~p)" # deleted #color index color254 color233 ~F # flagged #color index color166 color233 ~= # duplicate messages #color index color245 color233 "~A!~N!~T!~p!~Q!~F!~D!~P" # the rest #color index J_base color233 "~A~N!~T!~p!~Q!~F!~D" # the rest, new -color index color124 color233 "~A" # all messages +color index color160 color233 "~A" # all messages color index color166 color233 "~E" # expired messages color index color33 color233 "~N" # new messages color index color33 color233 "~O" # old messages @@ -63,27 +63,27 @@ color index color37 color233 "~p!~F" color index color37 color233 "~N~p!~F" # new messages to me color index color37 color233 "~U~p!~F" # unread messages to me color index color245 color233 "~R~p!~F" # messages to me -color index color124 color233 "~F" # flagged messages -color index color124 color233 "~F~p" # flagged messages to me -color index color124 color233 "~N~F" # new flagged messages -color index color124 color233 "~N~F~p" # new flagged messages to me -color index color124 color233 "~U~F~p" # new flagged messages to me -color index color254 color124 "~D" # deleted messages +color index color160 color233 "~F" # flagged messages +color index color160 color233 "~F~p" # flagged messages to me +color index color160 color233 "~N~F" # new flagged messages +color index color160 color233 "~N~F~p" # new flagged messages to me +color index color160 color233 "~U~F~p" # new flagged messages to me +color index color254 color160 "~D" # deleted messages color index color239 color233 "~v~(!~N)" # collapsed thread with no unread color index color136 color233 "~v~(~N)" # collapsed thread with some unread color index color64 color233 "~N~v~(~N)" # collapsed thread with unread parent # statusbg used to indicated flagged when foreground color shows other status # for collapsed thread -color index color124 color254 "~v~(~F)!~N" # collapsed thread with flagged, no unread +color index color160 color254 "~v~(~F)!~N" # collapsed thread with flagged, no unread color index color136 color254 "~v~(~F~N)" # collapsed thread with some unread & flagged color index color64 color254 "~N~v~(~F~N)" # collapsed thread with unread parent & flagged color index color64 color254 "~N~v~(~F)" # collapsed thread with unread parent, no unread inside, but some flagged color index color37 color254 "~v~(~p)" # collapsed thread with unread parent, no unread inside, some to me directly -color index color136 color124 "~v~(~D)" # thread with deleted (doesn't differentiate between all or partial) +color index color136 color160 "~v~(~D)" # thread with deleted (doesn't differentiate between all or partial) #color index color136 color233 "~(~N)" # messages in threads with some unread #color index color64 color233 "~S" # superseded messages -#color index color124 color233 "~T" # tagged messages -#color index color166 color124 "~=" # duplicated messages +#color index color160 color233 "~T" # tagged messages +#color index color166 color160 "~=" # duplicated messages # message headers ------------------------------------------------------ @@ -97,7 +97,7 @@ color header color33 color233 "^(Subject)" color quoted color33 color233 color quoted1 color37 color233 color quoted2 color136 color233 -color quoted3 color124 color233 +color quoted3 color160 color233 color quoted4 color166 color233 color signature color245 color233 @@ -115,16 +115,16 @@ color body color239 color233 "[ ]?[*][^*]*[*][ ]" # more ## pgp -color body color124 color233 "(BAD signature)" +color body color160 color233 "(BAD signature)" color body color37 color233 "(Good signature)" color body color230 color233 "^gpg: Good signature .*" color body color244 color233 "^gpg: " -color body color244 color124 "^gpg: BAD signature from.*" +color body color244 color160 "^gpg: BAD signature from.*" mono body bold "^gpg: Good signature" mono body bold "^gpg: BAD signature from.*" # yes, an insance URL regex -color body color124 color233 "([a-z][a-z0-9+-]*://(((([a-z0-9_.!~*'();:&=+$,-]|%[0-9a-f][0-9a-f])*@)?((([a-z0-9]([a-z0-9-]*[a-z0-9])?)\\.)*([a-z]([a-z0-9-]*[a-z0-9])?)\\.?|[0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+)(:[0-9]+)?)|([a-z0-9_.!~*'()$,;:@&=+-]|%[0-9a-f][0-9a-f])+)(/([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*(;([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*)*(/([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*(;([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*)*)*)?(\\?([a-z0-9_.!~*'();/?:@&=+$,-]|%[0-9a-f][0-9a-f])*)?(#([a-z0-9_.!~*'();/?:@&=+$,-]|%[0-9a-f][0-9a-f])*)?|(www|ftp)\\.(([a-z0-9]([a-z0-9-]*[a-z0-9])?)\\.)*([a-z]([a-z0-9-]*[a-z0-9])?)\\.?(:[0-9]+)?(/([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*(;([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*)*(/([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*(;([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*)*)*)?(\\?([-a-z0-9_.!~*'();/?:@&=+$,]|%[0-9a-f][0-9a-f])*)?(#([-a-z0-9_.!~*'();/?:@&=+$,]|%[0-9a-f][0-9a-f])*)?)[^].,:;!)? \t\r\n<>\"]" +color body color160 color233 "([a-z][a-z0-9+-]*://(((([a-z0-9_.!~*'();:&=+$,-]|%[0-9a-f][0-9a-f])*@)?((([a-z0-9]([a-z0-9-]*[a-z0-9])?)\\.)*([a-z]([a-z0-9-]*[a-z0-9])?)\\.?|[0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+)(:[0-9]+)?)|([a-z0-9_.!~*'()$,;:@&=+-]|%[0-9a-f][0-9a-f])+)(/([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*(;([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*)*(/([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*(;([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*)*)*)?(\\?([a-z0-9_.!~*'();/?:@&=+$,-]|%[0-9a-f][0-9a-f])*)?(#([a-z0-9_.!~*'();/?:@&=+$,-]|%[0-9a-f][0-9a-f])*)?|(www|ftp)\\.(([a-z0-9]([a-z0-9-]*[a-z0-9])?)\\.)*([a-z]([a-z0-9-]*[a-z0-9])?)\\.?(:[0-9]+)?(/([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*(;([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*)*(/([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*(;([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*)*)*)?(\\?([-a-z0-9_.!~*'();/?:@&=+$,]|%[0-9a-f][0-9a-f])*)?(#([-a-z0-9_.!~*'();/?:@&=+$,]|%[0-9a-f][0-9a-f])*)?)[^].,:;!)? \t\r\n<>\"]" # and a heavy handed email regex #color body J_magent color233 "((@(([0-9a-z-]+\\.)*[0-9a-z-]+\\.?|#[0-9]+|\\[[0-9]?[0-9]?[0-9]\\.[0-9]?[0-9]?[0-9]\\.[0-9]?[0-9]?[0-9]\\.[0-9]?[0-9]?[0-9]\\]),)*@(([0-9a-z-]+\\.)*[0-9a-z-]+\\.?|#[0-9]+|\\[[0-9]?[0-9]?[0-9]\\.[0-9]?[0-9]?[0-9]\\.[0-9]?[0-9]?[0-9]\\.[0-9]?[0-9]?[0-9]\\]):)?[0-9a-z_.+%$-]+@(([0-9a-z-]+\\.)*[0-9a-z-]+\\.?|#[0-9]+|\\[[0-2]?[0-9]?[0-9]\\.[0-2]?[0-9]?[0-9]\\.[0-2]?[0-9]?[0-9]\\.[0-2]?[0-9]?[0-9]\\])" diff --git a/mutt-colors-solarized/mutt-compile-colors.sh b/mutt-colors-solarized/mutt-compile-colors.sh index f9eac92..f59fa58 100755 --- a/mutt-colors-solarized/mutt-compile-colors.sh +++ b/mutt-colors-solarized/mutt-compile-colors.sh @@ -16,7 +16,7 @@ # base3 #fdf6e3 15/7 brwhite 230 #ffffd7 97 00 10 253 246 227 44 10 99 # yellow #b58900 3/3 yellow 136 #af8700 60 10 65 181 137 0 45 100 71 # orange #cb4b16 9/3 brred 166 #d75f00 50 50 55 203 75 22 18 89 80 -# red #d30102 1/1 red 124 #af0000 45 70 60 211 1 2 0 99 83 +# red #dc322f 1/1 red 160 #d70000 50 65 45 220 50 47 1 79 86 # magenta #d33682 5/5 magenta 125 #af005f 50 65 -05 211 54 130 331 74 83 # violet #6c71c4 13/5 brmagenta 61 #5f5faf 50 15 -45 108 113 196 237 45 77 # blue #268bd2 4/4 blue 33 #0087ff 55 -10 -45 38 139 210 205 82 82 @@ -34,7 +34,7 @@ J_base2 ,color254 ,white , J_base3 ,color230 ,brightwhite , J_yellow ,color136 ,yellow , J_orange ,color166 ,brightred , -J_red ,color124 ,red , +J_red ,color160 ,red , J_magenta ,color125 ,magenta , J_violet ,color61 ,brightmagenta , J_blue ,color33 ,blue , @@ -56,7 +56,7 @@ J_base02 ,color254 ,white , J_base03 ,color230 ,brightwhite , J_yellow ,color136 ,yellow , J_orange ,color166 ,brightred , -J_red ,color124 ,red , +J_red ,color160 ,red , J_magenta ,color125 ,magenta , J_violet ,color61 ,brightmagenta , J_blue ,color33 ,blue , diff --git a/osx-terminal.app-colors-solarized/Solarized Dark.terminal b/osx-terminal.app-colors-solarized/Solarized Dark.terminal index 49bf256..3fe2a09 100644 --- a/osx-terminal.app-colors-solarized/Solarized Dark.terminal +++ b/osx-terminal.app-colors-solarized/Solarized Dark.terminal @@ -5,17 +5,17 @@ BackgroundColor YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS - AAGGoKMHCA9VJG51bGzTCQoLDA0OViRjbGFzc1xOU0NvbG9yU3BhY2VVTlNSR0KAAhAC - TxAhMCAwLjE2ODYyNzQ1NTggMC4yMTE3NjQ3MjMxIDAuOTYA0hAREhNaJGNsYXNzbmFt - ZVgkY2xhc3Nlc1dOU0NvbG9yohIUWE5TT2JqZWN0XxAPTlNLZXllZEFyY2hpdmVy0RcY - VHJvb3SAAQgRGiMtMjc7QUhPXGJkZoqPmqOrrrfJzNEAAAAAAAABAQAAAAAAAAAZAAAA - AAAAAAAAAAAAAAAA0w== + AAGGoKMHCA9VJG51bGzTCQoLDA0OViRjbGFzc1xOU0NvbG9yU3BhY2VVTlNSR0KAAhAB + TxAtMC4wMTU5MjQ0MDUzMSAwLjEyNjUyMDkxNjggMC4xNTk2OTYwMTI3IDAuOTYA0hAR + EhNaJGNsYXNzbmFtZVgkY2xhc3Nlc1dOU0NvbG9yohIUWE5TT2JqZWN0XxAPTlNLZXll + ZEFyY2hpdmVy0RcYVHJvb3SAAQgRGiMtMjc7QUhPXGJkZpabpq+3usPV2N0AAAAAAAAB + AQAAAAAAAAAZAAAAAAAAAAAAAAAAAAAA3w== CursorColor YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS - AAGGoKMHCA9VJG51bGzTCQoLDA0OViRjbGFzc1xOU0NvbG9yU3BhY2VVTlNSR0KAAhAC - TxAnMC41MTM3MjU1MTkyIDAuNTgwMzkyMTgxOSAwLjU4ODIzNTMxODcA0hAREhNaJGNs + AAGGoKMHCA9VJG51bGzTCQoLDA0OViRjbGFzc1xOU0NvbG9yU3BhY2VVTlNSR0KAAhAB + TxAnMC40NDA1ODAyNDg4IDAuNTA5NjI5MzA5MiAwLjUxNjg1Nzk4MTcA0hAREhNaJGNs YXNzbmFtZVgkY2xhc3Nlc1dOU0NvbG9yohIUWE5TT2JqZWN0XxAPTlNLZXllZEFyY2hp dmVy0RcYVHJvb3SAAQgRGiMtMjc7QUhPXGJkZpCVoKmxtL3P0tcAAAAAAAABAQAAAAAA AAAZAAAAAAAAAAAAAAAAAAAA2Q== @@ -38,8 +38,8 @@ SelectionColor YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS - AAGGoKMHCA9VJG51bGzTCQoLDA0OViRjbGFzc1xOU0NvbG9yU3BhY2VVTlNSR0KAAhAC - TxAoMC4wMjc0NTA5ODI0OCAwLjIxMTc2NDcyMzEgMC4yNTg4MjM1NDM4ANIQERITWiRj + AAGGoKMHCA9VJG51bGzTCQoLDA0OViRjbGFzc1xOU0NvbG9yU3BhY2VVTlNSR0KAAhAB + TxAoMC4wMzkzODA3MzY2NSAwLjE2MDExNjQ2MzkgMC4xOTgzMzI3NTY4ANIQERITWiRj bGFzc25hbWVYJGNsYXNzZXNXTlNDb2xvcqISFFhOU09iamVjdF8QD05TS2V5ZWRBcmNo aXZlctEXGFRyb290gAEIERojLTI3O0FIT1xiZGaRlqGqsrW+0NPYAAAAAAAAAQEAAAAA AAAAGQAAAAAAAAAAAAAAAAAAANo= @@ -47,17 +47,17 @@ TextBoldColor YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS - AAGGoKMHCA9VJG51bGzTCQoLDA0OViRjbGFzc1xOU0NvbG9yU3BhY2VVTlNSR0KAAhAC - TxAlMC41NzY0NzA2MTM1IDAuNjMxMzcyNTcxIDAuNjMxMzcyNTcxANIQERITWiRjbGFz - c25hbWVYJGNsYXNzZXNXTlNDb2xvcqISFFhOU09iamVjdF8QD05TS2V5ZWRBcmNoaXZl - ctEXGFRyb290gAEIERojLTI3O0FIT1xiZGaOk56nr7K7zdDVAAAAAAAAAQEAAAAAAAAA - GQAAAAAAAAAAAAAAAAAAANc= + AAGGoKMHCA9VJG51bGzTCQoLDA0OViRjbGFzc1xOU0NvbG9yU3BhY2VVTlNSR0KAAhAB + TxAmMC41MDU5OTE5MzU3IDAuNTY0ODU4Mzc3IDAuNTYzNjM2NTQxNADSEBESE1okY2xh + c3NuYW1lWCRjbGFzc2VzV05TQ29sb3KiEhRYTlNPYmplY3RfEA9OU0tleWVkQXJjaGl2 + ZXLRFxhUcm9vdIABCBEaIy0yNztBSE9cYmRmj5SfqLCzvM7R1gAAAAAAAAEBAAAAAAAA + ABkAAAAAAAAAAAAAAAAAAADY TextColor YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS - AAGGoKMHCA9VJG51bGzTCQoLDA0OViRjbGFzc1xOU0NvbG9yU3BhY2VVTlNSR0KAAhAC - TxAnMC41MTM3MjU1MTkyIDAuNTgwMzkyMTgxOSAwLjU4ODIzNTMxODcA0hAREhNaJGNs + AAGGoKMHCA9VJG51bGzTCQoLDA0OViRjbGFzc1xOU0NvbG9yU3BhY2VVTlNSR0KAAhAB + TxAnMC40NDA1ODAyNDg4IDAuNTA5NjI5MzA5MiAwLjUxNjg1Nzk4MTcA0hAREhNaJGNs YXNzbmFtZVgkY2xhc3Nlc1dOU0NvbG9yohIUWE5TT2JqZWN0XxAPTlNLZXllZEFyY2hp dmVy0RcYVHJvb3SAAQgRGiMtMjc7QUhPXGJkZpCVoKmxtL3P0tcAAAAAAAABAQAAAAAA AAAZAAAAAAAAAAAAAAAAAAAA2Q== @@ -66,87 +66,87 @@ blackColour - BAtzdHJlYW10eXBlZIHoA4QBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMChARm - ZmZmg+Lg4DyD2thYPoOFhIQ+AYY= + BAtzdHJlYW10eXBlZIHoA4QBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMBhARm + ZmZmg7JNIT2DkvUjPoO+F0s+AYY= blueColour - BAtzdHJlYW10eXBlZIHoA4QBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMChARm - ZmZmg5mYGD6DjIsLP4PU0lI/AYY= + BAtzdHJlYW10eXBlZIHoA4QBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMBhARm + ZmZmgyqcAj6DtOHsPoO+RUg/AYY= brightBlackColour - BAtzdHJlYW10eXBlZIHoA4QBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMChARm - ZmZmAIOtrCw+g9rYWD4Bhg== + BAtzdHJlYW10eXBlZIHoA4QBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMBhARm + ZmZmg+ZzgjyDs44BPoNahyM+AYY= brightBlueColour - BAtzdHJlYW10eXBlZIHoA4QBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMChARm - ZmZmg4SDAz+DlZQUP4OXlhY/AYY= + BAtzdHJlYW10eXBlZIHoA4QBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMBhARm + ZmZmg7yT4T6DEXcCP4POUAQ/AYY= brightCyanColour - BAtzdHJlYW10eXBlZIHoA4QBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMChARm - ZmZmg5STEz+DoqEhP4OioSE/AYY= + BAtzdHJlYW10eXBlZIHoA4QBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMBhARm + ZmZmg7CIAT+Dj5oQP4N8ShA/AYY= brightGreenColour - BAtzdHJlYW10eXBlZIHoA4QBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMChARm - ZmZmg7GwsD6D3tzcPoPs6uo+AYY= + BAtzdHJlYW10eXBlZIHoA4QBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMBhARm + ZmZmgzyujT6DFZy2PoOYFsQ+AYY= brightMagentaColour - BAtzdHJlYW10eXBlZIHoA4QBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMChARm - ZmZmg9rY2D6D5OLiPoPGxEQ/AYY= + BAtzdHJlYW10eXBlZIHoA4QBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMBhARm + ZmZmgxMjsj6D+uazPoNkyTc/AYY= brightRedColour - BAtzdHJlYW10eXBlZIHoA4QBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMChARm - ZmZmg83LSz+Dl5aWPoOxsLA9AYY= + BAtzdHJlYW10eXBlZIHoA4QBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMBhARm + ZmZmgyfkPT+D/15aPoMgl5Y9AYY= brightWhiteColour - BAtzdHJlYW10eXBlZIHoA4QBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMChARm - ZmZmg//9fT+D+PZ2P4Pl42M/AYY= + BAtzdHJlYW10eXBlZIHoA4QBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMBhARm + ZmZmg49LfT+D0Dt1P4MGM10/AYY= brightYellowColour - BAtzdHJlYW10eXBlZIHoA4QBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMChARm - ZmZmg8zKyj6D+Pb2PoOEgwM/AYY= + BAtzdHJlYW10eXBlZIHoA4QBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMBhARm + ZmZmg1MTpj6DeHnQPoPQg+A+AYY= cyanColour - BAtzdHJlYW10eXBlZIHoA4QBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMChARm - ZmZmg6moKD6DoqEhP4OZmBg/AYY= + BAtzdHJlYW10eXBlZIHoA4QBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMBhARm + ZmZmg4VRFj6DfyESP4PkZwY/AYY= greenColour - BAtzdHJlYW10eXBlZIHoA4QBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMChARm - ZmZmg4aFBT+DmpkZPwABhg== + BAtzdHJlYW10eXBlZIHoA4QBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMBhARm + ZmZmg9lI5j6DIYkKP4PVjKU8AYY= magentaColour - BAtzdHJlYW10eXBlZIHoA4QBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMChARm - ZmZmg9XTUz+D2thYPoODggI/AYY= + BAtzdHJlYW10eXBlZIHoA4QBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMBhARm + ZmZmg/4CRz+DBTzdPYMgzt4+AYY= name Solarized Dark redColour - BAtzdHJlYW10eXBlZIHoA4QBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMChARm - ZmZmg9XTUz+DgYCAO4OBgAA8AYY= + BAtzdHJlYW10eXBlZIHoA4QBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMBhARm + ZmZmg6i7UT+DUATePYMl2hA+AYY= type Window Settings whiteColour - BAtzdHJlYW10eXBlZIHoA4QBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMChARm - ZmZmg/Dubj+D6uhoP4PX1VU/AYY= + BAtzdHJlYW10eXBlZIHoA4QBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMBhARm + ZmZmgzqGaj+D2tdjP4NYPUw/AYY= yellowColour - BAtzdHJlYW10eXBlZIHoA4QBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMChARm - ZmZmg7a1NT+DiokJPwABhg== + BAtzdHJlYW10eXBlZIHoA4QBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMBhARm + ZmZmg0DAJT+DB17vPoM4Y8A8AYY= diff --git a/osx-terminal.app-colors-solarized/Solarized Light.terminal b/osx-terminal.app-colors-solarized/Solarized Light.terminal index 2f4fa55..a5be626 100644 --- a/osx-terminal.app-colors-solarized/Solarized Light.terminal +++ b/osx-terminal.app-colors-solarized/Solarized Light.terminal @@ -5,8 +5,8 @@ BackgroundColor YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS - AAGGoKMHCA9VJG51bGzTCQoLDA0OViRjbGFzc1xOU0NvbG9yU3BhY2VVTlNSR0KAAhAC - TxAsMC45OTIxNTY5MjI4IDAuOTY0NzA1OTQ0MSAwLjg5MDE5NjE0NDYgMC45NgDSEBES + AAGGoKMHCA9VJG51bGzTCQoLDA0OViRjbGFzc1xOU0NvbG9yU3BhY2VVTlNSR0KAAhAB + TxAsMC45ODk0MzQxODI2IDAuOTU3OTQzOTE2MyAwLjg2NDA1OTgwNTkgMC45NgDSEBES E1okY2xhc3NuYW1lWCRjbGFzc2VzV05TQ29sb3KiEhRYTlNPYmplY3RfEA9OU0tleWVk QXJjaGl2ZXLRFxhUcm9vdIABCBEaIy0yNztBSE9cYmRmlZqlrra5wtTX3AAAAAAAAAEB AAAAAAAAABkAAAAAAAAAAAAAAAAAAADe @@ -14,8 +14,8 @@ CursorColor YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS - AAGGoKMHCA9VJG51bGzTCQoLDA0OViRjbGFzc1xOU0NvbG9yU3BhY2VVTlNSR0KAAhAC - TxAmMC4zOTYwNzg0Njc0IDAuNDgyMzUyOTcyIDAuNTEzNzI1NTE5MgDSEBESE1okY2xh + AAGGoKMHCA9VJG51bGzTCQoLDA0OViRjbGFzc1xOU0NvbG9yU3BhY2VVTlNSR0KAAhAB + TxAmMC4zMjQzNjYxODIxIDAuNDA3MTc2NzMzIDAuNDM4NTA1NjQ5NgDSEBESE1okY2xh c3NuYW1lWCRjbGFzc2VzV05TQ29sb3KiEhRYTlNPYmplY3RfEA9OU0tleWVkQXJjaGl2 ZXLRFxhUcm9vdIABCBEaIy0yNztBSE9cYmRmj5SfqLCzvM7R1gAAAAAAAAEBAAAAAAAA ABkAAAAAAAAAAAAAAAAAAADY @@ -38,8 +38,8 @@ SelectionColor YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS - AAGGoKMHCA9VJG51bGzTCQoLDA0OViRjbGFzc1xOU0NvbG9yU3BhY2VVTlNSR0KAAhAC - TxAnMC45MzMzMzMzOTY5IDAuOTA5ODAzOTg2NSAwLjgzNTI5NDE4NzEA0hAREhNaJGNs + AAGGoKMHCA9VJG51bGzTCQoLDA0OViRjbGFzc1xOU0NvbG9yU3BhY2VVTlNSR0KAAhAB + TxAnMC45MTYxMTA2MzQ4IDAuODkwMDEyMzgzNSAwLjc5NzgxMTAzMTMA0hAREhNaJGNs YXNzbmFtZVgkY2xhc3Nlc1dOU0NvbG9yohIUWE5TT2JqZWN0XxAPTlNLZXllZEFyY2hp dmVy0RcYVHJvb3SAAQgRGiMtMjc7QUhPXGJkZpCVoKmxtL3P0tcAAAAAAAABAQAAAAAA AAAZAAAAAAAAAAAAAAAAAAAA2Q== @@ -47,8 +47,8 @@ TextBoldColor YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS - AAGGoKMHCA9VJG51bGzTCQoLDA0OViRjbGFzc1xOU0NvbG9yU3BhY2VVTlNSR0KAAhAC - TxAnMC4zNDUwOTgwNDg0IDAuNDMxMzcyNTgyOSAwLjQ1ODgyMzU2MTcA0hAREhNaJGNs + AAGGoKMHCA9VJG51bGzTCQoLDA0OViRjbGFzc1xOU0NvbG9yU3BhY2VVTlNSR0KAAhAB + TxAnMC4yNzY3MTk5Mjc4IDAuMzU2NjU5NTYxNCAwLjM4Mjk4NDg3NjYA0hAREhNaJGNs YXNzbmFtZVgkY2xhc3Nlc1dOU0NvbG9yohIUWE5TT2JqZWN0XxAPTlNLZXllZEFyY2hp dmVy0RcYVHJvb3SAAQgRGiMtMjc7QUhPXGJkZpCVoKmxtL3P0tcAAAAAAAABAQAAAAAA AAAZAAAAAAAAAAAAAAAAAAAA2Q== @@ -56,8 +56,8 @@ TextColor YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS - AAGGoKMHCA9VJG51bGzTCQoLDA0OViRjbGFzc1xOU0NvbG9yU3BhY2VVTlNSR0KAAhAC - TxAmMC4zOTYwNzg0Njc0IDAuNDgyMzUyOTcyIDAuNTEzNzI1NTE5MgDSEBESE1okY2xh + AAGGoKMHCA9VJG51bGzTCQoLDA0OViRjbGFzc1xOU0NvbG9yU3BhY2VVTlNSR0KAAhAB + TxAmMC4zMjQzNjYxODIxIDAuNDA3MTc2NzMzIDAuNDM4NTA1NjQ5NgDSEBESE1okY2xh c3NuYW1lWCRjbGFzc2VzV05TQ29sb3KiEhRYTlNPYmplY3RfEA9OU0tleWVkQXJjaGl2 ZXLRFxhUcm9vdIABCBEaIy0yNztBSE9cYmRmj5SfqLCzvM7R1gAAAAAAAAEBAAAAAAAA ABkAAAAAAAAAAAAAAAAAAADY @@ -66,87 +66,87 @@ blackColour - BAtzdHJlYW10eXBlZIHoA4QBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMChARm - ZmZmg+Lg4DyD2thYPoOFhIQ+AYY= + BAtzdHJlYW10eXBlZIHoA4QBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMBhARm + ZmZmg7JNIT2DkvUjPoO+F0s+AYY= blueColour - BAtzdHJlYW10eXBlZIHoA4QBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMChARm - ZmZmg5mYGD6DjIsLP4PU0lI/AYY= + BAtzdHJlYW10eXBlZIHoA4QBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMBhARm + ZmZmgyqcAj6DtOHsPoO+RUg/AYY= brightBlackColour - BAtzdHJlYW10eXBlZIHoA4QBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMChARm - ZmZmAIOtrCw+g9rYWD4Bhg== + BAtzdHJlYW10eXBlZIHoA4QBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMBhARm + ZmZmg+ZzgjyDs44BPoNahyM+AYY= brightBlueColour - BAtzdHJlYW10eXBlZIHoA4QBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMChARm - ZmZmg4SDAz+DlZQUP4OXlhY/AYY= + BAtzdHJlYW10eXBlZIHoA4QBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMBhARm + ZmZmg7yT4T6DEXcCP4POUAQ/AYY= brightCyanColour - BAtzdHJlYW10eXBlZIHoA4QBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMChARm - ZmZmg5STEz+DoqEhP4OioSE/AYY= + BAtzdHJlYW10eXBlZIHoA4QBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMBhARm + ZmZmg7CIAT+Dj5oQP4N8ShA/AYY= brightGreenColour - BAtzdHJlYW10eXBlZIHoA4QBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMChARm - ZmZmg7GwsD6D3tzcPoPs6uo+AYY= + BAtzdHJlYW10eXBlZIHoA4QBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMBhARm + ZmZmgzyujT6DFZy2PoOYFsQ+AYY= brightMagentaColour - BAtzdHJlYW10eXBlZIHoA4QBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMChARm - ZmZmg9rY2D6D5OLiPoPGxEQ/AYY= + BAtzdHJlYW10eXBlZIHoA4QBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMBhARm + ZmZmgxMjsj6D+uazPoNkyTc/AYY= brightRedColour - BAtzdHJlYW10eXBlZIHoA4QBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMChARm - ZmZmg83LSz+Dl5aWPoOxsLA9AYY= + BAtzdHJlYW10eXBlZIHoA4QBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMBhARm + ZmZmgyfkPT+D/15aPoMgl5Y9AYY= brightWhiteColour - BAtzdHJlYW10eXBlZIHoA4QBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMChARm - ZmZmg//9fT+D+PZ2P4Pl42M/AYY= + BAtzdHJlYW10eXBlZIHoA4QBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMBhARm + ZmZmg49LfT+D0Dt1P4MGM10/AYY= brightYellowColour - BAtzdHJlYW10eXBlZIHoA4QBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMChARm - ZmZmg8zKyj6D+Pb2PoOEgwM/AYY= + BAtzdHJlYW10eXBlZIHoA4QBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMBhARm + ZmZmg1MTpj6DeHnQPoPQg+A+AYY= cyanColour - BAtzdHJlYW10eXBlZIHoA4QBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMChARm - ZmZmg6moKD6DoqEhP4OZmBg/AYY= + BAtzdHJlYW10eXBlZIHoA4QBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMBhARm + ZmZmg4VRFj6DfyESP4PkZwY/AYY= greenColour - BAtzdHJlYW10eXBlZIHoA4QBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMChARm - ZmZmg4aFBT+DmpkZPwABhg== + BAtzdHJlYW10eXBlZIHoA4QBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMBhARm + ZmZmg9lI5j6DIYkKP4PVjKU8AYY= magentaColour - BAtzdHJlYW10eXBlZIHoA4QBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMChARm - ZmZmg9XTUz+D2thYPoODggI/AYY= + BAtzdHJlYW10eXBlZIHoA4QBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMBhARm + ZmZmg/4CRz+DBTzdPYMgzt4+AYY= name Solarized Light redColour - BAtzdHJlYW10eXBlZIHoA4QBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMChARm - ZmZmg9XTUz+DgYCAO4OBgAA8AYY= + BAtzdHJlYW10eXBlZIHoA4QBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMBhARm + ZmZmg6i7UT+DUATePYMl2hA+AYY= type Window Settings whiteColour - BAtzdHJlYW10eXBlZIHoA4QBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMChARm - ZmZmg/Dubj+D6uhoP4PX1VU/AYY= + BAtzdHJlYW10eXBlZIHoA4QBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMBhARm + ZmZmgzqGaj+D2tdjP4NYPUw/AYY= yellowColour - BAtzdHJlYW10eXBlZIHoA4QBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMChARm - ZmZmg7a1NT+DiokJPwABhg== + BAtzdHJlYW10eXBlZIHoA4QBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMBhARm + ZmZmg0DAJT+DB17vPoM4Y8A8AYY= diff --git a/xresources-colors-solarized/Xresources b/xresources-colors-solarized/Xresources index 6c61b39..0e5fc02 100644 --- a/xresources-colors-solarized/Xresources +++ b/xresources-colors-solarized/Xresources @@ -12,7 +12,7 @@ !!base3 #fdf6e3 15/7 brwhite 230 #ffffd7 97 00 10 253 246 227 44 10 99 !!yellow #b58900 3/3 yellow 136 #af8700 60 10 65 181 137 0 45 100 71 !!orange #cb4b16 9/3 brred 166 #d75f00 50 50 55 203 75 22 18 89 80 -!!red #d30102 1/1 red 124 #af0000 45 70 60 211 1 2 0 99 83 +!!red #dc322f 1/1 red 160 #d70000 50 65 45 220 50 47 1 79 86 !!magenta #d33682 5/5 magenta 125 #af005f 50 65 -05 211 54 130 331 74 83 !!violet #6c71c4 13/5 brmagenta 61 #5f5faf 50 15 -45 108 113 196 237 45 77 !!blue #268bd2 4/4 blue 33 #0087ff 55 -10 -45 38 139 210 205 82 82 @@ -30,7 +30,7 @@ #define S_green #b58900 #define S_yellow #cb4b16 #define S_orange #d30102 -#define S_red #d33682 +#define S_red #dc322f #define S_magenta #6c71c4 #define S_violet #268bd2 #define S_blue #2aa198