From 8d373046dbcbdbe972d3439b4093cdca3bfa2663 Mon Sep 17 00:00:00 2001 From: Will Rossiter Date: Wed, 16 Nov 2016 09:38:16 +1300 Subject: [PATCH 1/4] Add OtherItemID as a schema param History Form needs both an ItemID and a VersionID. Follows the same naming as $ID/$OtherID available in other controllers. --- admin/code/LeftAndMain.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin/code/LeftAndMain.php b/admin/code/LeftAndMain.php index b687a51b3..0a2ba44a0 100644 --- a/admin/code/LeftAndMain.php +++ b/admin/code/LeftAndMain.php @@ -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 = [ From 9b7e242f564a7b83ce3a9873b0ab6f2157f67640 Mon Sep 17 00:00:00 2001 From: Paul Clarke Date: Tue, 22 Nov 2016 15:37:52 +1300 Subject: [PATCH 2/4] Updated list-group variables --- admin/client/src/styles/_variables.scss | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/admin/client/src/styles/_variables.scss b/admin/client/src/styles/_variables.scss index 6fbd282bd..21ce18ef4 100644 --- a/admin/client/src/styles/_variables.scss +++ b/admin/client/src/styles/_variables.scss @@ -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; From af853861ec6831ee2c78c475ee523d9237c6559f Mon Sep 17 00:00:00 2001 From: Paul Clarke Date: Tue, 22 Nov 2016 15:38:43 +1300 Subject: [PATCH 3/4] Updated list-group styles to work with file history and campaigns --- admin/client/dist/styles/bundle.css | 32 +++++++++++-------- .../src/components/ListGroup/ListGroup.scss | 21 ++++++++---- 2 files changed, 34 insertions(+), 19 deletions(-) diff --git a/admin/client/dist/styles/bundle.css b/admin/client/dist/styles/bundle.css index 492b7a7e6..eb78173f5 100644 --- a/admin/client/dist/styles/bundle.css +++ b/admin/client/dist/styles/bundle.css @@ -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; } } diff --git a/admin/client/src/components/ListGroup/ListGroup.scss b/admin/client/src/components/ListGroup/ListGroup.scss index c5a800c6c..f22f23975 100644 --- a/admin/client/src/components/ListGroup/ListGroup.scss +++ b/admin/client/src/components/ListGroup/ListGroup.scss @@ -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; From c405b4e41a4972a0221f7b1b3299826e982581cb Mon Sep 17 00:00:00 2001 From: Christopher Joe Date: Tue, 6 Dec 2016 14:04:55 +1300 Subject: [PATCH 4/4] remove required for actions --- .../src/containers/FormBuilderLoader/FormBuilderLoader.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin/client/src/containers/FormBuilderLoader/FormBuilderLoader.js b/admin/client/src/containers/FormBuilderLoader/FormBuilderLoader.js index 90fd37df4..0f4e91479 100644 --- a/admin/client/src/containers/FormBuilderLoader/FormBuilderLoader.js +++ b/admin/client/src/containers/FormBuilderLoader/FormBuilderLoader.js @@ -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,