BUGFIX: Change styles on tabs to new format.

silverstripe · May 10, 2012 · 28a1d0d · 28a1d0d
1 parent 1863bb0
commit 28a1d0d
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 38 deletions.
diff --git a/css/screen.css b/css/screen.css
diff --git a/scss/_AssetAdmin.scss b/scss/_AssetAdmin.scss
@@ -19,16 +19,17 @@
 					line-height: 16px;
 					padding: 12px 20px 12px;
 					text-indent:-9999em;
+					background: url(../images/content-header-tabs-sprite.png) no-repeat;
+				}
 
-					&.content-treeview {
-						background:url(../images/content-header-tabs-sprite.png) no-repeat 2px 0px;
-					}
-					&.content-galleryview {
-						background:url(../images/content-header-tabs-sprite.png) no-repeat -160px 0px;
-					}
-					&.content-listview {
-						background:url(../images/content-header-tabs-sprite.png) no-repeat -39px 0px;
-					}
+				&.content-treeview a {
+					background-position: 2px 0px;
+				}
+				&.content-galleryview a {
+					background-position: -160px 0px;
+				}
+				&.content-listview a {
+					background-position: -39px 0px;
 				}
 			}
 
@@ -39,16 +40,14 @@
 					top:none;
 				}
 
-				a {
-					&.content-treeview {
-						background:url(../images/content-header-tabs-sprite.png) no-repeat 1px -40px;
-					}
-					&.content-galleryview {
-						background:url(../images/content-header-tabs-sprite.png) no-repeat -161px -40px;
-					}
-					&.content-listview {
-						background:url(../images/content-header-tabs-sprite.png) no-repeat -38px -40px;
-					}
+				&.content-treeview a {
+					background-position: 1px -40px;
+				}
+				&.content-galleryview a {
+					background-position: -161px -40px;
+				}
+				&.content-listview a {
+					background-position: -38px -40px;
 				}
 			}
 		}

diff --git a/templates/Includes/CMSMain_Content.ss b/templates/Includes/CMSMain_Content.ss
@@ -9,18 +9,18 @@
 
 			<div class="cms-content-header-tabs">
 				<ul>
-					<li <% if class == 'CMSPageEditController' %>class="ui-state-selected"<% end_if %>>
-						<a href="$LinkPageEdit" class="content-treeview cms-panel-link" title="Form_EditForm">
+					<li class="content-treeview<% if class == 'CMSPageEditController' %> ui-state-selected<% end_if %>">
+						<a href="$LinkPageEdit" class="cms-panel-link" title="Form_EditForm">
 							<% _t('CMSMain.TabContent', 'Content') %>
 						</a>
 					</li>
-					<li <% if class == 'CMSPageSettingsController' %>class="ui-state-selected"<% end_if %>>
-						<a href="$LinkPageSettings" class="content-listview cms-panel-link" title="Form_EditForm">
+					<li class="content-listview<% if class == 'CMSPageSettingsController' %> ui-state-selected<% end_if %>">
+						<a href="$LinkPageSettings" class="cms-panel-link" title="Form_EditForm">
 							<% _t('CMSMain.TabSettings', 'Settings') %>
 						</a>
 					</li>
-					<li <% if class == 'CMSPageHistoryController' %>class="ui-state-selected"<% end_if %>>
-						<a href="$LinkPageHistory" class="content-listview cms-panel-link" title="Form_EditForm">
+					<li class="content-listview<% if class == 'CMSPageHistoryController' %> ui-state-selected<% end_if %>">
+						<a href="$LinkPageHistory" class="cms-panel-link" title="Form_EditForm">
 							<% _t('CMSMain.TabHistory', 'History') %>
 						</a>
 					</li>

diff --git a/templates/Includes/CMSPagesController_Content.ss b/templates/Includes/CMSPagesController_Content.ss
@@ -9,15 +9,15 @@
 
 			<div class="cms-content-header-tabs">
 				<ul>
-					<li>
-						<a href="#cms-content-treeview" class="content-treeview cms-panel-link" data-href="$LinkTreeView"><% _t('CMSPagesController.TreeView', 'Tree View') %></a>
+					<li class="content-treeview">
+						<a href="#cms-content-treeview" class="cms-panel-link" data-href="$LinkTreeView"><% _t('CMSPagesController.TreeView', 'Tree View') %></a>
 					</li>
-					<li>
-						<a href="#cms-content-listview" class="content-listview cms-panel-link"  data-href="$LinkListView"><% _t('CMSPagesController.ListView', 'List View') %></a>
+					<li class="content-listview">
+						<a href="#cms-content-listview" class="cms-panel-link" data-href="$LinkListView"><% _t('CMSPagesController.ListView', 'List View') %></a>
 					</li>
 					<!--
-					<li>
-						<a href="#cms-content-galleryview" class="content-galleryview"><% _t('CMSPagesController.GalleryView', 'Gallery View') %></a>
+					<li class="content-galleryview">
+						<a href="#cms-content-galleryview"><% _t('CMSPagesController.GalleryView', 'Gallery View') %></a>
 					</li>
 					-->
 				</ul>