Triples: Make Shift button an actual button

smogon · Nov 24, 2024 · 72d1216 · 72d1216
1 parent e4c54ac
commit 72d1216
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/play.pokemonshowdown.com/js/client-battle.js b/play.pokemonshowdown.com/js/client-battle.js
@@ -761,7 +761,12 @@
 
 				var shiftControls = '';
 				if (this.battle.gameType === 'triples' && pos !== 1) {
-					shiftControls += '<div class="shiftselect"><button name="chooseShift">Shift</button></div>';
+					shiftControls = (
+						'<div class="shiftcontrols">' +
+						'<div class="shiftselect"><button name="chooseShift">Shift</button></div>' +
+						'<div class="switchmenu"><button name="chooseShift">Shift to Center</button><div style="clear:left"></div></div>' +
+						'</div>'
+					);
 				}
 
 				var switchMenu = '';

diff --git a/play.pokemonshowdown.com/style/client.css b/play.pokemonshowdown.com/style/client.css
@@ -1598,7 +1598,7 @@ a.ilink.yours {
 	right: 0;
 	width: auto;
 }
-.tiny-layout .movecontrols, .tiny-layout .switchcontrols {
+.tiny-layout .movecontrols, .tiny-layout .shiftcontrols, .tiny-layout .switchcontrols {
 	max-width: 330px;
 	margin: 0 auto;
 }
@@ -1701,6 +1701,7 @@ a.ilink.yours {
 }
 .shiftselect button {
 	color: #445588;
+	cursor: default;
 }
 .moveselect button {
 	color: #884422;
@@ -1929,7 +1930,7 @@ a.ilink.yours {
 		color: #FF7766;
 		border-color: #FF7766;
 	}
-	.battle-controls .movecontrols, .battle-controls .switchcontrols {
+	.battle-controls .movecontrols, .battle-controls .shiftcontrols, .battle-controls .switchcontrols {
 		max-width: 640px;
 	}
 	.movemenu {

diff --git a/play.pokemonshowdown.com/style/client2.css b/play.pokemonshowdown.com/style/client2.css
@@ -1508,7 +1508,7 @@ a.ilink.yours {
 	right: 0;
 	width: auto;
 }
-.tiny-layout .movecontrols, .tiny-layout .switchcontrols {
+.tiny-layout .movecontrols, .tiny-layout .shiftcontrols, .tiny-layout .switchcontrols {
 	max-width: 330px;
 	margin: 0 auto;
 }