Update (2019-02-19)

maliayas · Feb 19, 2019 · 43b61fe · 43b61fe
1 parent 14a35ad
commit 43b61fe
Show file tree

Hide file tree

Showing 6 changed files with 730 additions and 69 deletions.
diff --git a/www.sublimetext.com/docs/3/color_schemes.html b/www.sublimetext.com/docs/3/color_schemes.html
@@ -340,6 +340,10 @@ <h2 id="global_settings">Global Settings</h2>
             <dd>
                 The color of the caret
             </dd>
+            <dt>block_caret</dt>
+            <dd>
+                The color of the caret when the <code>block_caret</code> setting is enabled. Defaults to the selection background color if not specified.
+            </dd>
             <dt>line_highlight</dt>
             <dd>
                 The background color of the line containing the caret. <em>Only used

diff --git a/www.sublimetext.com/docs/3/dev/color_schemes.html b/www.sublimetext.com/docs/3/dev/color_schemes.html
@@ -97,6 +97,7 @@ <h1><span>
                     <li><a href="color_schemes.html#global_settings-accents">Accents</a></li>
                     <li><a href="color_schemes.html#global_settings-css">CSS</a></li>
                     <li><a href="color_schemes.html#global_settings-gutter">Gutter</a></li>
+                    <li><a href="color_schemes.html#global_settings-diff">Diff</a></li>
                     <li><a href="color_schemes.html#global_settings-selection">Selection</a></li>
                     <li><a href="color_schemes.html#global_settings-find">Find</a></li>
                     <li><a href="color_schemes.html#global_settings-guides">Guides</a></li>
@@ -362,6 +363,10 @@ <h2 id="global_settings">Global Settings</h2>
             <dd>
                 The color of the caret
             </dd>
+            <dt>block_caret</dt>
+            <dd>
+                The color of the caret when using a block caret
+            </dd>
             <dt>line_highlight</dt>
             <dd>
                 The background color of the line containing the caret. <em>Only used
@@ -434,6 +439,31 @@ <h3 id="global_settings-gutter">Gutter</h3>
             </dd>
         </dl>
 
+        <h3 id="global_settings-diff">Diff</h3>
+        <p>
+            The diff functionality is displayed in the gutter as colored lines
+            for added and modified lines, and a triangle where lines were
+            deleted.
+        </p>
+        <dl class="enum settings">
+            <dt>line_diff_width</dt>
+            <dd>
+                The width of the diff lines, between 1 and 8
+            </dd>
+            <dt>line_diff_added</dt>
+            <dd>
+                The color of diff markers for added lines
+            </dd>
+            <dt>line_diff_modified</dt>
+            <dd>
+                The color of diff markers for modified lines
+            </dd>
+            <dt>line_diff_deleted</dt>
+            <dd>
+                The color of diff markers for deleted lines
+            </dd>
+        </dl>
+
         <h3 id="global_settings-selection">Selection</h3>
         <dl class="enum settings">
             <dt>selection</dt>
@@ -963,14 +993,42 @@ <h2 id="css_colors">Appendix: CSS Colors</h2>
         <h2 id="changelog">Changelog</h2>
 
         <dl>
+            <dt><h4>Build 3190</h4></dt>
+            <dd>
+                <ul>
+                    <li>
+                        Added the <code>block_caret</code> setting
+                    </li>
+                </ul>
+            </dd>
+            <dt><h4>Build 3189</h4></dt>
+            <dd>
+                <ul>
+                    <li>
+                        Added the <code>line_diff_added</code> and
+                        <code>line_diff_deleted</code> settings
+                    </li>
+                </ul>
+            </dd>
+            <dt><h4>Build 3186</h4></dt>
+            <dd>
+                <ul>
+                    <li>
+                        Added the <code>line_diff_modified</code> and
+                        <code>line_diff_width</code> settings
+                    </li>
+                </ul>
+            </dd>
             <dt><h4>Build 3179</h4></dt>
             <dd>
                 <ul>
                     <li>
-                        Added the <code>saturation()</code> and <code>lightness()</code> adjusters
+                        Added the <code>saturation()</code> and
+                        <code>lightness()</code> adjusters
                     </li>
                     <li>
-                        Added the <code>foreground_adjust</code> key for style rules
+                        Added the <code>foreground_adjust</code> key for style
+                        rules
                     </li>
                 </ul>
             </dd>