feat: updated color of diff.

meetio-theme · Feb 1, 2019 · 84a72ae · 84a72ae
1 parent df5fd8b
commit 84a72ae
Show file tree

Hide file tree

Showing 10 changed files with 411 additions and 606 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,10 +10,10 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 * Updated colors of `line_diff_modified`, `line_diff_added` and `line_diff_deleted` in scheme.
 
 ### CHANGED
-* Updated name of option `meetio_tabs_border` to `meetio_tabs_selected_border`
+* Updated name of option `meetio_tabs_border` to `meetio_tabs_selected_border`.
 
 ### BREAKING CHANGES
-* Remove `meetio_statusbar_big` option
+* Remove `meetio_statusbar_big` option.
 
 <a name="1.3.0"></a>
 ## [1.3.0](https://github.com/mauroreisvieira/meetio/compare/v1.2.0...v1.3.0) (2019-01-25)

diff --git a/Meetio.json b/Meetio.json
@@ -1,6 +1,6 @@
 {
     "variables": {
-        "color_accent": "#7dcac4",
+        "color_accent": "#80cbc4",
         "color_white": "#ffffff",
         "color_black": "#455A64",
         "font_size_sm": 11,
@@ -80,11 +80,11 @@
             "background",
             1
         ],
-        "vsc_ignored": "#a3a3a3",
-        "vsc_modified": "#c1685c",
-        "vsc_staged": "#7b88cc",
-        "vsc_unmerged": "#d33131",
-        "vsc_untracked": "#479e8e"
+        "vsc_ignored": "color(var(sidebar_label_foreground_color) alpha(0.5))",
+        "vsc_modified": "var(--bluish)",
+        "vsc_staged": "var(--yellowish)",
+        "vsc_unmerged": "var(--redish)",
+        "vsc_untracked": "var(--greenish)"
     },
     "rules": [
         {
@@ -534,40 +534,6 @@
             ],
             "layer0.opacity": 1
         },
-        {
-            "class": "fold_button_control",
-            "layer0.texture": "Meetio/assets/default/arrow_right.png",
-            "layer0.tint": "var(color_accent)",
-            "layer0.opacity": 0.4,
-            "layer0.inner_margin": 0,
-            "content_margin": [
-                12,
-                12
-            ]
-        },
-        {
-            "class": "fold_button_control",
-            "attributes": [
-                "hover"
-            ],
-            "layer0.opacity": 1,
-            "content_margin": [
-                12,
-                12
-            ]
-        },
-        {
-            "class": "fold_button_control",
-            "attributes": [
-                "expanded"
-            ],
-            "layer0.texture": "Meetio/assets/default/arrow_down.png",
-            "layer0.tint": "var(color_accent)",
-            "content_margin": [
-                12,
-                12
-            ]
-        },
         {
             "class": "dialog",
             "layer0.tint": [
@@ -576,6 +542,11 @@
             ],
             "layer0.opacity": 1
         },
+        {
+            "class": "grid_layout_control",
+            "border_color": "color(var(color_accent) blenda(var(color_black) 30%))",
+            "border_size": 2
+        },
         {
             "class": "disclosure_button_control",
             "layer0.texture": "Meetio/assets/default/disclosure.png",
@@ -730,11 +701,6 @@
                 9
             ]
         },
-        {
-            "class": "grid_layout_control",
-            "border_color": "color(var(color_accent) blenda(var(color_black) 30%))",
-            "border_size": 2
-        },
         {
             "class": "label_control",
             "fg": [
@@ -984,6 +950,23 @@
                 "interpolation": "smoothstep"
             }
         },
+        {
+            "class": "progress_bar_control",
+            "layer0.tint": [
+                "background",
+                0.94
+            ],
+            "layer0.opacity": 1
+        },
+        {
+            "class": "progress_gauge_control",
+            "layer0.tint": "var(color_accent)",
+            "layer0.opacity": 1,
+            "content_margin": [
+                0,
+                8
+            ]
+        },
         {
             "class": "mini_quick_panel_row",
             "layer0.tint": [
@@ -1093,23 +1076,6 @@
             ],
             "selected_match_fg": "var(color_accent)"
         },
-        {
-            "class": "progress_bar_control",
-            "layer0.tint": [
-                "background",
-                0.94
-            ],
-            "layer0.opacity": 1
-        },
-        {
-            "class": "progress_gauge_control",
-            "layer0.tint": "var(color_accent)",
-            "layer0.opacity": 1,
-            "content_margin": [
-                0,
-                8
-            ]
-        },
         {
             "class": "scroll_area_control",
             "settings": [
@@ -2167,6 +2133,40 @@
                 "hover"
             ],
             "layer0.opacity": 0.8
+        },
+        {
+            "class": "fold_button_control",
+            "layer0.texture": "Meetio/assets/default/arrow_right.png",
+            "layer0.tint": "var(color_accent)",
+            "layer0.opacity": 0.4,
+            "layer0.inner_margin": 0,
+            "content_margin": [
+                12,
+                12
+            ]
+        },
+        {
+            "class": "fold_button_control",
+            "attributes": [
+                "hover"
+            ],
+            "layer0.opacity": 1,
+            "content_margin": [
+                12,
+                12
+            ]
+        },
+        {
+            "class": "fold_button_control",
+            "attributes": [
+                "expanded"
+            ],
+            "layer0.texture": "Meetio/assets/default/arrow_down.png",
+            "layer0.tint": "var(color_accent)",
+            "content_margin": [
+                12,
+                12
+            ]
         }
     ]
 }
diff --git a/Meetio.sublime-theme b/Meetio.sublime-theme
@@ -1,7 +1,7 @@
 {
     "extends": "Meetio.json",
     "variables": {
-        "color_accent": "#7dcac4",
+        "color_accent": "#80cbc4",
         "color_white": "#ffffff",
         "color_black": "#455A64",
         "font_size_sm": 11,
@@ -81,10 +81,10 @@
             "background",
             1
         ],
-        "vsc_ignored": "#a3a3a3",
-        "vsc_modified": "#c1685c",
-        "vsc_staged": "#7b88cc",
-        "vsc_unmerged": "#d33131",
-        "vsc_untracked": "#479e8e"
+        "vsc_ignored": "color(var(sidebar_label_foreground_color) alpha(0.5))",
+        "vsc_modified": "var(--bluish)",
+        "vsc_staged": "var(--yellowish)",
+        "vsc_unmerged": "var(--redish)",
+        "vsc_untracked": "var(--greenish)"
     }
 }