Merge branch 'master' of git://github.com/silverstripe/silverstripe-blog

This commit is contained in:
Daniel Caine 2015-04-28 11:55:52 +12:00
commit a56ba6a567
2 changed files with 20 additions and 8 deletions

View File

@ -122,11 +122,15 @@ label.right.toggle-description-correct-right {
} }
.cms table.ss-gridfield-table tr td.MergeAction { .cms table.ss-gridfield-table tr td.MergeAction {
width: 150px; width: 225px;
}
.cms table.ss-gridfield-table tr td.MergeAction a {
display: block;
height: 100%;
width: 100%;
} }
.cms table.ss-gridfield-table tr td.MergeAction select { .cms table.ss-gridfield-table tr td.MergeAction select {
width: 75px; width: 150px;
} }
.cms-content-actions, .cms-content-actions,

View File

@ -153,12 +153,20 @@ label.right.toggle-description-correct-right {
} }
} }
.cms table.ss-gridfield-table tr td.MergeAction { .cms table.ss-gridfield-table {
width: 150px; tr td.MergeAction {
} width: 225px;
.cms table.ss-gridfield-table tr td.MergeAction select { a {
width: 75px; display: block;
height: 100%;
width: 100%;
}
select {
width: 150px;
}
}
} }
.cms-content-actions, .cms-content-actions,