Permalink
Browse files

Merge pull request #331 from silverstripe-big-o/breadcrumbs-tabs-over…

…flow-Trac6882

ENHANCEMENT:fixed issues with overflow between tabs and breadcrumbs in c...
  • Loading branch information...
halkyon committed Apr 16, 2012
2 parents 7a4392c + 64300ca commit 3d15159e225ccdd423ea2361890f372250442cc0
Showing with 27 additions and 17 deletions.
  1. +7 −5 admin/css/screen.css
  2. +11 −5 admin/scss/_style.scss
  3. +9 −7 admin/templates/CMSBreadcrumbs.ss
View

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
View
@@ -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;
@@ -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>

0 comments on commit 3d15159

Please sign in to comment.