mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-09-29 20:59:23 +02:00
Merge pull request #5510 from open-sausages/pulls/4.0/5495-security-header-fix
Markup and styles for back button outside of new toolbar
This commit is contained in:
commit
a736d9e08b
4
admin/client/dist/styles/bundle.css
vendored
4
admin/client/dist/styles/bundle.css
vendored
File diff suppressed because one or more lines are too long
@ -37,10 +37,12 @@
|
|||||||
width: 100%;
|
width: 100%;
|
||||||
}
|
}
|
||||||
|
|
||||||
.toolbar__back-button {
|
.toolbar__back-button,
|
||||||
|
.cms_backlink .toolbar__back-button { // TEMP: Needed for anchor buttons to override legacy styles
|
||||||
float: left;
|
float: left;
|
||||||
margin: $spacer-y * .625 $spacer-x / 2 $spacer-y * .625 #{-$spacer-x * .625};
|
margin: $spacer-y * .625 $spacer-x / 2 $spacer-y * .625 #{-$spacer-x * .625};
|
||||||
padding-left: $spacer-x / 4;
|
padding-left: $spacer-x / 4;
|
||||||
padding-right: $spacer-x / 4;
|
padding-right: $spacer-x / 4;
|
||||||
border: 0;
|
border: 0;
|
||||||
|
color: $body-color-light; // TEMP: Needed for anchor buttons to override legacy styles
|
||||||
}
|
}
|
||||||
|
@ -75,7 +75,7 @@ body.cms {
|
|||||||
padding-right: $grid-gutter-width / 2;
|
padding-right: $grid-gutter-width / 2;
|
||||||
min-width: 100%;
|
min-width: 100%;
|
||||||
z-index: 60;
|
z-index: 60;
|
||||||
min-height: 52px;
|
min-height: $toolbar-total-height;
|
||||||
background: {
|
background: {
|
||||||
image: url(../images/textures/cms_content_header.png);
|
image: url(../images/textures/cms_content_header.png);
|
||||||
repeat: repeat;
|
repeat: repeat;
|
||||||
@ -119,7 +119,8 @@ body.cms {
|
|||||||
}
|
}
|
||||||
|
|
||||||
.cms_backlink {
|
.cms_backlink {
|
||||||
vertical-align: middle;
|
margin-top: -7px;
|
||||||
|
float: left;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -216,10 +217,6 @@ body.cms {
|
|||||||
padding-top: $grid-y - 1;
|
padding-top: $grid-y - 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
.cms-content-header-tabs {
|
|
||||||
margin-top: $grid-y;
|
|
||||||
}
|
|
||||||
|
|
||||||
.view-controls {
|
.view-controls {
|
||||||
float: right;
|
float: right;
|
||||||
margin-top: 4px;
|
margin-top: 4px;
|
||||||
@ -678,7 +675,7 @@ body.cms {
|
|||||||
|
|
||||||
.cms-content-header-tabs {
|
.cms-content-header-tabs {
|
||||||
float: right;
|
float: right;
|
||||||
margin-top: $spacer-y * .625;
|
margin-top: 9px;
|
||||||
|
|
||||||
&.icon-button-group-tabs {
|
&.icon-button-group-tabs {
|
||||||
margin-top: 12px;
|
margin-top: 12px;
|
||||||
@ -2049,7 +2046,7 @@ body.cms-dialog {
|
|||||||
|
|
||||||
padding: 12px 16px;
|
padding: 12px 16px;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
height: 52px;
|
height: $toolbar-total-height;
|
||||||
margin: 0;
|
margin: 0;
|
||||||
border: 0;
|
border: 0;
|
||||||
|
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
<% if $Backlink %>
|
<% if $Backlink %>
|
||||||
<div class="cms_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>
|
</div>
|
||||||
<% end_if %>
|
<% end_if %>
|
||||||
|
Loading…
Reference in New Issue
Block a user