Merge pull request #1968 from open-sausages/pulls/4.0/toolbar-style-layout

FIX toolbar title layout
This commit is contained in:
Chris Joe 2017-09-21 16:48:20 +12:00 committed by GitHub
commit f37b78ef61
3 changed files with 7 additions and 5 deletions

View File

@ -4,9 +4,11 @@
<div class="fill-height flexbox-area-grow"> <div class="fill-height flexbox-area-grow">
<div class="cms-content-header north"> <div class="cms-content-header north">
<div class="cms-content-header-nav fill-width"> <div class="cms-content-header-nav fill-width vertical-align-items">
<div class="cms-content-header-nav__left vertical-align-items flexbox-area-grow">
<a href="$BreadcrumbsBackLink" class="btn btn-secondary btn--no-text font-icon-left-open-big hidden-lg-up toolbar__back-button"></a> <a href="$BreadcrumbsBackLink" class="btn btn-secondary btn--no-text font-icon-left-open-big hidden-lg-up toolbar__back-button"></a>
<% include SilverStripe\\Admin\\CMSBreadcrumbs %> <% include SilverStripe\\Admin\\CMSBreadcrumbs %>
</div>
<div class="cms-content-header-tabs cms-tabset"> <div class="cms-content-header-tabs cms-tabset">
<ul class="cms-tabset-nav-primary nav nav-tabs"> <ul class="cms-tabset-nav-primary nav nav-tabs">

View File

@ -1,6 +1,6 @@
<div class="cms-content-tools fill-height cms-panel cms-panel-layout" data-expandOnClick="true" data-layout-type="border" id="cms-content-tools-CMSMain"> <div class="cms-content-tools fill-height cms-panel cms-panel-layout" data-expandOnClick="true" data-layout-type="border" id="cms-content-tools-CMSMain">
<div class="cms-content-header north"> <div class="cms-content-header north">
<div class="cms-content-header-info"> <div class="cms-content-header-info vertical-align-items">
<div class="section-heading"> <div class="section-heading">
<span class="section-label"><a href="$LinkPages">{$MenuCurrentItem.Title}</a></span> <span class="section-label"><a href="$LinkPages">{$MenuCurrentItem.Title}</a></span>
</div> </div>

View File

@ -1,7 +1,7 @@
<div id="pages-controller-cms-content" class="flexbox-area-grow fill-height cms-content $BaseCSSClasses" data-layout-type="border" data-pjax-fragment="Content"> <div id="pages-controller-cms-content" class="flexbox-area-grow fill-height cms-content $BaseCSSClasses" data-layout-type="border" data-pjax-fragment="Content">
<div class="cms-content-header north"> <div class="cms-content-header north">
<div class="cms-content-header-info fill-width"> <div class="cms-content-header-info fill-width vertical-align-items">
<% include SilverStripe\\Admin\\CMSBreadcrumbs %> <% include SilverStripe\\Admin\\CMSBreadcrumbs %>
<% include SilverStripe\\CMS\\Controllers\\CMSMain_Filter %> <% include SilverStripe\\CMS\\Controllers\\CMSMain_Filter %>
</div> </div>