Merge remote-tracking branch 'gitorious/master' into phoenix

This commit is contained in:
Tom Willemsen 2012-03-09 21:40:06 +01:00
commit 4ce7e72c08

View file

@ -1,109 +1,45 @@
! -*- mode: conf-xdefaults; eval: (rainbow-mode 1); eval: (git-auto-commit-mode 1) -*- ! -*- mode: conf-xdefaults; eval: (rainbow-mode 1); eval: (git-auto-commit-mode 1) -*-
!! drop in Solarized colorscheme for Xresources/Xdefaults !! drop in Solarized colorscheme for Xresources/Xdefaults
!!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 #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
#define S_base03 #002b36
#define S_base02 #073642
#define S_base01 #586e75
#define S_base00 #657b83
#define S_base0 #839496
#define S_base1 #93a1a1
#define S_base2 #eee8d5
#define S_base3 #fdf6e3
#define S_yellow #b58900
#define S_orange #cb4b16
#define S_red #dc322f
#define S_magenta #d33682
#define S_violet #6c71c4
#define S_blue #268bd2
#define S_cyan #2aa198
#define S_green #859900
*background: #002b36 *background: #002b36
*foreground: S_base00 *foreground: #657b83
*fading: 40 *fading: 40
*fadeColor: S_base03 *fadeColor: #002b36
*cursorColor: S_base1 *cursorColor: #93a1a1
*pointerColorBackground:S_base01 *pointerColorBackground:#586e75
*pointerColorForeground:S_base1 *pointerColorForeground:#93a1a1
!! black dark/light !! black dark/light
*color0: S_base02 *color0: #073642
*color8: S_base03 *color8: #002b36
!! red dark/light !! red dark/light
*color1: S_red *color1: #dc322f
*color9: S_orange *color9: #cb4b16
!! green dark/light !! green dark/light
*color2: S_green *color2: #859900
*color10: S_base01 *color10: #586e75
!! yellow dark/light !! yellow dark/light
*color3: S_yellow *color3: #b58900
*color11: S_base00 *color11: #657b83
!! blue dark/light !! blue dark/light
*color4: S_blue *color4: #268bd2
*color12: S_base0 *color12: #839496
!! magenta dark/light !! magenta dark/light
*color5: S_magenta *color5: #d33682
*color13: S_violet *color13: #6c71c4
!! cyan dark/light !! cyan dark/light
*color6: S_cyan *color6: #2aa198
*color14: S_base1 *color14: #93a1a1
!! white dark/light !! white dark/light
*color7: S_base2 *color7: #eee8d5
*color15: S_base3 *color15: #fdf6e3
! - color scheme
! urxvt.background: #000000
! urxvt.foreground: #15abc3
! ! black
! urxvt.color0: #000000
! urxvt.color8: #0d0b0c
! ! red
! urxvt.color1: #800000
! urxvt.color9: #c89490
! ! green
! urxvt.color2: #00815b
! urxvt.color10: #05e4a5
! ! yellow
! urxvt.color3: #c3ab15
! urxvt.color11: #e0c624
! ! blue
! urxvt.color4: #035390
! urxvt.color12: #029cdc
! ! purple
! urxvt.color5: #585ca8
! urxvt.color13: #9b859d
! ! cyan
! urxvt.color6: #15abc3
! urxvt.color14: #24c6e0
! ! white
! urxvt.color7: #808080
! urxvt.color15: #ececec
urxvt.internalBorder: 0 urxvt.internalBorder: 0