tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

Markup and styles for back button outside of new toolbar

Browse Source 
Adjust height of north bar to match rest of CMS plus minor positioning
fixes.
This commit is contained in:
Paul Clarke 2016-05-11 14:39:47 +12:00
parent 0cb6f84958
commit 7093224db3
4 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
admin/client/dist/styles/bundle.css vendored
View File

File diff suppressed because one or more lines are too long

4
admin/client/src/components/Toolbar/Toolbar.scss
View File

@ -37,10 +37,12 @@
width: 100%;
}
.toolbar__back-button {
.toolbar__back-button,
.cms_backlink .toolbar__back-button { // TEMP: Needed for anchor buttons to override legacy styles
float: left;
margin: $spacer-y * .625 $spacer-x / 2 $spacer-y * .625 #{-$spacer-x * .625};
padding-left: $spacer-x / 4;
padding-right: $spacer-x / 4;
border: 0;
color: $body-color-light; // TEMP: Needed for anchor buttons to override legacy styles
}

13
admin/client/src/styles/legacy/_style.scss
View File

@ -75,7 +75,7 @@ body.cms {
padding-right: $grid-gutter-width / 2;
min-width: 100%;
z-index: 60;
min-height: 52px;
min-height: $toolbar-total-height;
background: {
image: url(../images/textures/cms_content_header.png);
repeat: repeat;
@ -119,7 +119,8 @@ body.cms {
}
.cms_backlink {
vertical-align: middle;
margin-top: -7px;
float: left;
}
}
@ -216,10 +217,6 @@ body.cms {
padding-top: $grid-y - 1;
}
.cms-content-header-tabs {
margin-top: $grid-y;
}
.view-controls {
float: right;
margin-top: 4px;
@ -678,7 +675,7 @@ body.cms {
.cms-content-header-tabs {
float: right;
margin-top: $spacer-y * .625;
margin-top: 9px;
&.icon-button-group-tabs {
margin-top: 12px;
@ -2049,7 +2046,7 @@ body.cms-dialog {
padding: 12px 16px;
width: 100%;
height: 52px;
height: $toolbar-total-height;
margin: 0;
border: 0;

2
admin/templates/Includes/BackLink_Button.ss
View File

@ -1,5 +1,5 @@
<% if $Backlink %>
<div class="cms_backlink">
<a class="backlink ss-ui-button cms-panel-link font-icon-left-open-big no-text" href="$Backlink"></a>
<a class="btn btn-secondary font-icon-left-open-big toolbar__back-button btn--no-text" href="$Backlink"></a>
</div>
<% end_if %>