Permalink
Browse files

BUGFIX: Change styles on tabs to new format.

  • Loading branch information...
1 parent 1863bb0 commit 28a1d0d4e705e92529f9a0146bf6da25e208d3fa @robert-h-curry robert-h-curry committed May 10, 2012
View
14 css/screen.css
@@ -30,14 +30,14 @@
.cms .AssetAdmin .cms-content-fields .cms-edit-form.AssetAdmin { overflow-y: auto; }
.cms .AssetAdmin .cms-content-fields .cms-content-tools .cms-panel-content { overflow: hidden; }
.cms .AssetAdmin .cms-content-fields .cms-content-tools .cms-panel-content .cms-search-form { height: 100%; }
-.cms .AssetAdmin .cms-content-header-tabs .ui-tabs-nav li a { font-weight: bold; line-height: 16px; padding: 12px 20px 12px; text-indent: -9999em; }
-.cms .AssetAdmin .cms-content-header-tabs .ui-tabs-nav li a.content-treeview { background: url(../images/content-header-tabs-sprite.png) no-repeat 2px 0px; }
-.cms .AssetAdmin .cms-content-header-tabs .ui-tabs-nav li a.content-galleryview { background: url(../images/content-header-tabs-sprite.png) no-repeat -160px 0px; }
-.cms .AssetAdmin .cms-content-header-tabs .ui-tabs-nav li a.content-listview { background: url(../images/content-header-tabs-sprite.png) no-repeat -39px 0px; }
+.cms .AssetAdmin .cms-content-header-tabs .ui-tabs-nav li a { font-weight: bold; line-height: 16px; padding: 12px 20px 12px; text-indent: -9999em; background: url(../images/content-header-tabs-sprite.png) no-repeat; }
+.cms .AssetAdmin .cms-content-header-tabs .ui-tabs-nav li.content-treeview a { background-position: 2px 0px; }
+.cms .AssetAdmin .cms-content-header-tabs .ui-tabs-nav li.content-galleryview a { background-position: -160px 0px; }
+.cms .AssetAdmin .cms-content-header-tabs .ui-tabs-nav li.content-listview a { background-position: -39px 0px; }
.cms .AssetAdmin .cms-content-header-tabs .ui-tabs-nav .ui-state-active, .cms .AssetAdmin .cms-content-header-tabs .ui-tabs-nav .ui-widget-content .ui-state-active, .cms .AssetAdmin .cms-content-header-tabs .ui-tabs-nav .ui-widget-header .ui-state-active { border-top: none; }
-.cms .AssetAdmin .cms-content-header-tabs .ui-tabs-nav .ui-state-active a.content-treeview, .cms .AssetAdmin .cms-content-header-tabs .ui-tabs-nav .ui-widget-content .ui-state-active a.content-treeview, .cms .AssetAdmin .cms-content-header-tabs .ui-tabs-nav .ui-widget-header .ui-state-active a.content-treeview { background: url(../images/content-header-tabs-sprite.png) no-repeat 1px -40px; }
-.cms .AssetAdmin .cms-content-header-tabs .ui-tabs-nav .ui-state-active a.content-galleryview, .cms .AssetAdmin .cms-content-header-tabs .ui-tabs-nav .ui-widget-content .ui-state-active a.content-galleryview, .cms .AssetAdmin .cms-content-header-tabs .ui-tabs-nav .ui-widget-header .ui-state-active a.content-galleryview { background: url(../images/content-header-tabs-sprite.png) no-repeat -161px -40px; }
-.cms .AssetAdmin .cms-content-header-tabs .ui-tabs-nav .ui-state-active a.content-listview, .cms .AssetAdmin .cms-content-header-tabs .ui-tabs-nav .ui-widget-content .ui-state-active a.content-listview, .cms .AssetAdmin .cms-content-header-tabs .ui-tabs-nav .ui-widget-header .ui-state-active a.content-listview { background: url(../images/content-header-tabs-sprite.png) no-repeat -38px -40px; }
+.cms .AssetAdmin .cms-content-header-tabs .ui-tabs-nav .ui-state-active.content-treeview a, .cms .AssetAdmin .cms-content-header-tabs .ui-tabs-nav .ui-widget-content .ui-state-active.content-treeview a, .cms .AssetAdmin .cms-content-header-tabs .ui-tabs-nav .ui-widget-header .ui-state-active.content-treeview a { background-position: 1px -40px; }
+.cms .AssetAdmin .cms-content-header-tabs .ui-tabs-nav .ui-state-active.content-galleryview a, .cms .AssetAdmin .cms-content-header-tabs .ui-tabs-nav .ui-widget-content .ui-state-active.content-galleryview a, .cms .AssetAdmin .cms-content-header-tabs .ui-tabs-nav .ui-widget-header .ui-state-active.content-galleryview a { background-position: -161px -40px; }
+.cms .AssetAdmin .cms-content-header-tabs .ui-tabs-nav .ui-state-active.content-listview a, .cms .AssetAdmin .cms-content-header-tabs .ui-tabs-nav .ui-widget-content .ui-state-active.content-listview a, .cms .AssetAdmin .cms-content-header-tabs .ui-tabs-nav .ui-widget-header .ui-state-active.content-listview a { background-position: -38px -40px; }
.cms .AssetAdmin .cms-content-toolbar .cms-page-add-button { background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #f3f3f3), color-stop(100%, #d9d9d9)); background-image: -webkit-linear-gradient(#f3f3f3, #d9d9d9); background-image: -moz-linear-gradient(#f3f3f3, #d9d9d9); background-image: -o-linear-gradient(#f3f3f3, #d9d9d9); background-image: -ms-linear-gradient(#f3f3f3, #d9d9d9); background-image: linear-gradient(#f3f3f3, #d9d9d9); border-color: #c0c0c2; }
.cms .AssetAdmin .cms-content-toolbar .cms-page-add-button span.btn-icon-add { height: 17px; }
.cms .AssetAdmin .cms-content-toolbar .cms-page-add-button span.ui-button-text { color: #393939; text-shadow: white 0 1px 1px; }
View
37 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;
}
}
}
View
12 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>
View
12 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>

0 comments on commit 28a1d0d

Please sign in to comment.