Fix Mixbus action fc83d044f8 & 65bda27d4 rebase ordering

[ardour.git] / gtk2_ardour / themes / dark-ardour.colors

diff --git a/gtk2_ardour/themes/dark-ardour.colors b/gtk2_ardour/themes/dark-ardour.colors
index ced8ae8520b089ccf5480df1c49fc265da283bd7..d8fd0bee4420efbaa8794f549c7a42d4b1ad5e39 100644 (file)
--- a/gtk2_ardour/themes/dark-ardour.colors
+++ b/gtk2_ardour/themes/dark-ardour.colors
@@ -30,7 +30,7 @@
     <Color name="color 3" value="0x738299ff"/>
     <Color name="color 30" value="0xe500cfff"/>
     <Color name="color 31" value="0xddddd8ff"/>
-    <Color name="color 32" value="0xeddc3d77"/>
+    <Color name="color 32" value="0xeddc3dff"/>
     <Color name="color 33" value="0xbbbbbbff"/>
     <Color name="color 34" value="0x3d3d3dff"/>
     <Color name="color 35" value="0x4250d0ff"/>
@@ -114,6 +114,12 @@
     <Color name="meter color7" value="0xff8800ff"/>
     <Color name="meter color8" value="0xff0000ff"/>
     <Color name="meter color9" value="0xff0000ff"/>
+    <Color name="midi color0" value="0x1e7727ff"/>
+    <Color name="midi color1" value="0x52af25ff"/>
+    <Color name="midi color2" value="0x85e524ff"/>
+    <Color name="midi color3" value="0xcbba0fff"/>
+    <Color name="midi color4" value="0xe2ab09ff"/>
+    <Color name="midi color5" value="0xff9900ff"/>
   </Colors>
   <ColorAliases>
     <ColorAlias name="active crossfade" alias="color 1"/>
@@ -236,8 +242,9 @@
     <ColorAlias name="master monitor section button normal: fill active" alias="color 42"/>
     <ColorAlias name="master monitor section button active: fill"        alias="color 40"/>
     <ColorAlias name="master monitor section button active: fill active" alias="color 54"/>
-    <ColorAlias name="measure line bar" alias="color 13"/>
-    <ColorAlias name="measure line beat" alias="color 33"/>
+    <ColorAlias name="grid line major" alias="color 13"/>
+    <ColorAlias name="grid line minor" alias="color 62"/>
+    <ColorAlias name="grid line micro" alias="color 62"/>
     <ColorAlias name="meter background bottom" alias="color 46"/>
     <ColorAlias name="meter background top" alias="color 34"/>
     <ColorAlias name="meter bar" alias="color 7"/>
@@ -267,21 +274,17 @@
     <ColorAlias name="midi frame base" alias="color 87"/>
     <ColorAlias name="midi input button: fill active" alias="color 48"/>
     <ColorAlias name="midi input button: led active" alias="color 4"/>
-    <ColorAlias name="midi meter color0" alias="color 52"/>
-    <ColorAlias name="midi meter color1" alias="color 53"/>
-    <ColorAlias name="midi meter color2" alias="color 53"/>
-    <ColorAlias name="midi meter color3" alias="color 54"/>
-    <ColorAlias name="midi meter color4" alias="color 54"/>
-    <ColorAlias name="midi meter color5" alias="color 55"/>
-    <ColorAlias name="midi meter color6" alias="color 55"/>
-    <ColorAlias name="midi meter color7" alias="color 56"/>
-    <ColorAlias name="midi meter color8" alias="color 56"/>
-    <ColorAlias name="midi meter color9" alias="color 17"/>
+    <ColorAlias name="midi meter color0" alias="midi color0"/>
+    <ColorAlias name="midi meter color1" alias="midi color1"/>
+    <ColorAlias name="midi meter color2" alias="midi color1"/>
+    <ColorAlias name="midi meter color3" alias="midi color2"/>
+    <ColorAlias name="midi meter color4" alias="midi color2"/>
+    <ColorAlias name="midi meter color5" alias="midi color3"/>
+    <ColorAlias name="midi meter color6" alias="midi color3"/>
+    <ColorAlias name="midi meter color7" alias="midi color4"/>
+    <ColorAlias name="midi meter color8" alias="midi color4"/>
+    <ColorAlias name="midi meter color9" alias="midi color5"/>
     <ColorAlias name="midi note inactive channel" alias="color 4"/>
-    <ColorAlias name="midi note max" alias="color 8"/>
-    <ColorAlias name="midi note mid" alias="color 96"/>
-    <ColorAlias name="midi note min" alias="color 103"/>
-    <ColorAlias name="midi note selected" alias="color 40"/>
     <ColorAlias name="midi note selected outline" alias="color 9"/>
     <ColorAlias name="midi note velocity text" alias="color 32"/>
     <ColorAlias name="midi patch change fill" alias="color 60"/>
@@ -335,13 +338,17 @@
     <ColorAlias name="nudge clock: text" alias="color 49"/>
     <ColorAlias name="page switch button: fill active" alias="color 92"/>
     <ColorAlias name="page switch button: fill" alias="color 94"/>
+    <ColorAlias name="patch change button: fill active" alias="color 74"/>
+    <ColorAlias name="patch change button: fill" alias="color 25"/>
+    <ColorAlias name="patch change dim button: fill active" alias="color 74"/>
+    <ColorAlias name="patch change dim button: fill" alias="color 46"/>
+    <ColorAlias name="patch change dim button: text" alias="color 92"/>
     <ColorAlias name="piano roll black" alias="color 76"/>
     <ColorAlias name="piano roll black outline" alias="color 33"/>
     <ColorAlias name="piano roll white" alias="color 45"/>
     <ColorAlias name="play head" alias="color 9"/>
     <ColorAlias name="plugin bypass button: led active" alias="color 8"/>
-    <ColorAlias name="pluginlist hide button: led active" alias="color 14"/>
-    <ColorAlias name="pluginlist filter button: fill active" alias="color 14"/>
+    <ColorAlias name="pluginlist filter button: led active" alias="color 8"/>
     <ColorAlias name="pluginui toggle: fill" alias="color 71"/>
     <ColorAlias name="pluginui toggle: fill active" alias="color 9"/>
     <ColorAlias name="processor automation line" alias="color 77"/>
@@ -503,6 +510,7 @@
   <Modifiers>
     <Modifier name="audio bus base" modifier="= alpha:0.3"/>
     <Modifier name="audio track base" modifier="= alpha:0.3"/>
+    <Modifier name="automation line fill" modifier="= alpha:0.3"/>
     <Modifier name="automation track fill" modifier="= alpha:0.3"/>
     <Modifier name="covered region base" modifier="= alpha:0.7"/>
     <Modifier name="crossfade alpha" modifier="= alpha:0.1803"/>
@@ -514,7 +522,7 @@
     <Modifier name="inactive crossfade" modifier="= alpha:0.4666"/>
     <Modifier name="loop rectangle" modifier="= alpha:0.5"/>
     <Modifier name="marker bar" modifier="= alpha:0.5"/>
-    <Modifier name="measure line beat" modifier="= alpha:1.0"/>
+    <Modifier name="grid line" modifier="= alpha:1.0"/>
     <Modifier name="midi frame base" modifier="= alpha:0.4"/>
     <Modifier name="midi note" modifier="= alpha:0.8"/>
     <Modifier name="midi note velocity text" modifier="= alpha:0.4666"/>