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

Sitetree scroll moved so whole area scrolls excluding actions

Browse Source
This commit is contained in:
Paul Clarke 2016-10-20 16:19:19 +13:00
parent 364ab957e6
commit 96964be39d
3 changed files with 35 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9484,7 +9484,7 @@ body.cms{
.view-controls{
float:right;
margin-top:4px;
margin-top:5px;
}
.view-controls .icon-button-group .icon-button{
@ -9575,8 +9575,6 @@ body.cms{
}
.cms a.icon-button.font-icon-search.active,.cms a.icon-button.font-icon-search:active,.cms a.icon-button.font-icon-search:focus,.cms a.icon-button.font-icon-search:hover,.cms button.ss-ui-button.icon-button.font-icon-search.active,.cms button.ss-ui-button.icon-button.font-icon-search:active,.cms button.ss-ui-button.icon-button.font-icon-search:focus,.cms button.ss-ui-button.icon-button.font-icon-search:hover{
background:none;
box-shadow:none;
color:#4f5861;
}
@ -10644,7 +10642,12 @@ form.member-profile-form #Permissions .optionset li{
margin-top:-5px;
}
.cms .cms-panel-padded .cms-content-view,.CMSPageAddController .cms-panel-padded{
.cms .cms-panel-padded .cms-content-view{
padding:1.5385rem;
height:100%;
}
.CMSPageAddController .cms-panel-padded{
padding:1.5385rem;
}
@ -11678,6 +11681,15 @@ form.small .cms-file-info-data .field .middleColumn{
display:block;
}
.cms-tree-holder{
overflow-x:auto;
height:calc(100% - 13px);
padding-left:20px;
padding-right:20px;
margin-left:-20px;
margin-right:-20px;
}
.jstree-apple a .jstree-icon,.jstree-classic a .jstree-icon,.jstree-default-rtl a .jstree-icon,.jstree-default a .jstree-icon{
background-position:-60px -19px;
}

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

@ -215,15 +215,15 @@ body.cms {
font-weight: normal;
}
.breadcrumbs-wrapper {
float: left;
padding-top: $spacer-xs / 2;
}
.breadcrumbs-wrapper {
float: left;
padding-top: $spacer-xs / 2;
}
}
.view-controls {
float: right;
margin-top: 4px;
margin-top: 5px;
.icon-button-group {
.icon-button {
@ -348,8 +348,6 @@ body.cms {
&:active,
&:focus,
&:hover {
background: none;
box-shadow: none;
color: darken($color-text, 10%);
}
@ -1586,7 +1584,8 @@ form.member-profile-form {
}
.cms .cms-panel-padded .cms-content-view {
padding: $panel-padding-y $panel-padding-x;
padding: $panel-padding-y $panel-padding-x;
height: 100%; // For horizontal scrollbar on Pages sitetree at smaller sizes
}
.CMSPageAddController .cms-panel-padded {

12
admin/client/src/styles/legacy/_tree.scss
View File

@ -600,6 +600,18 @@
}
}
// Scroll horizontal for sitetree
// so scrollbar is fixed to bottom of panel, and tree actions remain fixed at top
.cms-tree-holder {
overflow-x: auto;
height: calc(100% - 13px); // Magic number, need to investigate why its needed (possibly scroll bar height)
padding-left: 20px;
padding-right: 20px;
margin-left: -20px;
margin-right: -20px;
}
// Override thirdparty themes
.jstree-default a .jstree-icon,
.jstree-default-rtl a .jstree-icon,