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

Fix Campaign List toggle (Fixes #6067)

Browse Source
This commit is contained in:
Will Rossiter 2016-12-21 12:26:01 +13:00 committed by Christopher Joe
parent 7c76d2cb09
commit 2d5aa7ce0e
5 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
admin/client/dist/js/bundle.js vendored
View File

@ -2609,10 +2609,10 @@ i.enumerable=i.enumerable||!1,i.configurable=!0,"value"in i&&(i.writable=!0),Obj
n(262)
var f=function(e){function t(){return r(this,t),a(this,(t.__proto__||Object.getPrototypeOf(t)).apply(this,arguments))}return o(t,e),s(t,[{key:"render",value:function n(){var e=this.props.groupid+"_Header",t=this.props.groupid+"_Items",n="#"+t,i={
id:t,"aria-expanded":!0,className:"list-group list-group-flush collapse in",role:"tabpanel","aria-labelledby":e}
return u["default"].createElement("div",{className:"accordion__block"},u["default"].createElement("a",{className:"accordion__title","data-toggle":"collapse",href:n,"aria-expanded":"true","aria-controls":t,
id:e,role:"tab"},this.props.title),u["default"].createElement("div",i,this.props.children))}}]),t}(d["default"])
var f=function(e){function t(){return r(this,t),a(this,(t.__proto__||Object.getPrototypeOf(t)).apply(this,arguments))}return o(t,e),s(t,[{key:"render",value:function n(){var e=this.props.groupid+"_Header",t=this.props.groupid+"_Items",n=t.replace(/\\/g,"_"),i=e.replace(/\\/g,"_"),r="#"+n,a={
id:n,"aria-expanded":!0,className:"list-group list-group-flush collapse in",role:"tabpanel","aria-labelledby":e}
return u["default"].createElement("div",{className:"accordion__block"},u["default"].createElement("a",{className:"accordion__title","data-toggle":"collapse",href:r,"aria-expanded":"true","aria-controls":t,
id:i,role:"tab"},this.props.title),u["default"].createElement("div",a,this.props.children))}}]),t}(d["default"])
t["default"]=f},function(e,t){e.exports=BootstrapCollapse},function(e,t,n){"use strict"
function i(e){return e&&e.__esModule?e:{"default":e}}function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function a(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called")

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

@ -14911,8 +14911,9 @@ div.TreeDropdownField a.jstree-loading .jstree-pageicon{
color:#4f5861;
}
.accordion__title .collapsed:before{
.accordion__title.collapsed:before{
content:"6";
display:block;
}
.field-group-component>.form-group{
@ -16195,7 +16196,6 @@ input.checkbox,input.radio,input[type=checkbox],input[type=radio]{
.modal__response--error,.modal__response--good{
font-size:1.23rem;
font-weight:300;
}
.modal__response--error span:before,.modal__response--good span:before{

3
admin/client/src/components/Accordion/Accordion.scss
View File

@ -42,7 +42,8 @@
}
}
.collapsed::before {
&.collapsed::before {
content: "6";
display: block;
}
}

9
admin/client/src/components/Accordion/AccordionBlock.js
View File

@ -8,9 +8,12 @@ class AccordionBlock extends SilverStripeComponent {
render() {
const headerID = `${this.props.groupid}_Header`;
const listID = `${this.props.groupid}_Items`;
const href = `#${listID}`;
const listIDAttr = listID.replace(/\\/g, '_');
const headerIDAttr = headerID.replace(/\\/g, '_');
const href = `#${listIDAttr}`;
const groupProps = {
id: listID,
id: listIDAttr,
'aria-expanded': true,
className: 'list-group list-group-flush collapse in',
role: 'tabpanel',
@ -23,7 +26,7 @@ class AccordionBlock extends SilverStripeComponent {
href={href}
aria-expanded="true"
aria-controls={listID}
id={headerID}
id={headerIDAttr}
role="tab"
>{this.props.title}
</a>

1
admin/client/src/components/Modal/Modal.scss
View File

@ -73,7 +73,6 @@
.modal__response--good,
.modal__response--error {
font-size: $font-size-lg;
font-weight: 300;
span::before {
font-family: silverstripe;