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

Merge pull request #6316 from wilr/history-form-changes

Browse Source 
Add OtherItemID as a schema param
This commit is contained in:
Damian Mooyman 2016-12-07 14:09:21 +13:00 committed by GitHub
commit 4e8a2f24f8
5 changed files with 39 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5897,18 +5897,18 @@ a.label:focus,a.label:hover{
padding:.75rem 1.25rem;
margin-bottom:-1px;
background-color:#fff;
border:1px solid #ddd;
border:1px solid #e5e8eb;
}
.list-group-item:first-child{
border-top-right-radius:.25rem;
border-top-left-radius:.25rem;
border-top-right-radius:0;
border-top-left-radius:0;
}
.list-group-item:last-child{
margin-bottom:0;
border-bottom-right-radius:.25rem;
border-bottom-left-radius:.25rem;
border-bottom-right-radius:0;
border-bottom-left-radius:0;
}
.list-group-flush .list-group-item{
@ -14839,24 +14839,26 @@ div.TreeDropdownField a.jstree-loading .jstree-pageicon{
.list-group{
margin-left:-1.5385rem;
margin-right:-1.5385rem;
margin-bottom:1.5385rem;
}
.list-group-flush:first-child{
border-top:0;
}
.list-group-flush:last-child{
border-bottom:1px solid #e5e8eb;
margin-bottom:.9231rem;
}
.list-group-item{
padding:.76925rem 1.5385rem;
min-height:65px;
cursor:pointer;
text-decoration:none;
-webkit-transition:opacity .2s ease-in-out;
transition:opacity .2s ease-in-out;
}
.list-group-item:first-child{
border-top:0;
}
.list-group-item:hover{
.list-group-item,.list-group-item:hover{
text-decoration:none;
}
@ -14869,6 +14871,10 @@ div.TreeDropdownField a.jstree-loading .jstree-pageicon{
opacity:1;
}
.list-group-item-text{
line-height:1.539;
}
.list-group-item-heading{
font-weight:400;
font-size:14px;
@ -16143,7 +16149,7 @@ body,html{
.campaign-admin__campaign .list-group-item.active:hover{
background-color:#f5f5f5;
color:#4f5861;
border-color:#ddd;
border-color:#e5e8eb;
}
}

21
admin/client/src/components/ListGroup/ListGroup.scss
View File

@ -3,8 +3,17 @@
.list-group {
margin-left: -$grid-gutter-width / 2;
margin-right: -$grid-gutter-width / 2;
border-bottom: 1px solid $border-color-light;
margin-bottom: $spacer-y * .75;
margin-bottom: $panel-padding-y;
}
.list-group-flush {
&:first-child {
border-top: 0;
}
&:last-child {
border-bottom: $list-group-border-width solid $list-group-border-color;
}
}
.list-group-item {
@ -17,10 +26,6 @@
text-decoration: none;
transition: opacity .2s ease-in-out;
&:first-child {
border-top: 0;
}
&:hover {
text-decoration: none;
}
@ -37,6 +42,10 @@
}
}
.list-group-item-text {
line-height: $line-height;
}
.list-group-item-heading {
font-weight: 400;
font-size: 14px;

2
admin/client/src/containers/FormBuilderLoader/FormBuilderLoader.js
View File

@ -228,7 +228,7 @@ class FormBuilderLoader extends Component {
}
FormBuilderLoader.propTypes = Object.assign({}, basePropTypes, {
schemaActions: PropTypes.object.isRequired,
schemaActions: PropTypes.object,
schemaUrl: PropTypes.string.isRequired,
schema: schemaPropType,
form: PropTypes.string,

6
admin/client/src/styles/_variables.scss
View File

@ -647,10 +647,10 @@ $modal-sm: 300px;
// List group
$list-group-bg: #fff;
$list-group-border-color: #ddd;
$list-group-bg: $white;
$list-group-border-color: $border-color-light;
$list-group-border-width: $border-width;
$list-group-border-radius: $border-radius;
$list-group-border-radius: 0;
$list-group-hover-bg: #f5f5f5;
$list-group-active-color: $component-active-color;

2
admin/code/LeftAndMain.php
View File

@ -152,7 +152,7 @@ class LeftAndMain extends Controller implements PermissionProvider {
];
private static $url_handlers = [
'GET schema/$FormName/$ItemID' => 'schema'
'GET schema/$FormName/$ItemID/$OtherItemID' => 'schema'
];
private static $dependencies = [