From 0ba51c1ebfed2674bed64e5aaea8bf84d3384be1 Mon Sep 17 00:00:00 2001 From: Paul Clarke Date: Thu, 13 Dec 2012 10:09:30 +0100 Subject: [PATCH] Fix to allow buttons to align inline (fixes #8099) --- admin/css/screen.css | 1 - admin/scss/_style.scss | 1 - css/GridField.css | 13 +++++-------- scss/GridField.scss | 24 ++++++++++++------------ 4 files changed, 17 insertions(+), 22 deletions(-) diff --git a/admin/css/screen.css b/admin/css/screen.css index 874636bad..9e562767b 100644 --- a/admin/css/screen.css +++ b/admin/css/screen.css @@ -669,7 +669,6 @@ form.small .cms-file-info-data .field .middleColumn { margin-left: 120px; } /** -------------------------------------------- Users Members Admin -------------------------------------------- */ .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 .ui-button-text { padding-left: 26px; } diff --git a/admin/scss/_style.scss b/admin/scss/_style.scss index a062121fb..fbdc704b6 100644 --- a/admin/scss/_style.scss +++ b/admin/scss/_style.scss @@ -1575,7 +1575,6 @@ form.small { display:none; //hides find button - redundant functionality } p button#action_export { - margin-top:$grid-y*2; span.btn-icon-download-csv { height:17px; //exact height of icon } diff --git a/css/GridField.css b/css/GridField.css index ec1280ebc..eaeffbdd4 100644 --- a/css/GridField.css +++ b/css/GridField.css @@ -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 ------------------------------------------------ */ /** ----------------------------------------------- Application Logo (CMS Logo) Must be 24px x 24px ------------------------------------------------ */ .cms .ss-gridfield > div { margin-bottom: 36px; } -.cms .ss-gridfield > div.addNewGridFieldButton { margin-bottom: 12px; } -.cms .ss-gridfield > div.addNewGridFieldButton:after { content: "."; display: block; height: 0; clear: both; visibility: hidden; } -*:first-child .cms .ss-gridfield > div.addNewGridFieldButton { zoom: 1; } +.cms .ss-gridfield > div.addNewGridFieldButton { margin-bottom: 0; } +.cms .ss-gridfield > div.addNewGridFieldButton .action { margin-bottom: 12px; } .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 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 .ui-button-text { padding-left: 26px; } .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 .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 .add-existing-autocompleter { width: 500px; } -.cms .ss-gridfield .add-existing-autocompleter input.relation-search { width: 380px; } -.cms .ss-gridfield .grid-print-button { display: inline-block; } -.cms .ss-gridfield .grid-csv-button { display: inline-block; } +.cms .ss-gridfield .add-existing-autocompleter span { display: inline-block; } +.cms .ss-gridfield .add-existing-autocompleter input.relation-search { width: 270px; } +.cms .ss-gridfield .grid-csv-button, .cms .ss-gridfield .grid-print-button { margin-bottom: 12px; 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 thead { color: #323e46; background: transparent; } .cms table.ss-gridfield-table thead tr.filter-header .fieldgroup { max-width: 512px; } diff --git a/scss/GridField.scss b/scss/GridField.scss index 57cab751d..7e7770162 100644 --- a/scss/GridField.scss +++ b/scss/GridField.scss @@ -41,8 +41,10 @@ $gf_grid_x: 16px; & > div { margin-bottom: $gf_grid_y*3; &.addNewGridFieldButton{ - margin-bottom:$gf_grid_y; - @include clearfix; + margin-bottom: 0; + .action { + margin-bottom: $gf_grid_y; + } } } @@ -61,7 +63,6 @@ $gf_grid_x: 16px; } p button#action_export { - margin-top:$gf_grid_y; span.btn-icon-download-csv { height:17px; //exact height of icon } @@ -77,8 +78,7 @@ $gf_grid_x: 16px; font-size: $gf_grid_y*1.2; } - .pagination-records-number - { + .pagination-records-number { font-size: 1.0em; padding: 6px 3px 6px 0; color: $color-text-light; @@ -106,15 +106,15 @@ $gf_grid_x: 16px; margin-bottom: 6px; } .add-existing-autocompleter { - input.relation-search { - width: 380px; + span { + display: inline-block; + } + input.relation-search { + width: 270px; } - width: 500px; } - .grid-print-button{ - display: inline-block; - } - .grid-csv-button{ + .grid-csv-button, .grid-print-button { + margin-bottom: $gf_grid_y; display: inline-block; } }