Merge conflict fix

- updated blending style constants
wled · Jan 24, 2025 · e7c0ce7 · e7c0ce7
1 parent f2caf14
commit e7c0ce7
Showing 1 changed file with 15 additions and 15 deletions.
diff --git a/wled00/data/index.htm b/wled00/data/index.htm
@@ -128,7 +128,7 @@
 		<div style="padding: 8px 0;" id="btns">
 			<button class="btn btn-xs" title="File editor" type="button" id="edit" onclick="window.location.href=getURL('/edit')"><i class="icons btn-icon">&#xe2c6;</i></button>
 			<button class="btn btn-xs" title="Pixel Magic Tool" type="button" id="pxmb" onclick="window.location.href=getURL('/pxmagic.htm')"><i class="icons btn-icon">&#xe410;</i></button>
-			<button class="btn btn-xs" title="Add custom palette" type="button" onclick="window.location.href=getURL('/cpal.htm')"><i class="icons btn-icon">&#xe18a;</i></button>
+			<button class="btn btn-xs" title="Add custom palette" type="button" id="adPal" onclick="window.location.href=getURL('/cpal.htm')"><i class="icons btn-icon">&#xe18a;</i></button>
 			<button class="btn btn-xs" title="Remove last custom palette" type="button" id="rmPal" onclick="palettesData=null;localStorage.removeItem('wledPalx');requestJson({rmcpal:true});setTimeout(loadPalettes,250,loadPalettesData);"><i class="icons btn-icon">&#xe037;</i></button>
 		</div>
 		<p class="labels hd" id="pall"><i class="icons sel-icon" onclick="tglHex()">&#xe2b3;</i> Color palette</p>
@@ -273,20 +273,20 @@
 				<option value="1">Fairy Dust</option>
 				<option value="2">Swipe right</option>
 				<option value="3">Swipe left</option>
-				<option value="4">Push right</option>
-				<option value="5">Push left</option>
-				<option value="6">Pinch-out</option>
-				<option value="7">Inside-out</option>
-				<option value="8" data-type="2D">Swipe up</option>
-				<option value="9" data-type="2D">Swipe down</option>
-				<option value="10" data-type="2D">Open V</option>
-				<option value="11" data-type="2D">Open H</option>
-				<option value="12" data-type="2D">Push up</option>
-				<option value="13" data-type="2D">Push down</option>
-				<option value="14" data-type="2D">Push TL</option>
-				<option value="15" data-type="2D">Push TR</option>
-				<option value="16" data-type="2D">Push BR</option>
-				<option value="17" data-type="2D">Push BL</option>
+				<option value="16">Push right</option>
+				<option value="17">Push left</option>
+				<option value="4">Pinch-out</option>
+				<option value="5">Inside-out</option>
+				<option value="6" data-type="2D">Swipe up</option>
+				<option value="7" data-type="2D">Swipe down</option>
+				<option value="8" data-type="2D">Open H</option>
+				<option value="9" data-type="2D">Open V</option>
+				<option value="18" data-type="2D">Push up</option>
+				<option value="19" data-type="2D">Push down</option>
+				<option value="20" data-type="2D">Push TL</option>
+				<option value="21" data-type="2D">Push TR</option>
+				<option value="22" data-type="2D">Push BR</option>
+				<option value="23" data-type="2D">Push BL</option>
 			</select>
 		</p>
 		<p id="ledmap" class="hide"></p>