# HG changeset patch # User Steve Losh # Date 1577137189 18000 # Node ID c215b17e26a3a7b47deae836a66ae776e4614dcc # Parent a42efacba24313dbdd7aec70a673b46b1ffd21d6 splice.vim: Update site. diff -r a42efacba243 -r c215b17e26a3 splice.vim/_dmedia/goodwolf.css --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/splice.vim/_dmedia/goodwolf.css Mon Dec 23 16:39:49 2019 -0500 @@ -0,0 +1,62 @@ +/* @override http://localhost:8080/media/css/pygments-monokai-light.css */ +div.highlight .hll { background-color: #FFD7EF; display: block; } +div.highlight .err { color: #fff; background-color: #f00 } /* Error */ +div.highlight .gi { font-weight: bold } /* Diff Insert */ +div.highlight .gd { font-weight: bold } /* Diff Delete */ +div.highlight .k { color: #111} /* Keyword */ +div.highlight .l { color: #111 } /* Literal */ +div.highlight .n { color: #111 } /* Name */ +div.highlight .o { color: #111 } /* Operator */ +div.highlight .p { color: #111 } /* Punctuation */ +div.highlight .c { color: #714678; font-style: italic; font-weight: bold; } /* Comment */ +div.highlight .cm { color: #714678; font-style: italic; font-weight: bold; } /* Comment.Multiline */ +div.highlight .cp { color: #714678; font-style: italic; font-weight: bold; } /* Comment.Preproc */ +div.highlight .c1 { color: #714678; font-style: italic; font-weight: bold; } /* Comment.Single */ +div.highlight .cs { color: #714678; font-style: italic; font-weight: bold; } /* Comment.Special */ +div.highlight .ge { font-style: italic } /* Generic.Emph */ +div.highlight .gs { font-weight: bold } /* Generic.Strong */ +div.highlight .kc { color: #111 } /* Keyword.Constant */ +div.highlight .kd { color: #111 } /* Keyword.Declaration */ +div.highlight .kn { color: #111 } /* Keyword.Namespace */ +div.highlight .kp { color: #111 } /* Keyword.Pseudo */ +div.highlight .kr { color: #111 } /* Keyword.Reserved */ +div.highlight .kt { color: #111 } /* Keyword.Type */ +div.highlight .ld { color: #111 } /* Literal.Date */ +div.highlight .m { color: #111 } /* Literal.Number */ +div.highlight .s { color: #111; font-style: italic; } /* Literal.String */ +div.highlight .na { color: #111 } /* Name.Attribute */ +div.highlight .nb { color: #111 } /* Name.Builtin */ +div.highlight .nc { color: #111 } /* Name.Class */ +div.highlight .no { color: #111 } /* Name.Constant */ +div.highlight .nd { color: #111 } /* Name.Decorator */ +div.highlight .ni { color: #111 } /* Name.Entity */ +div.highlight .ne { color: #111 } /* Name.Exception */ +div.highlight .nf { color: #111} /* Name.Function */ +div.highlight .nl { color: #111 } /* Name.Label */ +div.highlight .nn { color: #111} /* Name.Namespace */ +div.highlight .nx { color: #111 } /* Name.Other */ +div.highlight .py { color: #111 } /* Name.Property */ +div.highlight .nt { color: #111 } /* Name.Tag */ +div.highlight .nv { color: #111 } /* Name.Variable */ +div.highlight .ow { color: #111 } /* Operator.Word */ +div.highlight .w { color: #111 } /* Text.Whitespace */ +div.highlight .mf { color: #111 } /* Literal.Number.Float */ +div.highlight .mh { color: #111 } /* Literal.Number.Hex */ +div.highlight .mi { color: #111 } /* Literal.Number.Integer */ +div.highlight .mo { color: #111 } /* Literal.Number.Oct */ +div.highlight .sb { color: #111 } /* Literal.String.Backtick */ +div.highlight .sc { color: #111 } /* Literal.String.Char */ +div.highlight .sd { color: #111 } /* Literal.String.Doc */ +div.highlight .s2 { color: #111 } /* Literal.String.Double */ +div.highlight .se { color: #111 } /* Literal.String.Escape */ +div.highlight .sh { color: #111 } /* Literal.String.Heredoc */ +div.highlight .si { color: #111 } /* Literal.String.Interpol */ +div.highlight .sx { color: #111 } /* Literal.String.Other */ +div.highlight .sr { color: #111 } /* Literal.String.Regex */ +div.highlight .s1 { color: #111 } /* Literal.String.Single */ +div.highlight .ss { color: #111 } /* Literal.String.Symbol */ +div.highlight .bp { color: #111 } /* Name.Builtin.Pseudo */ +div.highlight .vc { color: #111 } /* Name.Variable.Class */ +div.highlight .vg { color: #111 } /* Name.Variable.Global */ +div.highlight .vi { color: #111 } /* Name.Variable.Instance */ +div.highlight .il { color: #111 } /* Literal.Number.Integer.Long */ diff -r a42efacba243 -r c215b17e26a3 splice.vim/_dmedia/style.less --- a/splice.vim/_dmedia/style.less Mon Dec 23 16:32:33 2019 -0500 +++ b/splice.vim/_dmedia/style.less Mon Dec 23 16:39:49 2019 -0500 @@ -2,11 +2,11 @@ overflow-y: scroll; } .wrap { - width: 600px; + width: 640px; margin: 40px auto 180px; } body { - font-size: 18px; + font-size: 16px; line-height: 1.4; font-family: Georgia, Palatino, "Palatino Linotype", serif; color: #111111; @@ -27,11 +27,11 @@ } } h1 { - font-size: 48px; + font-size: 40px; line-height: 1; } h2 { - font-size: 34px; + font-size: 28px; line-height: 1; margin-top: 40px; margin-bottom: 0; @@ -44,7 +44,7 @@ } } h3 { - font-size: 26px; + font-size: 22px; line-height: 1; margin-top: 40px; margin-bottom: 0; @@ -57,7 +57,7 @@ } } h4 { - font-size: 20px; + font-size: 18px; line-height: 1; margin-top: 30px; margin-bottom: 0; @@ -83,7 +83,7 @@ } } pre { - font-size: 15px; + font-size: 14px; line-height: 1.3; white-space: pre; overflow-x: auto; @@ -93,7 +93,7 @@ font-family: Menlo, Monaco, Consolas, monospace; } code { - font-size: 15px; + font-size: 14px; border: 1px solid #fdd; background: #fffafa; padding: 1px 4px; diff -r a42efacba243 -r c215b17e26a3 splice.vim/_dmedia/tango.css --- a/splice.vim/_dmedia/tango.css Mon Dec 23 16:32:33 2019 -0500 +++ b/splice.vim/_dmedia/tango.css Mon Dec 23 16:39:49 2019 -0500 @@ -1,6 +1,6 @@ .codehilite .hll { background-color: #ffffcc } .codehilite .c { color: #8f5902; font-style: italic } /* Comment */ -.codehilite .err { color: #a40000; border: 1px solid #ef2929 } /* Error */ +.codehilite .err { color: #000000; } /* Error */ .codehilite .g { color: #000000 } /* Generic */ .codehilite .k { color: #204a87; font-weight: bold } /* Keyword */ .codehilite .l { color: #000000 } /* Literal */ @@ -61,7 +61,7 @@ .codehilite .sx { color: #4e9a06 } /* Literal.String.Other */ .codehilite .sr { color: #4e9a06 } /* Literal.String.Regex */ .codehilite .s1 { color: #4e9a06 } /* Literal.String.Single */ -.codehilite .ss { color: #4e9a06 } /* Literal.String.Symbol */ +.codehilite .ss { color: #000000 } /* Literal.String.Symbol */ .codehilite .bp { color: #3465a4 } /* Name.Builtin.Pseudo */ .codehilite .vc { color: #000000 } /* Name.Variable.Class */ .codehilite .vg { color: #000000 } /* Name.Variable.Global */ diff -r a42efacba243 -r c215b17e26a3 splice.vim/index.html --- a/splice.vim/index.html Mon Dec 23 16:32:33 2019 -0500 +++ b/splice.vim/index.html Mon Dec 23 16:39:49 2019 -0500 @@ -15,14 +15,16 @@

Splice is a Vim plugin for resolving three-way merges. It's inspired by Adobe Lightroom's user interface. Watch the demo screencast in HD on Vimeo to get an idea of how it works.

-

Full Documentation: :help splice
-Source (Mercurial): http://bitbucket.org/sjl/splice.vim
-Source (Git): http://github.com/sjl/splice.vim
-Issues: http://github.com/sjl/splice.vim/issues
-License: MIT/X11

Table of Contents

  1. Installation
+

Table of Contents

  1. Installation
+


Rochester Made

diff -r a42efacba243 -r c215b17e26a3 splice.vim/installation/index.html --- a/splice.vim/installation/index.html Mon Dec 23 16:32:33 2019 -0500 +++ b/splice.vim/installation/index.html Mon Dec 23 16:39:49 2019 -0500 @@ -24,13 +24,13 @@

Vim Plugin

Use Pathogen to install the plugin from your choice of repositories:

-
hg clone https://bitbucket.org/sjl/splice.vim ~/.vim/bundle/splice
+
hg clone https://hg.sr.ht/~sjl/splice.vim ~/.vim/bundle/splice
 git clone https://github.com/sjl/splice.vim.git ~/.vim/bundle/splice
 

 
 
 
Build the docs:

-
:call pathogen#helptags()
+
:call pathogen#helptags()
 

 
 
@@ -39,7 +39,7 @@
 system to use it as a merge tool.

 
Mercurial

 
Add the following lines to ~/.hgrc:

-
[merge-tools]
+
[merge-tools]
 splice.executable = mvim
 splice.args = -f $base $local $other $output -c 'SpliceInit'
 splice.premerge = keep
@@ -50,7 +50,7 @@
 
Note: replace mvim with gvim if you're on Linux, or just plain vim if you prefer to keep the editor in the console.

 
Git

 
Add the following lines to ~/.gitconfig:

-
[merge]
+
[merge]
 tool = splice
 
 [mergetool "splice"]
@@ -62,24 +62,24 @@
 
Note: replace mvim with gvim if you're on Linux, or just plain vim if you prefer to keep the editor in the console.

 
Bazaar

 
For Bazaar 2.4 or greater, add the following line to bazaar.conf:

-
bzr.mergetool.splice = mvim {base} {this} {other} {result} -c 'SpliceInit'
+
bzr.mergetool.splice = mvim {base} {this} {other} {result} -c 'SpliceInit'
 

 
 
 
Optionally, change the default merge tool by setting:

-
bzr.default_mergetool = splice
+
bzr.default_mergetool = splice
 

 
 
 
For earlier versions of Bazaar, set the following entry in bazaar.conf:

-
external_merge = mvim %b %t %o %r -c 'SpliceInit'
+
external_merge = mvim %b %t %o %r -c 'SpliceInit'
 

 
 
 
Note: replace mvim with gvim if you're on Linux, or just plain vim if you prefer to keep the editor in the console.

                 

             
+

Rochester Made

         

     
 
\ No newline at end of file