Commit graph

345 commits

Author SHA1 Message Date
Trevor Bramble
4b2a265baa Merge branch 'master' of github.com:sethwoodworth/solarized
Conflicts:
	vim-colors-solarized/README.mkd
2012-08-20 00:37:42 -07:00
Seth Woodworth
24a5133144 reverting the Modified date 2012-08-13 12:40:19 -04:00
Trevor Bramble
4fd7111eac Merge pull request #109 from ornicar/XresourcesForeground
Set Xresources foreground color to base0
2012-08-13 01:12:33 -07:00
Trevor Bramble
3aa521330e Add simple instructions for .Xresources setup 2012-08-13 01:05:36 -07:00
Trevor Bramble
0c5fbc71bf merge conflict resolution 2012-08-12 23:50:18 -07:00
Trevor Bramble
def3b410f0 Update vim-colors-solarized/README.mkd
Swap Xdefaults for Xresources. (Xdefaults is deprecated.)
2012-08-12 23:39:13 -07:00
Trevor Bramble
44b253658c Merge pull request #193 from dscho/master
[me] is not enough to link...
2012-08-12 23:32:55 -07:00
Trevor Bramble
e50c1fe1d1 Merge pull request #132 from juhasz/master
Markdwon fix in vim colors readme (Advanced Configuration section)
2012-08-12 23:31:10 -07:00
Trevor Bramble
74a3ea5056 Merge pull request #207 from adamnbowen/patch-1
Correct spelling of 'colorscheme' in README.
2012-08-12 22:56:30 -07:00
Trevor Bramble
58bd9db1ac Merge pull request #196 from AnthonyDiSanti/master
Fixed typo in the vim README
2012-08-12 22:55:00 -07:00
Trevor Bramble
b8d2c2b86e Merge pull request #163 from zakj/patch-1
Fix typo: "Solaris" -> "Solarized"
2012-08-12 22:54:05 -07:00
Trevor Bramble
bbd24a5581 Merge pull request #95 from jpo/master
Typos in README files
2012-08-12 22:53:02 -07:00
Seth Woodworth
b466f09442 Fix the display of a table vim README 2012-08-02 13:50:52 -03:00
Adam Bowen
a4685472be Correct spelling of 'colorscheme' in README. 2012-07-03 09:12:58 -05:00
Anthony DiSanti
b000d11317 Fixed typo in the README 2012-04-27 17:06:34 -03:00
Johannes Schindelin
702c439837 Fix link to 'me'
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2012-04-17 12:22:15 -05:00
Steve Siano
2121c4fce0 Minor documentation edit. 2012-04-11 15:38:06 -07:00
Zak Johnson
77cc649e4a Fix typo: "Solaris" -> "Solarized" 2011-12-20 13:36:23 -08:00
Márton Juhász
782b5969ae Fix markdown in Advanced Configuration section 2011-07-09 02:22:23 -07:00
Ethan Schoonover
c350650cb7 Merge branch 'master' of github.com:altercation/solarized 2011-05-09 14:46:16 -07:00
Ethan Schoonover
856f366dcb Merge commit '528a59f26d12278698bb946f8fb82a63711eec21' 2011-05-09 14:45:24 -07:00
Ethan Schoonover
528a59f26d [vim] solarized.vim menu updates 2011-05-09 14:39:01 -07:00
Ethan Schoonover
27200e9b02 Merge commit '680df556d97b69cc46b148598b7e536463847919' 2011-05-09 14:31:01 -07:00
ornicar
705fea04ad Set Xresources foreground color to base0 2011-05-06 00:41:24 -07:00
Ethan Schoonover
f16b2416f4 Merge commit '7a7e5c8818d717084730133ed6b84a3ffc9d0447' 2011-05-05 15:32:43 -07:00
Drew Neil
7a7e5c8818 [vim] add highlighting for gitcommit values (useful in fugitive)
This is a modified version of a patch from @nelstrom. Any mistakes are
my own (@altercation), the fine idea and original work is @nelstrom's.

This establishes a good default set of highlight values when viewing
the status window using @tpope's fugitive plugin.
2011-05-05 15:29:07 -07:00
Ethan Schoonover
680df556d9 Merge commit 'a8c94682fe86e556d190b8d22868538ad6149b3b' 2011-05-05 13:26:05 -07:00
Ethan Schoonover
a8c94682fe [vim] reorganized gui menu, added help links for submenus
New gui menu structure; better organized, seperators, and new
help links in submenus, particularly for visibiliy, contrast, and
experimental submenus where the purpose of those settings might not
always be intuitive.
2011-05-05 13:23:51 -07:00
Ethan Schoonover
3681b451ef Merge commit 'a7c77fa73b4f1340af242bae0dbbb269e1768a38' 2011-05-05 13:03:55 -07:00
Ethan Schoonover
a7c77fa73b [vim] fixed regression where bold was not active in gui
A test for t_Co < 16 also snagged the gui despite t_Co not
being defined in gui mode. Changed to t_Co == 8 for now,
which is the only known case requiring bold off. There may
be other t_Co values under 16 in low color terminals but I
haven't found them yet, so this should be sufficient.
2011-05-05 13:01:12 -07:00
Ethan Schoonover
8d2931e7cf Merge commit '8ee3566a413197a7414bf60c47ff2221e8ffb8e7' 2011-05-05 12:46:01 -07:00
Ethan Schoonover
8ee3566a41 [vim] new, experimental trailing space function and menu item
Visibility of listchars is handled by g:solarized_visibility
but on the cursorline they can still be hard to spot if cursorline
is on due to the cursorline background color.

This new trailing spaces function, available in the menu or via
emenu, should change the trailing space highlighting on only
the cursorline. It doesn't work in call cases as, for example,
the comments pattern in most syntaxes will override it.
2011-05-05 12:42:07 -07:00
Ethan Schoonover
a4be301d06 Merge commit '1ebc43af72ecf8499d4057b5ace63c37f84ca7d9' 2011-05-04 23:52:11 -07:00
Ethan Schoonover
1ebc43af72 [vim] modified normal/high visibility highlighting for listchars
normal visibility is now both less obnoxiously red and more visible
due to a background used on trailing whitespace.

normal is now set as default due to more acceptable highlighting.
2011-05-04 23:50:17 -07:00
Ethan Schoonover
edfc8019b5 Merge pull request #103 from tpope/vim_diff
Vim diff filetype highlighting
2011-05-04 17:49:51 -07:00
Tim Pope
f085be036b [vim] Override colors for diff filetype 2011-05-03 21:49:41 -04:00
Tim Pope
4f59544fb1 [vim] Override colors for diff filetype 2011-05-03 21:49:41 -04:00
Ethan Schoonover
b28e078015 Merge commit '54180f1a5bc7950af8c0a43a86e8146179f48eaa' 2011-05-03 13:03:04 -07:00
Ethan Schoonover
54180f1a5b [vim] conditional low-color bold formatting moved to separate var
Was previously using a conditional check at highlighting primitive
definition stage to identify low color terminals and assign standard
s:b bold value to a bright-bold primitive. This removes proper
formatting for other items such as status bar so a dedicated s:bb
bright bold is required.
2011-05-03 12:59:47 -07:00
Ethan Schoonover
001565e72c Merge commit '15059af5216fa67b92f3fdd5a4e2dadd996a211e' 2011-05-03 00:13:06 -07:00
Ethan Schoonover
15059af521 [vim] solarized.vim fix for bold colorshift in low color terminals
Turn off bold, regardless of user setting in g:solarized_bold, if
the terminal emulator reports t_Co < 16, otherwise color is distorted.
2011-05-03 00:11:07 -07:00
Ethan Schoonover
87211275bb Merge commit '2b30f611f1caf299f7f1637abe7d7b8eec058a09' 2011-05-02 10:13:49 -07:00
Ethan Schoonover
2b30f611f1 [vim] add missing solarized_menu option 2011-05-02 10:13:01 -07:00
Josh O'Rourke
71dc2c4357 Fix typos in OS X Terminal README 2011-05-01 16:28:15 -07:00
Ethan Schoonover
ce8a43aaed Merge commit '295f56b0121a9d3d40ce12e7e99ab35803cbacc6' 2011-05-01 02:16:43 -07:00
Ethan Schoonover
295f56b012 [vim] solarized.vim add new diff modes to options and menu 2011-05-01 02:16:01 -07:00
Ethan Schoonover
948aac7cb2 Merge commit 'd8aaf70840e1a00ae64585813a97d975565531eb' 2011-05-01 01:38:02 -07:00
Ethan Schoonover
d8aaf70840 [vim] solarized.vim 8 color highlighting match to 16/gui modes 2011-05-01 01:37:18 -07:00
Josh O'Rourke
e92e9708c1 Fix typo in vim README 2011-04-30 17:56:20 -07:00
Ethan Schoonover
a9ad17cc71 Merge commit '7fdec56a189191e3ea013b45d99915e455e533ec' 2011-04-30 15:08:46 -07:00