feat: updated buttons.

meetio-theme · Jan 17, 2019 · 3395fe1 · 3395fe1
1 parent e1f278a
commit 3395fe1
Show file tree

Hide file tree

Showing 6 changed files with 50 additions and 45 deletions.
diff --git a/Meetio-Darker.sublime-theme b/Meetio-Darker.sublime-theme
@@ -11,7 +11,7 @@
         "tabset_width": 180,
         "tabset_min_width": 74,
         "tabset_height": 40,
-        "tabset_height_lg": 52,
+        "tabset_height_large": 52,
         "vsc_untracked": "#479e8e",
         "vsc_modified": "#c1685c",
         "vsc_staged": "#7b88cc",
@@ -22,6 +22,10 @@
             0.5
         ],
         "button_background_color_hover": "var(color_accent)",
+        "button_min_size": [
+            80,
+            28
+        ],
         "status_label_foreground_color": "var(color_white)",
         "status_bar_background_color": "color(var(color_accent) blenda(var(color_black) 30%))"
     },
@@ -93,26 +97,23 @@
                 6,
                 10
             ],
-            "min_size": [
-                80,
-                28
-            ]
+            "min_size": "var(button_min_size)"
         },
         {
             "class": "button_control",
             "attributes": [
                 "hover"
             ],
-            "layer0.tint": "var(color_accent)",
-            "layer0.opacity": 0.1
+            "layer0.tint": "var(button_background_color_hover)",
+            "layer0.opacity": 0.05
         },
         {
             "class": "button_control",
             "attributes": [
                 "pressed"
             ],
             "layer0.opacity": {
-                "target": 0.2,
+                "target": 0.1,
                 "speed": 4,
                 "interpolation": "smoothstep"
             }
@@ -146,7 +147,7 @@
         {
             "class": "icon_regex",
             "layer0.texture": "Meetio/assets/default/icon_regex.png",
-            "layer0.tint": "var(button_background_color_hover)",
+            "layer0.tint": "var(color_accent)",
             "layer0.opacity": {
                 "target": 0.5,
                 "speed": 5,
@@ -1683,7 +1684,7 @@
             "settings": [
                 "meetio_tabs_big"
             ],
-            "tab_height": "var(tabset_height_lg)"
+            "tab_height": "var(tabset_height_large)"
         },
         {
             "class": "tab_control",

diff --git a/Meetio-Lighter.sublime-theme b/Meetio-Lighter.sublime-theme
@@ -11,7 +11,7 @@
         "tabset_width": 180,
         "tabset_min_width": 74,
         "tabset_height": 40,
-        "tabset_height_lg": 52,
+        "tabset_height_large": 52,
         "vsc_untracked": "#479e8e",
         "vsc_modified": "#c1685c",
         "vsc_staged": "#7b88cc",
@@ -22,6 +22,10 @@
             0.5
         ],
         "button_background_color_hover": "var(color_accent)",
+        "button_min_size": [
+            80,
+            28
+        ],
         "status_label_foreground_color": "var(color_white)",
         "status_bar_background_color": "color(var(color_accent) blenda(var(color_black) 30%))"
     },
@@ -93,26 +97,23 @@
                 6,
                 10
             ],
-            "min_size": [
-                80,
-                28
-            ]
+            "min_size": "var(button_min_size)"
         },
         {
             "class": "button_control",
             "attributes": [
                 "hover"
             ],
-            "layer0.tint": "var(color_accent)",
-            "layer0.opacity": 0.1
+            "layer0.tint": "var(button_background_color_hover)",
+            "layer0.opacity": 0.05
         },
         {
             "class": "button_control",
             "attributes": [
                 "pressed"
             ],
             "layer0.opacity": {
-                "target": 0.2,
+                "target": 0.1,
                 "speed": 4,
                 "interpolation": "smoothstep"
             }
@@ -146,7 +147,7 @@
         {
             "class": "icon_regex",
             "layer0.texture": "Meetio/assets/default/icon_regex.png",
-            "layer0.tint": "var(button_background_color_hover)",
+            "layer0.tint": "var(color_accent)",
             "layer0.opacity": {
                 "target": 0.5,
                 "speed": 5,
@@ -1683,7 +1684,7 @@
             "settings": [
                 "meetio_tabs_big"
             ],
-            "tab_height": "var(tabset_height_lg)"
+            "tab_height": "var(tabset_height_large)"
         },
         {
             "class": "tab_control",

diff --git a/Meetio-Palenight.sublime-theme b/Meetio-Palenight.sublime-theme
@@ -11,7 +11,7 @@
         "tabset_width": 180,
         "tabset_min_width": 74,
         "tabset_height": 40,
-        "tabset_height_lg": 52,
+        "tabset_height_large": 52,
         "vsc_untracked": "#479e8e",
         "vsc_modified": "#c1685c",
         "vsc_staged": "#7b88cc",
@@ -22,6 +22,10 @@
             0.5
         ],
         "button_background_color_hover": "var(color_accent)",
+        "button_min_size": [
+            80,
+            28
+        ],
         "status_label_foreground_color": "var(color_white)",
         "status_bar_background_color": "color(var(color_accent) blenda(var(color_black) 30%))"
     },
@@ -93,26 +97,23 @@
                 6,
                 10
             ],
-            "min_size": [
-                80,
-                28
-            ]
+            "min_size": "var(button_min_size)"
         },
         {
             "class": "button_control",
             "attributes": [
                 "hover"
             ],
-            "layer0.tint": "var(color_accent)",
-            "layer0.opacity": 0.1
+            "layer0.tint": "var(button_background_color_hover)",
+            "layer0.opacity": 0.05
         },
         {
             "class": "button_control",
             "attributes": [
                 "pressed"
             ],
             "layer0.opacity": {
-                "target": 0.2,
+                "target": 0.1,
                 "speed": 4,
                 "interpolation": "smoothstep"
             }
@@ -146,7 +147,7 @@
         {
             "class": "icon_regex",
             "layer0.texture": "Meetio/assets/default/icon_regex.png",
-            "layer0.tint": "var(button_background_color_hover)",
+            "layer0.tint": "var(color_accent)",
             "layer0.opacity": {
                 "target": 0.5,
                 "speed": 5,
@@ -1683,7 +1684,7 @@
             "settings": [
                 "meetio_tabs_big"
             ],
-            "tab_height": "var(tabset_height_lg)"
+            "tab_height": "var(tabset_height_large)"
         },
         {
             "class": "tab_control",

diff --git a/Meetio.sublime-theme b/Meetio.sublime-theme
@@ -11,7 +11,7 @@
         "tabset_width": 180,
         "tabset_min_width": 74,
         "tabset_height": 40,
-        "tabset_height_lg": 52,
+        "tabset_height_large": 52,
         "vsc_untracked": "#479e8e",
         "vsc_modified": "#c1685c",
         "vsc_staged": "#7b88cc",
@@ -22,6 +22,10 @@
             0.5
         ],
         "button_background_color_hover": "var(color_accent)",
+        "button_min_size": [
+            80,
+            28
+        ],
         "status_label_foreground_color": "var(color_white)",
         "status_bar_background_color": "color(var(color_accent) blenda(var(color_black) 30%))"
     },
@@ -93,26 +97,23 @@
                 6,
                 10
             ],
-            "min_size": [
-                80,
-                28
-            ]
+            "min_size": "var(button_min_size)"
         },
         {
             "class": "button_control",
             "attributes": [
                 "hover"
             ],
-            "layer0.tint": "var(color_accent)",
-            "layer0.opacity": 0.1
+            "layer0.tint": "var(button_background_color_hover)",
+            "layer0.opacity": 0.05
         },
         {
             "class": "button_control",
             "attributes": [
                 "pressed"
             ],
             "layer0.opacity": {
-                "target": 0.2,
+                "target": 0.1,
                 "speed": 4,
                 "interpolation": "smoothstep"
             }
@@ -146,7 +147,7 @@
         {
             "class": "icon_regex",
             "layer0.texture": "Meetio/assets/default/icon_regex.png",
-            "layer0.tint": "var(button_background_color_hover)",
+            "layer0.tint": "var(color_accent)",
             "layer0.opacity": {
                 "target": 0.5,
                 "speed": 5,
@@ -1683,7 +1684,7 @@
             "settings": [
                 "meetio_tabs_big"
             ],
-            "tab_height": "var(tabset_height_lg)"
+            "tab_height": "var(tabset_height_large)"
         },
         {
             "class": "tab_control",

diff --git a/src/themes/default/buttons.json b/src/themes/default/buttons.json
@@ -5,18 +5,18 @@
         "layer0.opacity": { "target": 0.6, "speed": 4.0, "interpolation": "smoothstep" },
         "layer0.inner_margin": [6, 6],
         "content_margin": [6, 10, 6, 10],
-        "min_size": [80, 28]
+        "min_size": "var(button_min_size)"
     },
     {
         "class": "button_control",
         "attributes": ["hover"],
-        "layer0.tint": "var(color_accent)",
-        "layer0.opacity": 0.1
+        "layer0.tint": "var(button_background_color_hover)",
+        "layer0.opacity": 0.05
     },
     {
         "class": "button_control",
         "attributes": ["pressed"],
-        "layer0.opacity": { "target": 0.2, "speed": 4.0, "interpolation": "smoothstep" }
+        "layer0.opacity": { "target": 0.1, "speed": 4.0, "interpolation": "smoothstep" }
     },
     {
         "class": "icon_button_group",
@@ -39,7 +39,7 @@
     {
         "class": "icon_regex",
         "layer0.texture": "Meetio/assets/default/icon_regex.png",
-        "layer0.tint": "var(button_background_color_hover)",
+        "layer0.tint": "var(color_accent)",
         "layer0.opacity": { "target": 0.5, "speed": 5.0, "interpolation": "smoothstep" },
         "content_margin": [12, 12]
     },

diff --git a/src/themes/variables.json b/src/themes/variables.json
@@ -18,6 +18,7 @@
     "vsc_ignored"                   : "#a3a3a3",
     "button_background_color"       : ["background", 0.5],
     "button_background_color_hover" : "var(color_accent)",
+    "button_min_size"               : [80, 28],
     "status_label_foreground_color" : "var(color_white)",
     "status_bar_background_color"   : "color(var(color_accent) blenda(var(color_black) 30%))"
 }