Change merge conflict bg color and general polish

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+#### 1.0.0
+
+- Changed merge conflict background, so it's easier to see.
+- Polish for 1.0 release
+
 #### 0.2.4
 
 - Changed some box coloring conditions

README.md

@@ -18,7 +18,7 @@
   </a>
 </p>
 
-![code](https://raw.githubusercontent.com/ADMARIl/halcyon-jetbrains/master/docs/screenshots/main_shadow.png)
+![code](docs/screenshots/main_shadow.png)
 *Due to the way JetBrains handles syntax highlighting, there are some slight differences in coloring from the original.*
 
 ## Installation via JetBrains
@@ -30,7 +30,7 @@
 5. Restart the IDE when prompted
 6. If the theme isn't automatically chosen, go to `File → Settings → Appearance & Behavior → Appearance → Theme →` **Halcyon**
 
-![settings](https://raw.githubusercontent.com/ADMARIl/halcyon-jetbrains/master/docs/screenshots/settings_shadow.png)
+![settings](docs/screenshots/settings_shadow.png)
 
 ## Manual Installation
 
@@ -73,8 +73,9 @@ While the IDE should prompt you when an update is available, there is occasional
 
 ## Please Consider Contributing!
 
-I know I haven't covered all the languages. Please feel free to contribute!
+- I know I haven't covered all the languages. Please feel free to contribute!
 Pull requests are always welcome. For major changes, please open an issue first to discuss what you would like to change.
+- Have change or addition you'd like to see? Open an issue!
 
 
 ###### Many thanks to [Brittany Chiang](https://github.com/bchiang7) whose existing work was incredibly helpful in the creation of this theme.

build.gradle

@@ -4,7 +4,7 @@ plugins {
 }
 
 group 'com.ADMARIl'
-version '0.2.4'
+version '1.0.0'
 
 sourceCompatibility = 1.8
 

docs/CHANGELOG.html

@@ -1,3 +1,8 @@
+<h4>1.0.0</h4>
+<ul>
+    <li>Changed merge conflict background, so it's easier to see.</li>
+    <li>Polish for 1.0 release.</li>
+</ul>
 <h4>0.2.4</h4>
 <ul>
     <li>Changed some box coloring conditions.</li>
@@ -8,12 +13,5 @@ <h4>0.2.3</h4>
 <ul>
     <li>Lightened default line comment color based on user feedback.</li>
 </ul>
-<h4>0.2.2</h4>
-<ul>
-    <li>Removed most of the menu borders</li>
-    <li>Fixed gutter background not applying</li>
-    <li>Changed indentation guide colors</li>
-    <li>Added plugin icon</li>
-</ul>
 <p>...</p><br>
 <p>View the full changelog on the <a href="https://github.com/ADMARIl/halcyon-jetbrains/blob/master/CHANGELOG.md" target="_blank" rel="nofollow">GitHub repo</a>.</p>

src/main/resources/Halcyon.xml

@@ -170,7 +170,7 @@
         </option>
         <option name="DIFF_CONFLICT">
             <value>
-                <option name="BACKGROUND" value="b8894d" />
+                <option name="BACKGROUND" value="824121" />
                 <option name="ERROR_STRIPE_COLOR" value="ffcc66" />
             </value>
         </option>

src/main/resources/META-INF/plugin.xml

@@ -5,11 +5,12 @@
 
     <description><![CDATA[
     <p>A minimal, dark blue theme for the JetBrains suite of IDEs based on
-    <a href="https://github.com/bchiang7/halcyon-vscode">Brittany Chiang's VSCode theme</a>.
+    <a href="https://github.com/bchiang7/halcyon-vscode">Brittany Chiang's VSCode theme</a>. Please consider leaving a review for this theme!
     </p>
     <br/>
     <p><a target="_blank" rel="noopener noreferrer" href="https://raw.githubusercontent.com/ADMARIl/halcyon-jetbrains/master/docs/screenshots/main_shadow.png"><img src="https://raw.githubusercontent.com/ADMARIl/halcyon-jetbrains/master/docs/screenshots/main_shadow.png" alt="code" style="max-width:100%;"></a>
-<em>Due to the way JetBrains handles syntax highlighting, there are some slight differences in coloring from the original.</em></p>
+    <br/>
+    <em>Due to the way JetBrains handles syntax highlighting, there are some slight differences in coloring from the original.</em></p>
     <br/>
     <h2>Setup</h2>
     <ol>