diff --git a/admin/css/screen.css b/admin/css/screen.css
index 2dd918908..c52473834 100644
--- a/admin/css/screen.css
+++ b/admin/css/screen.css
@@ -405,7 +405,7 @@ form.member-profile-form .ui-corner-all, form.member-profile-form .ui-corner-top
.cms .cms-content { border-right: 1px solid rgba(201, 205, 206, 0.8); -moz-box-shadow: 3px 0 4px rgba(0, 0, 0, 0.15); -webkit-box-shadow: 3px 0 4px rgba(0, 0, 0, 0.15); -o-box-shadow: 3px 0 4px rgba(0, 0, 0, 0.15); box-shadow: 3px 0 4px rgba(0, 0, 0, 0.15); -moz-border-radius: 0; -webkit-border-radius: 0; -o-border-radius: 0; -ms-border-radius: 0; -khtml-border-radius: 0; border-radius: 0; }
.cms .cms-content-fields { /* always show a y scroll bar as popups like TreeDropdowns can trigger longer pages and the extra scroll bar doesn't fire our sizing bar */ overflow-y: auto; overflow-x: auto; background: none; width: 100%; }
-.cms .cms-content-fields .aligned_right_label { margin-left: 184px; padding: 8px 0; }
+.cms .cms-content-fields .aligned-right-label { margin-left: 184px; padding: 8px 0; }
/** -------------------------------------------- "Settings" Form -------------------------------------------- */
#CanViewType .optionset li, #CanEditType .optionset li, #CanCreateTopLevelType .optionset li { float: none; width: auto; }
@@ -503,7 +503,7 @@ form.small .cms-file-info-data .field .middleColumn { margin-left: 120px; }
.members_grid span button#action_gridfield_relationfind { display: none; }
.members_grid p button#action_export { margin-top: 16px; }
.members_grid p button#action_export span.btn-icon-download-csv { height: 17px; }
-.members_grid p button#action_export span.ui-button-text { padding-left: 27px; }
+.members_grid p button#action_export span.ui-button-text { padding-left: 26px; }
/** This file defines the jstree base styling (see http://jstree.com), as well as any customizations (see bottom of file). The styles are usually added through jstree.js on DOM load, but we need it earlier in order to correctly display the uninitialized tree. */
.cms .jstree ul, .TreeDropdownField .treedropdownfield-panel .jstree ul { display: block; margin: 0; padding: 0; background: none; list-style-type: none; }
diff --git a/admin/scss/_style.scss b/admin/scss/_style.scss
index 7e72a5f89..d0f1466c6 100644
--- a/admin/scss/_style.scss
+++ b/admin/scss/_style.scss
@@ -907,7 +907,7 @@ form.member-profile-form {
overflow-x: auto;
background: none;
width:100%;
- .aligned_right_label {
+ .aligned-right-label {
margin-left:$grid-x*23;
padding:$grid-x 0;
}
@@ -1359,10 +1359,10 @@ form.small {
p button#action_export {
margin-top:$grid-y*2;
span.btn-icon-download-csv {
- height:$grid-y*2 + 1;
+ height:17px;
}
span.ui-button-text {
- padding-left:$grid-x*3 + 3;
+ padding-left:26px;
}
}
}
\ No newline at end of file
diff --git a/css/GridField.css b/css/GridField.css
index d4dec410e..c2f5cab7d 100644
--- a/css/GridField.css
+++ b/css/GridField.css
@@ -57,7 +57,7 @@
.cms table.ss-gridfield-table tr th span.non-sortable { padding: 1em 1em; display: block; }
.cms table.ss-gridfield-table tr td { border-right: 1px solid rgba(0, 0, 0, 0.1); padding: 6.4px 12px; color: #666666; }
.cms table.ss-gridfield-table tr td.bottom-all { -moz-border-radius-bottomleft: 7px; -webkit-border-bottom-left-radius: 7px; -o-border-bottom-left-radius: 7px; -ms-border-bottom-left-radius: 7px; -khtml-border-bottom-left-radius: 7px; border-bottom-left-radius: 7px; -moz-border-radius-bottomright: 7px; -webkit-border-bottom-right-radius: 7px; -o-border-bottom-right-radius: 7px; -ms-border-bottom-right-radius: 7px; -khtml-border-bottom-right-radius: 7px; border-bottom-right-radius: 7px; background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #b1c0c5), color-stop(100%, #7f9198)); background-image: -webkit-linear-gradient(#b1c0c5, #7f9198); background-image: -moz-linear-gradient(#b1c0c5, #7f9198); background-image: -o-linear-gradient(#b1c0c5, #7f9198); background-image: -ms-linear-gradient(#b1c0c5, #7f9198); background-image: linear-gradient(#b1c0c5, #7f9198); }
-.cms table.ss-gridfield-table tr td.bottom-all .datagrid-pagination { padding-top: 2px; position: absolute; left: 50%; margin-left: 116px; }
+.cms table.ss-gridfield-table tr td.bottom-all .datagrid-pagination { padding-top: 2px; position: absolute; left: 50%; margin-left: -116px; }
.cms table.ss-gridfield-table tr td.bottom-all .datagrid-pagination .pagination-page-number { color: white; }
.cms table.ss-gridfield-table tr td.bottom-all .datagrid-pagination .pagination-page-number input { width: 35px; height: 18px; margin-bottom: -6px; padding: 0px; }
.cms table.ss-gridfield-table tr td.bottom-all .datagrid-pagination button.ss-gridfield-previouspage { background: url(../images/icons/pagination-arrows.png) no-repeat -23px 7px; -moz-box-shadow: none; -webkit-box-shadow: none; box-shadow: none; border: none; width: 10px; margin: 0 10px; }
diff --git a/scss/GridField.scss b/scss/GridField.scss
index e4d59fc88..154658741 100644
--- a/scss/GridField.scss
+++ b/scss/GridField.scss
@@ -375,7 +375,7 @@ $gf_grid_x: 16px;
padding-top:2px;
position:absolute;
left:50%;
- margin-left:116px;
+ margin-left:-116px;
.pagination-page-number {
color:$color-text-light;
input {
diff --git a/security/Group.php b/security/Group.php
index bd692d0ad..ee52b4521 100755
--- a/security/Group.php
+++ b/security/Group.php
@@ -85,7 +85,7 @@ class Group extends DataObject {
)
);
- $parentidfield->setRightTitle('' . _t('Group.GroupReminder', 'If you choose a parent group, this group will take all it\'s roles') . '');
+ $parentidfield->setRightTitle('' . _t('Group.GroupReminder', 'If you choose a parent group, this group will take all it\'s roles') . '');
// Filter permissions
// TODO SecurityAdmin coupling, not easy to get to the form fields through GridFieldDetailForm