Resolve feature deck image merge conflict

mixxxdj · Feb 14, 2024 · 5b1d3e5 · 5b1d3e5
2 parents 6920cc3 + 5fdd0c1
commit 5b1d3e5
Show file tree

Hide file tree

Showing 11 changed files with 19 additions and 1 deletion.
diff --git a/theme/static/images/2.4/feature-effect-unit-expanded.png b/theme/static/images/2.4/feature-effect-unit-expanded.png
diff --git a/theme/static/images/2.4/screenshots/Deere_2decks_basic.png b/theme/static/images/2.4/screenshots/Deere_2decks_basic.png
diff --git a/theme/static/images/2.4/screenshots/Deere_2decks_basic_50pct.png b/theme/static/images/2.4/screenshots/Deere_2decks_basic_50pct.png
diff --git a/theme/static/images/2.4/screenshots/Latenight_2decks_basic.png b/theme/static/images/2.4/screenshots/Latenight_2decks_basic.png
diff --git a/theme/static/images/2.4/screenshots/Latenight_2decks_basic_50pct.png b/theme/static/images/2.4/screenshots/Latenight_2decks_basic_50pct.png
diff --git a/theme/static/images/2.4/screenshots/Shade_basic.png b/theme/static/images/2.4/screenshots/Shade_basic.png
diff --git a/theme/static/images/2.4/screenshots/Shade_basic_50pct.png b/theme/static/images/2.4/screenshots/Shade_basic_50pct.png
diff --git a/theme/static/images/2.4/screenshots/Tango_2decks_basic.png b/theme/static/images/2.4/screenshots/Tango_2decks_basic.png
diff --git a/theme/static/images/2.4/screenshots/Tango_2decks_basic_50pct.png b/theme/static/images/2.4/screenshots/Tango_2decks_basic_50pct.png
diff --git a/theme/templates/pages/features.html b/theme/templates/pages/features.html
@@ -119,7 +119,7 @@ <h2><a class="headline-link" href="#effects">{% trans %}Effects Chains{% endtran
   <p>
     {% trans %}Link up to three effects in a chain for a unique twist on your mix. Fine tune your sound by tweaking each parameter individually. Customize your workflow by assigning different parameters to adjust with the effect's metaknob. Focus different effects from a controller for flexible control of effect chains, whether your controller has a full effects section or a single knob.{% endtrans %}
   </p>
-  <img class="responsive drop-shadow" src="{{ SITEURL }}/theme/images/2.3/feature-effect-unit-expanded.png">
+  <img class="responsive drop-shadow" src="{{ SITEURL }}/theme/images/2.4/feature-effect-unit-expanded.png">
 </div>
 
 <div id="library" class="docs-section cover-bg">

diff --git a/theme/templates/pages/screenshots.html b/theme/templates/pages/screenshots.html
@@ -25,6 +25,24 @@ <h2>{% trans %}Mixxx 2.4{% endtrans %}</h2>
       </a>
       <figcaption>LateNight PaleMoon Skin (Default) with 4 decks</figcaption>
     </figure>
+    <figure>
+      <a href="{{ SITEURL }}/theme/images/2.4/screenshots/Deere_2decks_basic.png" target="_blank">
+        <img class="responsive drop-shadow" src="{{ SITEURL }}/theme/images/2.4/screenshots/Deere_2decks_basic_50pct.png" alt="Deere Skin with 2 decks">
+      </a>
+      <figcaption>Deere Skin with 2 decks</figcaption>
+    </figure>
+    <figure>
+      <a href="{{ SITEURL }}/theme/images/2.4/screenshots/Tango_2decks_basic.png" target="_blank">
+        <img class="responsive drop-shadow" src="{{ SITEURL }}/theme/images/2.4/screenshots/Tango_2decks_basic_50pct.png" alt="Tango Skin with 2 decks">
+      </a>
+      <figcaption>Tango Skin with 2 decks</figcaption>
+    </figure>
+    <figure>
+      <a href="{{ SITEURL }}/theme/images/2.4/screenshots/Shade_basic.png" target="_blank">
+        <img class="responsive drop-shadow" src="{{ SITEURL }}/theme/images/2.4/screenshots/Shade_basic_50pct.png" alt="Shade Skin">
+      </a>
+      <figcaption>Shade Skin</figcaption>
+    </figure>
   </div>
   <h2>{% trans %}Mixxx 2.3{% endtrans %}</h2>
   <div class="grid-container halves">