mirror of
https://github.com/symbiote/silverstripe-gridfieldextensions.git
synced 2024-10-22 17:05:39 +02:00
BUG Fix incorrect drag-drop handle
Update .editorconfig to match css / scss coding conventions
This commit is contained in:
Damian Mooyman
Daniel Hensby
parent
db29e863f7
commit
973f524b41
@ -15,12 +15,6 @@ trim_trailing_whitespace = true
|
|||||||
[*.md]
|
[*.md]
|
||||||
trim_trailing_whitespace = false
|
trim_trailing_whitespace = false
|
||||||
|
|
||||||
[*.yml]
|
[*.{yml,js,json,css,scss,eslintrc}]
|
||||||
indent_size = 2
|
indent_size = 2
|
||||||
indent_style = space
|
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
|
|
||||||
@ -1,213 +1,201 @@
|
|||||||
/**
|
/**
|
||||||
* GridFieldAddExistingSearchButton
|
* GridFieldAddExistingSearchButton
|
||||||
*/
|
*/
|
||||||
|
|
||||||
.add-existing-search-dialog {
|
.add-existing-search-dialog {
|
||||||
min-width: inherit !important;
|
min-width: inherit !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
.add-existing-search-dialog .add-existing-search-form .field {
|
.add-existing-search-dialog .add-existing-search-form .field {
|
||||||
border: none;
|
border: none;
|
||||||
box-shadow: none;
|
box-shadow: none;
|
||||||
margin-bottom: 0;
|
margin-bottom: 0;
|
||||||
padding-bottom: 0;
|
padding-bottom: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
.add-existing-search-dialog .add-existing-search-form .field label {
|
.add-existing-search-dialog .add-existing-search-form .field label {
|
||||||
padding-bottom: 4px;
|
padding-bottom: 4px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.add-existing-search-dialog .add-existing-search-form .Actions {
|
.add-existing-search-dialog .add-existing-search-form .Actions {
|
||||||
margin-top: 10px;
|
margin-top: 10px;
|
||||||
padding: 0;
|
padding: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
.add-existing-search-dialog .add-existing-search-items li a {
|
.add-existing-search-dialog .add-existing-search-items li a {
|
||||||
background: #FFF;
|
background: #FFF;
|
||||||
border-bottom-width: 1px;
|
border: solid #CCC;
|
||||||
border-color: #CCC;
|
border-right-width: 1px;
|
||||||
border-left-width: 1px;
|
border-bottom-width: 1px;
|
||||||
border-right-width: 1px;
|
border-left-width: 1px;
|
||||||
border-style: solid;
|
display: block;
|
||||||
display: block;
|
padding: 6px;
|
||||||
padding: 6px;
|
}
|
||||||
}
|
|
||||||
|
.add-existing-search-dialog .add-existing-search-items li:first-child a {
|
||||||
.add-existing-search-dialog .add-existing-search-items li:first-child a {
|
border-top-left-radius: 4px;
|
||||||
border-top-left-radius: 4px;
|
border-top-right-radius: 4px;
|
||||||
border-top-right-radius: 4px;
|
border-top-width: 1px;
|
||||||
border-top-width: 1px;
|
}
|
||||||
}
|
|
||||||
|
.add-existing-search-dialog .add-existing-search-items li:last-child a {
|
||||||
.add-existing-search-dialog .add-existing-search-items li:last-child a {
|
border-bottom-left-radius: 4px;
|
||||||
border-bottom-left-radius: 4px;
|
border-bottom-right-radius: 4px;
|
||||||
border-bottom-right-radius: 4px;
|
}
|
||||||
}
|
|
||||||
|
.add-existing-search-dialog .add-existing-search-items li a:hover {
|
||||||
.add-existing-search-dialog .add-existing-search-items li a:hover {
|
background: #F4F4F4;
|
||||||
background: #F4F4F4;
|
}
|
||||||
}
|
|
||||||
|
.add-existing-search-dialog .add-existing-search-pagination li {
|
||||||
.add-existing-search-dialog .add-existing-search-pagination li {
|
background: #FFF;
|
||||||
background: #FFF;
|
display: block;
|
||||||
display: block;
|
float: left;
|
||||||
float: left;
|
margin-right: 2px;
|
||||||
margin-right: 2px;
|
margin-top: 12px;
|
||||||
margin-top: 12px;
|
padding: 6px;
|
||||||
padding: 6px;
|
}
|
||||||
}
|
|
||||||
|
/**
|
||||||
/**
|
* GridFieldAddNewInlineButton
|
||||||
* GridFieldAddNewInlineButton
|
*/
|
||||||
*/
|
|
||||||
|
.ss-gridfield-inline-new {
|
||||||
.ss-gridfield-inline-new {
|
background: #EFE;
|
||||||
background: #EFE;
|
}
|
||||||
}
|
|
||||||
|
.ss-gridfield-inline-new:nth-child(2n) {
|
||||||
.ss-gridfield-inline-new:nth-child(2n) {
|
background: #DFD;
|
||||||
background: #DFD;
|
}
|
||||||
}
|
|
||||||
|
/**
|
||||||
/**
|
* GridFieldAddNewMultiClass
|
||||||
* GridFieldAddNewMultiClass
|
*/
|
||||||
*/
|
|
||||||
|
.ss-gridfield-add-new-multi-class {
|
||||||
.ss-gridfield-add-new-multi-class {
|
margin-bottom: 8px !important;
|
||||||
margin-bottom: 8px !important;
|
white-space: nowrap;
|
||||||
white-space: nowrap;
|
}
|
||||||
}
|
|
||||||
|
.ss-gridfield-add-new-multi-class .field {
|
||||||
.ss-gridfield-add-new-multi-class .field {
|
border: none;
|
||||||
border: none;
|
box-shadow: none;
|
||||||
box-shadow: none;
|
float: left;
|
||||||
float: left;
|
margin: 0 4px 0 0;
|
||||||
margin: 0 4px 0 0;
|
}
|
||||||
}
|
|
||||||
|
.cms-edit-form:not(.AssetAdmin) .ss-gridfield-add-new-multi-class .form-group .form__field-holder {
|
||||||
.cms-edit-form:not(.AssetAdmin) .ss-gridfield-add-new-multi-class .form-group .form__field-holder {
|
display: inline;
|
||||||
display: inline;
|
padding: 0;
|
||||||
padding: 0;
|
margin: 0;
|
||||||
margin: 0;
|
}
|
||||||
}
|
|
||||||
|
.cms-edit-form:not(.AssetAdmin) .ss-gridfield-add-new-multi-class .form-group {
|
||||||
.cms-edit-form:not(.AssetAdmin) .ss-gridfield-add-new-multi-class .form-group {
|
display: inline-block;
|
||||||
display: inline-block;
|
margin: 0;
|
||||||
margin: 0;
|
min-width: 150px;
|
||||||
min-width: 150px;
|
width: calc(100% - 20px);
|
||||||
width: calc(100% - 20px);
|
}
|
||||||
}
|
|
||||||
|
.ss-gridfield-add-new-multi-class .form-group:after {
|
||||||
.ss-gridfield-add-new-multi-class .form-group:after {
|
border:0;
|
||||||
border:0;
|
}
|
||||||
}
|
|
||||||
|
.btn__addnewmulticlass {
|
||||||
.btn__addnewmulticlass {
|
border-top-left-radius: 0;
|
||||||
border-top-left-radius: 0;
|
border-bottom-left-radius: 0;
|
||||||
border-bottom-left-radius: 0;
|
line-height: 1.85em;
|
||||||
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-active.chosen-with-drop .chosen-single,
|
.ss-gridfield-add-new-multi-class .chosen-container-single .chosen-single {
|
||||||
.ss-gridfield-add-new-multi-class .chosen-container-single .chosen-single {
|
border-top-right-radius: 0;
|
||||||
border-top-right-radius: 0;
|
border-bottom-right-radius: 0;
|
||||||
border-bottom-right-radius: 0;
|
}
|
||||||
}
|
/**
|
||||||
/**
|
* GridFieldEditableColumns
|
||||||
* GridFieldEditableColumns
|
*/
|
||||||
*/
|
|
||||||
|
.ss-gridfield-editable .readonly {
|
||||||
.ss-gridfield-editable .readonly {
|
padding-top: 0 !important;
|
||||||
padding-top: 0 !important;
|
}
|
||||||
}
|
|
||||||
|
.ss-gridfield-editable input.text,
|
||||||
.ss-gridfield-editable input.text,
|
.ss-gridfield-editable textarea,
|
||||||
.ss-gridfield-editable textarea,
|
.ss-gridfield-editable select,
|
||||||
.ss-gridfield-editable select,
|
.ss-gridfield-editable .TreeDropdownField {
|
||||||
.ss-gridfield-editable .TreeDropdownField {
|
margin: 0 !important;
|
||||||
margin: 0 !important;
|
max-width: none !important;
|
||||||
max-width: none !important;
|
}
|
||||||
}
|
|
||||||
|
.ss-gridfield-editable select.dropdown {
|
||||||
.ss-gridfield-editable select.dropdown {
|
border: 1px solid #b3b3b3;
|
||||||
border: 1px solid #b3b3b3;
|
background-color: #fff;
|
||||||
background-color: #fff;
|
padding: 7px 7px 7px 4px;
|
||||||
padding: 7px 7px;
|
line-height: 16px;
|
||||||
padding-left: 4px;
|
-moz-border-radius: 4px;
|
||||||
line-height: 16px;
|
-webkit-border-radius: 4px;
|
||||||
-moz-border-radius: 4px;
|
border-radius: 4px;
|
||||||
-webkit-border-radius: 4px;
|
}
|
||||||
border-radius: 4px;
|
|
||||||
}
|
.ss-gridfield-add-new-inline {
|
||||||
|
margin-bottom: 12px;
|
||||||
.ss-gridfield-add-new-inline {
|
}
|
||||||
margin-bottom: 12px;
|
|
||||||
}
|
.ss-gridfield-add-new-inline span.readonly {
|
||||||
|
color: #FFF !important;
|
||||||
.ss-gridfield-add-new-inline span.readonly {
|
}
|
||||||
color: #FFF !important;
|
|
||||||
}
|
.ss-gridfield-add-new-inline .col-buttons {
|
||||||
|
text-align: right;
|
||||||
.ss-gridfield-add-new-inline .col-buttons {
|
}
|
||||||
text-align: right;
|
|
||||||
}
|
/**
|
||||||
|
* GridFieldOrderableRows
|
||||||
/**
|
*/
|
||||||
* GridFieldOrderableRows
|
|
||||||
*/
|
.ss-gridfield-orderable thead tr th.col-Reorder span {
|
||||||
|
padding: 0 !important;
|
||||||
.ss-gridfield-orderable thead tr th.col-Reorder span {
|
margin-left: 8px;
|
||||||
padding: 0 !important;
|
}
|
||||||
margin-left: 8px;
|
|
||||||
}
|
.ss-gridfield-orderable .col-reorder {
|
||||||
|
position: relative;
|
||||||
.ss-gridfield-orderable .col-reorder {
|
padding: 0 !important;
|
||||||
position: relative;
|
width: 16px !important;
|
||||||
padding: 0 !important;
|
}
|
||||||
width: 16px !important;
|
|
||||||
}
|
.ss-gridfield-orderable .col-reorder .handle {
|
||||||
|
cursor: move;
|
||||||
.ss-gridfield-orderable .col-reorder .handle {
|
padding: 16px 0 11px;
|
||||||
position: absolute;
|
}
|
||||||
top: 0;
|
|
||||||
left: 0;
|
.ss-gridfield-orderable .col-reorder .handle .icon {
|
||||||
width: 100%;
|
line-height: 100%;
|
||||||
height: 100%;
|
font-size: 1.5em;
|
||||||
cursor: move;
|
}
|
||||||
}
|
|
||||||
|
.ss-gridfield-orderhelper {
|
||||||
.ss-gridfield-orderable .col-reorder .handle .icon {
|
border-bottom: 1px solid rgba(0, 0, 0, .1);
|
||||||
position: absolute;
|
border-top: 1px solid rgba(0, 0, 0, .1);
|
||||||
top: 50%;
|
box-shadow: 0 0 8px rgba(0, 0, 0, .4);
|
||||||
left: 50%;
|
}
|
||||||
width: 5px;
|
|
||||||
height: 11px;
|
.ss-gridfield-orderable tfoot .ui-droppable {
|
||||||
margin: -5px 0 0 -2px;
|
padding-left: 12px;
|
||||||
background-image: url('../../framework/admin/thirdparty/jquery-ui-themes/smoothness/images/ui-icons_222222_256x240.png');
|
padding-right: 12px;
|
||||||
background-position: -5px -227px;
|
}
|
||||||
}
|
|
||||||
|
.ss-gridfield-orderable tfoot .ui-droppable-active {
|
||||||
.ss-gridfield-orderhelper {
|
background-color: #D4CF90 !important;
|
||||||
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 .ss-gridfield-previouspage {
|
||||||
}
|
background-position: -16px 9px !important;
|
||||||
|
margin-left: 0;
|
||||||
.ss-gridfield-orderable tfoot .ui-droppable {
|
}
|
||||||
padding-left: 12px;
|
|
||||||
padding-right: 12px;
|
.ss-gridfield-orderable tfoot .ss-gridfield-nextpage {
|
||||||
}
|
background-position: -40px 9px !important;
|
||||||
|
margin-right: 0;
|
||||||
.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;
|
|
||||||
}
|
|
||||||
|
|||||||
@ -1,2 +1,2 @@
|
|||||||
<span class="handle"><span class="icon"></span></span>
|
<div class="handle"><i class="icon font-icon-drag-handle"></i></div>
|
||||||
$SortField
|
$SortField
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user