MINOR Reverted special styling of preview button in CMS, too hard to …

…keep consistent alignment
silverstripe · Dec 20, 2011 · 47f53df · 47f53df
1 parent ac96375
commit 47f53df
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 9 deletions.
diff --git a/admin/css/screen.css b/admin/css/screen.css
diff --git a/admin/scss/_forms.scss b/admin/scss/_forms.scss
@@ -226,7 +226,6 @@ form.nostyle {
  * ---------------------------------------------------- */
 
 .Actions {
-	margin-right: 80px; // Accommodate preview button
 	min-height: 30px;
 
 	& > div {

diff --git a/admin/templates/Includes/LeftAndMain_EditForm.ss b/admin/templates/Includes/LeftAndMain_EditForm.ss
@@ -45,17 +45,16 @@
 	</div>
 
 	<div class="cms-content-actions south">
-		<% if CurrentPage.PreviewLink %>
-		<a href="$CurrentPage.PreviewLink" class="cms-preview-toggle-link ss-ui-button">
-			<% _t('LeftAndMain.PreviewButton', 'Preview') %> &raquo;
-		</a>
-
-		<% end_if %>
 		<% if Actions %>
 		<div class="Actions">
 			<% control Actions %>
 				$Field
 			<% end_control %>
+			<% if CurrentPage.PreviewLink %>
+			<a href="$CurrentPage.PreviewLink" class="cms-preview-toggle-link ss-ui-button">
+				<% _t('LeftAndMain.PreviewButton', 'Preview') %> &raquo;
+			</a>
+			<% end_if %>
 		</div>
 		<% end_if %>
 	</div>