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 cb7844eace074b4f573d7381287b0da7de8a33cf..d8fd0bee4420efbaa8794f549c7a42d4b1ad5e39 100644 (file)
--- a/gtk2_ardour/themes/dark-ardour.colors
+++ b/gtk2_ardour/themes/dark-ardour.colors
@@ -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 62"/>
+    <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"/>
@@ -519,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"/>