ENHANCEMENT:fixed issues with overflow between tabs and breadcrumbs i…

…n cms-content-header
silverstripe · Apr 16, 2012 · 64300ca · 64300ca
1 parent 311bfba
commit 64300ca
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 17 deletions.
diff --git a/admin/css/screen.css b/admin/css/screen.css
diff --git a/admin/scss/_style.scss b/admin/scss/_style.scss
@@ -94,7 +94,8 @@ body.cms {
 	background: {
 		image:url(../images/textures/cms_content_header.png);
 		repeat:repeat;
-	} 
+	}
+	overflow:hidden;
 
 	a {
 		color: $color-text-blue-link;
@@ -112,16 +113,20 @@ body.cms {
 		line-height: $grid-x * 3;
 		font-weight: bold;
 		text-shadow: darken($color-widget-bg, 15%) 1px 1px 0;
-		max-width: 100%;
 		margin: 0;
-		@include hide-text-overflow();
 		display:table-cell;
 		vertical-align:top;
+		width:100%;
+		.breadcrumbs-wrapper {
+			display:table-row;
+			.crumb {
+				display:table-cell;
+				line-height:26px;
+			}
+		}
 	}
 
 	& div {
-		width: 100%;
-		overflow: hidden;
 		display:table-row;
 		& .cms_backlink {
 			display:table-cell;
@@ -133,6 +138,7 @@ body.cms {
 	.cms-content-header-tabs {
 		display:table-cell;
 		white-space:nowrap;
+		width:100%;
 		.ui-tabs-nav {
 			float:right;
 			margin-right:$grid-x*4;

diff --git a/admin/templates/CMSBreadcrumbs.ss b/admin/templates/CMSBreadcrumbs.ss
@@ -1,7 +1,9 @@
-<% control Breadcrumbs %>
-	<% if Last %>
-		<span class="cms-panel-link crumb">$Title.XML</span>
-	<% else %>
-		<a class="cms-panel-link crumb" href="$Link">$Title.XML</a> /
-	<% end_if %>
-<% end_control %>
+<div class="breadcrumbs-wrapper">
+	<% control Breadcrumbs %>
+		<% if Last %>
+			<span class="cms-panel-link crumb">$Title.XML</span>
+		<% else %>
+			<a class="cms-panel-link crumb" href="$Link">$Title.XML</a>/
+		<% end_if %>
+	<% end_control %>
+</div>