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 to allow buttons to align inline (fixes #8099)

Browse Source
This commit is contained in:
Paul Clarke 2012-12-13 10:09:30 +01:00 committed by Ingo Schommer
parent bdc3e91e01
commit 0ba51c1ebf
4 changed files with 17 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
admin/css/screen.css
View File

@ -669,7 +669,6 @@ form.small .cms-file-info-data .field .middleColumn { margin-left: 120px; }
/** -------------------------------------------- Users Members Admin -------------------------------------------- */ /** -------------------------------------------- Users Members Admin -------------------------------------------- */
.members_grid span button#action_gridfield_relationfind { display: none; } .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.btn-icon-download-csv { height: 17px; }
.members_grid p button#action_export .ui-button-text { padding-left: 26px; } .members_grid p button#action_export .ui-button-text { padding-left: 26px; }

1
admin/scss/_style.scss
View File

@ -1575,7 +1575,6 @@ form.small {
display:none; //hides find button - redundant functionality display:none; //hides find button - redundant functionality
} }
p button#action_export { p button#action_export {
margin-top:$grid-y*2;
span.btn-icon-download-csv { span.btn-icon-download-csv {
height:17px; //exact height of icon height:17px; //exact height of icon
} }

13
css/GridField.css
View File

@ -9,13 +9,11 @@
/** ----------------------------------------------- Grid Units (px) We have a vertical rhythm that the grid is based off both x (=horizontal) and y (=vertical). All internal padding and margins are scaled to this and accounting for paragraphs ------------------------------------------------ */ /** ----------------------------------------------- Grid Units (px) We have a vertical rhythm that the grid is based off both x (=horizontal) and y (=vertical). All internal padding and margins are scaled to this and accounting for paragraphs ------------------------------------------------ */
/** ----------------------------------------------- Application Logo (CMS Logo) Must be 24px x 24px ------------------------------------------------ */ /** ----------------------------------------------- Application Logo (CMS Logo) Must be 24px x 24px ------------------------------------------------ */
.cms .ss-gridfield > div { margin-bottom: 36px; } .cms .ss-gridfield > div { margin-bottom: 36px; }
.cms .ss-gridfield > div.addNewGridFieldButton { margin-bottom: 12px; } .cms .ss-gridfield > div.addNewGridFieldButton { margin-bottom: 0; }
.cms .ss-gridfield > div.addNewGridFieldButton:after { content: "."; display: block; height: 0; clear: both; visibility: hidden; } .cms .ss-gridfield > div.addNewGridFieldButton .action { margin-bottom: 12px; }
*:first-child .cms .ss-gridfield > div.addNewGridFieldButton { zoom: 1; }
.cms .ss-gridfield[data-selectable] tr.ui-selected, .cms .ss-gridfield[data-selectable] tr.ui-selecting { background: #FFFAD6 !important; } .cms .ss-gridfield[data-selectable] tr.ui-selected, .cms .ss-gridfield[data-selectable] tr.ui-selecting { background: #FFFAD6 !important; }
.cms .ss-gridfield[data-selectable] td { cursor: pointer; } .cms .ss-gridfield[data-selectable] td { cursor: pointer; }
.cms .ss-gridfield span button#action_gridfield_relationfind { display: none; } .cms .ss-gridfield span button#action_gridfield_relationfind { display: none; }
.cms .ss-gridfield p button#action_export { margin-top: 12px; }
.cms .ss-gridfield p button#action_export span.btn-icon-download-csv { height: 17px; } .cms .ss-gridfield p button#action_export span.btn-icon-download-csv { height: 17px; }
.cms .ss-gridfield p button#action_export .ui-button-text { padding-left: 26px; } .cms .ss-gridfield p button#action_export .ui-button-text { padding-left: 26px; }
.cms .ss-gridfield .right { float: right; } .cms .ss-gridfield .right { float: right; }
@ -25,10 +23,9 @@
.cms .ss-gridfield .left > * { margin-right: 5px; float: left; font-size: 14.4px; } .cms .ss-gridfield .left > * { margin-right: 5px; float: left; font-size: 14.4px; }
.cms .ss-gridfield .grid-levelup { text-indent: -9999em; margin-bottom: 6px; } .cms .ss-gridfield .grid-levelup { text-indent: -9999em; margin-bottom: 6px; }
.cms .ss-gridfield .grid-levelup a.list-parent-link { background: transparent url(../images/gridfield-level-up.png) no-repeat 0 0; display: block; } .cms .ss-gridfield .grid-levelup a.list-parent-link { background: transparent url(../images/gridfield-level-up.png) no-repeat 0 0; display: block; }
.cms .ss-gridfield .add-existing-autocompleter { width: 500px; } .cms .ss-gridfield .add-existing-autocompleter span { display: inline-block; }
.cms .ss-gridfield .add-existing-autocompleter input.relation-search { width: 380px; } .cms .ss-gridfield .add-existing-autocompleter input.relation-search { width: 270px; }
.cms .ss-gridfield .grid-print-button { display: inline-block; } .cms .ss-gridfield .grid-csv-button, .cms .ss-gridfield .grid-print-button { margin-bottom: 12px; display: inline-block; }
.cms .ss-gridfield .grid-csv-button { display: inline-block; }
.cms table.ss-gridfield-table { display: table; -moz-box-shadow: none; -webkit-box-shadow: none; box-shadow: none; padding: 0; border-collapse: separate; border-bottom: 0 none; width: 100%; margin-bottom: 12px; } .cms table.ss-gridfield-table { display: table; -moz-box-shadow: none; -webkit-box-shadow: none; box-shadow: none; padding: 0; border-collapse: separate; border-bottom: 0 none; width: 100%; margin-bottom: 12px; }
.cms table.ss-gridfield-table thead { color: #323e46; background: transparent; } .cms table.ss-gridfield-table thead { color: #323e46; background: transparent; }
.cms table.ss-gridfield-table thead tr.filter-header .fieldgroup { max-width: 512px; } .cms table.ss-gridfield-table thead tr.filter-header .fieldgroup { max-width: 512px; }

24
scss/GridField.scss
View File

@ -41,8 +41,10 @@ $gf_grid_x: 16px;
& > div { & > div {
margin-bottom: $gf_grid_y*3; margin-bottom: $gf_grid_y*3;
&.addNewGridFieldButton{ &.addNewGridFieldButton{
margin-bottom:$gf_grid_y; margin-bottom: 0;
@include clearfix; .action {
margin-bottom: $gf_grid_y;
}
} }
} }
@ -61,7 +63,6 @@ $gf_grid_x: 16px;
} }
p button#action_export { p button#action_export {
margin-top:$gf_grid_y;
span.btn-icon-download-csv { span.btn-icon-download-csv {
height:17px; //exact height of icon height:17px; //exact height of icon
} }
@ -77,8 +78,7 @@ $gf_grid_x: 16px;
font-size: $gf_grid_y*1.2; font-size: $gf_grid_y*1.2;
} }
.pagination-records-number .pagination-records-number {
{
font-size: 1.0em; font-size: 1.0em;
padding: 6px 3px 6px 0; padding: 6px 3px 6px 0;
color: $color-text-light; color: $color-text-light;
@ -106,15 +106,15 @@ $gf_grid_x: 16px;
margin-bottom: 6px; margin-bottom: 6px;
} }
.add-existing-autocompleter { .add-existing-autocompleter {
input.relation-search { span {
width: 380px;
}
width: 500px;
}
.grid-print-button{
display: inline-block; display: inline-block;
} }
.grid-csv-button{ input.relation-search {
width: 270px;
}
}
.grid-csv-button, .grid-print-button {
margin-bottom: $gf_grid_y;
display: inline-block; display: inline-block;
} }
} }