diff --git a/.editorconfig b/.editorconfig index 2be6131..8c743b0 100644 --- a/.editorconfig +++ b/.editorconfig @@ -15,12 +15,6 @@ trim_trailing_whitespace = true [*.md] trim_trailing_whitespace = false -[*.yml] +[*.{yml,js,json,css,scss,eslintrc}] indent_size = 2 indent_style = space - -[{.travis.yml,package.json}] -# The indent size used in the `package.json` file cannot be changed -# https://github.com/npm/npm/pull/3180#issuecomment-16336516 -indent_size = 2 -indent_style = space \ No newline at end of file diff --git a/css/GridFieldExtensions.css b/css/GridFieldExtensions.css index f6fbe34..617823f 100644 --- a/css/GridFieldExtensions.css +++ b/css/GridFieldExtensions.css @@ -1,213 +1,201 @@ -/** - * GridFieldAddExistingSearchButton - */ - -.add-existing-search-dialog { - min-width: inherit !important; -} - -.add-existing-search-dialog .add-existing-search-form .field { - border: none; - box-shadow: none; - margin-bottom: 0; - padding-bottom: 0; -} - -.add-existing-search-dialog .add-existing-search-form .field label { - padding-bottom: 4px; -} - -.add-existing-search-dialog .add-existing-search-form .Actions { - margin-top: 10px; - padding: 0; -} - -.add-existing-search-dialog .add-existing-search-items li a { - background: #FFF; - border-bottom-width: 1px; - border-color: #CCC; - border-left-width: 1px; - border-right-width: 1px; - border-style: solid; - display: block; - padding: 6px; -} - -.add-existing-search-dialog .add-existing-search-items li:first-child a { - border-top-left-radius: 4px; - border-top-right-radius: 4px; - border-top-width: 1px; -} - -.add-existing-search-dialog .add-existing-search-items li:last-child a { - border-bottom-left-radius: 4px; - border-bottom-right-radius: 4px; -} - -.add-existing-search-dialog .add-existing-search-items li a:hover { - background: #F4F4F4; -} - -.add-existing-search-dialog .add-existing-search-pagination li { - background: #FFF; - display: block; - float: left; - margin-right: 2px; - margin-top: 12px; - padding: 6px; -} - -/** - * GridFieldAddNewInlineButton - */ - -.ss-gridfield-inline-new { - background: #EFE; -} - -.ss-gridfield-inline-new:nth-child(2n) { - background: #DFD; -} - -/** - * GridFieldAddNewMultiClass - */ - -.ss-gridfield-add-new-multi-class { - margin-bottom: 8px !important; - white-space: nowrap; -} - -.ss-gridfield-add-new-multi-class .field { - border: none; - box-shadow: none; - float: left; - margin: 0 4px 0 0; -} - -.cms-edit-form:not(.AssetAdmin) .ss-gridfield-add-new-multi-class .form-group .form__field-holder { - display: inline; - padding: 0; - margin: 0; -} - -.cms-edit-form:not(.AssetAdmin) .ss-gridfield-add-new-multi-class .form-group { - display: inline-block; - margin: 0; - min-width: 150px; - width: calc(100% - 20px); -} - -.ss-gridfield-add-new-multi-class .form-group:after { - border:0; -} - -.btn__addnewmulticlass { - border-top-left-radius: 0; - border-bottom-left-radius: 0; - line-height: 1.85em; -} - -.ss-gridfield-add-new-multi-class .chosen-container-active.chosen-with-drop .chosen-single, -.ss-gridfield-add-new-multi-class .chosen-container-single .chosen-single { - border-top-right-radius: 0; - border-bottom-right-radius: 0; -} -/** - * GridFieldEditableColumns - */ - -.ss-gridfield-editable .readonly { - padding-top: 0 !important; -} - -.ss-gridfield-editable input.text, -.ss-gridfield-editable textarea, -.ss-gridfield-editable select, -.ss-gridfield-editable .TreeDropdownField { - margin: 0 !important; - max-width: none !important; -} - -.ss-gridfield-editable select.dropdown { - border: 1px solid #b3b3b3; - background-color: #fff; - padding: 7px 7px; - padding-left: 4px; - line-height: 16px; - -moz-border-radius: 4px; - -webkit-border-radius: 4px; - border-radius: 4px; -} - -.ss-gridfield-add-new-inline { - margin-bottom: 12px; -} - -.ss-gridfield-add-new-inline span.readonly { - color: #FFF !important; -} - -.ss-gridfield-add-new-inline .col-buttons { - text-align: right; -} - -/** - * GridFieldOrderableRows - */ - -.ss-gridfield-orderable thead tr th.col-Reorder span { - padding: 0 !important; - margin-left: 8px; -} - -.ss-gridfield-orderable .col-reorder { - position: relative; - padding: 0 !important; - width: 16px !important; -} - -.ss-gridfield-orderable .col-reorder .handle { - position: absolute; - top: 0; - left: 0; - width: 100%; - height: 100%; - cursor: move; -} - -.ss-gridfield-orderable .col-reorder .handle .icon { - position: absolute; - top: 50%; - left: 50%; - width: 5px; - height: 11px; - margin: -5px 0 0 -2px; - background-image: url('../../framework/admin/thirdparty/jquery-ui-themes/smoothness/images/ui-icons_222222_256x240.png'); - background-position: -5px -227px; -} - -.ss-gridfield-orderhelper { - border-bottom: 1px solid rgba(0, 0, 0, .1); - border-top: 1px solid rgba(0, 0, 0, .1); - box-shadow: 0 0 8px rgba(0, 0, 0, .4); -} - -.ss-gridfield-orderable tfoot .ui-droppable { - padding-left: 12px; - padding-right: 12px; -} - -.ss-gridfield-orderable tfoot .ui-droppable-active { - background-color: #D4CF90 !important; -} - -.ss-gridfield-orderable tfoot .ss-gridfield-previouspage { - background-position: -16px 9px !important; - margin-left: 0; -} - -.ss-gridfield-orderable tfoot .ss-gridfield-nextpage { - background-position: -40px 9px !important; - margin-right: 0; -} +/** + * GridFieldAddExistingSearchButton + */ + +.add-existing-search-dialog { + min-width: inherit !important; +} + +.add-existing-search-dialog .add-existing-search-form .field { + border: none; + box-shadow: none; + margin-bottom: 0; + padding-bottom: 0; +} + +.add-existing-search-dialog .add-existing-search-form .field label { + padding-bottom: 4px; +} + +.add-existing-search-dialog .add-existing-search-form .Actions { + margin-top: 10px; + padding: 0; +} + +.add-existing-search-dialog .add-existing-search-items li a { + background: #FFF; + border: solid #CCC; + border-right-width: 1px; + border-bottom-width: 1px; + border-left-width: 1px; + display: block; + padding: 6px; +} + +.add-existing-search-dialog .add-existing-search-items li:first-child a { + border-top-left-radius: 4px; + border-top-right-radius: 4px; + border-top-width: 1px; +} + +.add-existing-search-dialog .add-existing-search-items li:last-child a { + border-bottom-left-radius: 4px; + border-bottom-right-radius: 4px; +} + +.add-existing-search-dialog .add-existing-search-items li a:hover { + background: #F4F4F4; +} + +.add-existing-search-dialog .add-existing-search-pagination li { + background: #FFF; + display: block; + float: left; + margin-right: 2px; + margin-top: 12px; + padding: 6px; +} + +/** + * GridFieldAddNewInlineButton + */ + +.ss-gridfield-inline-new { + background: #EFE; +} + +.ss-gridfield-inline-new:nth-child(2n) { + background: #DFD; +} + +/** + * GridFieldAddNewMultiClass + */ + +.ss-gridfield-add-new-multi-class { + margin-bottom: 8px !important; + white-space: nowrap; +} + +.ss-gridfield-add-new-multi-class .field { + border: none; + box-shadow: none; + float: left; + margin: 0 4px 0 0; +} + +.cms-edit-form:not(.AssetAdmin) .ss-gridfield-add-new-multi-class .form-group .form__field-holder { + display: inline; + padding: 0; + margin: 0; +} + +.cms-edit-form:not(.AssetAdmin) .ss-gridfield-add-new-multi-class .form-group { + display: inline-block; + margin: 0; + min-width: 150px; + width: calc(100% - 20px); +} + +.ss-gridfield-add-new-multi-class .form-group:after { + border:0; +} + +.btn__addnewmulticlass { + border-top-left-radius: 0; + border-bottom-left-radius: 0; + line-height: 1.85em; +} + +.ss-gridfield-add-new-multi-class .chosen-container-active.chosen-with-drop .chosen-single, +.ss-gridfield-add-new-multi-class .chosen-container-single .chosen-single { + border-top-right-radius: 0; + border-bottom-right-radius: 0; +} +/** + * GridFieldEditableColumns + */ + +.ss-gridfield-editable .readonly { + padding-top: 0 !important; +} + +.ss-gridfield-editable input.text, +.ss-gridfield-editable textarea, +.ss-gridfield-editable select, +.ss-gridfield-editable .TreeDropdownField { + margin: 0 !important; + max-width: none !important; +} + +.ss-gridfield-editable select.dropdown { + border: 1px solid #b3b3b3; + background-color: #fff; + padding: 7px 7px 7px 4px; + line-height: 16px; + -moz-border-radius: 4px; + -webkit-border-radius: 4px; + border-radius: 4px; +} + +.ss-gridfield-add-new-inline { + margin-bottom: 12px; +} + +.ss-gridfield-add-new-inline span.readonly { + color: #FFF !important; +} + +.ss-gridfield-add-new-inline .col-buttons { + text-align: right; +} + +/** + * GridFieldOrderableRows + */ + +.ss-gridfield-orderable thead tr th.col-Reorder span { + padding: 0 !important; + margin-left: 8px; +} + +.ss-gridfield-orderable .col-reorder { + position: relative; + padding: 0 !important; + width: 16px !important; +} + +.ss-gridfield-orderable .col-reorder .handle { + cursor: move; + padding: 16px 0 11px; +} + +.ss-gridfield-orderable .col-reorder .handle .icon { + line-height: 100%; + font-size: 1.5em; +} + +.ss-gridfield-orderhelper { + border-bottom: 1px solid rgba(0, 0, 0, .1); + border-top: 1px solid rgba(0, 0, 0, .1); + box-shadow: 0 0 8px rgba(0, 0, 0, .4); +} + +.ss-gridfield-orderable tfoot .ui-droppable { + padding-left: 12px; + padding-right: 12px; +} + +.ss-gridfield-orderable tfoot .ui-droppable-active { + background-color: #D4CF90 !important; +} + +.ss-gridfield-orderable tfoot .ss-gridfield-previouspage { + background-position: -16px 9px !important; + margin-left: 0; +} + +.ss-gridfield-orderable tfoot .ss-gridfield-nextpage { + background-position: -40px 9px !important; + margin-right: 0; +} diff --git a/templates/Symbiote/GridFieldExtensions/GridFieldOrderableRowsDragHandle.ss b/templates/Symbiote/GridFieldExtensions/GridFieldOrderableRowsDragHandle.ss index 05169a6..4d9f7ca 100644 --- a/templates/Symbiote/GridFieldExtensions/GridFieldOrderableRowsDragHandle.ss +++ b/templates/Symbiote/GridFieldExtensions/GridFieldOrderableRowsDragHandle.ss @@ -1,2 +1,2 @@ - +
$SortField