From 2095743a688fa5da6baaa70be6f19fb5abcaf01d Mon Sep 17 00:00:00 2001 From: jbridson Date: Thu, 8 Mar 2012 16:39:45 +1300 Subject: [PATCH] MINOR:SSF-106 - edited the SCSS so that measurements use increments of $gf_gridy/x --- css/GridField.css | 5 +++-- scss/GridField.scss | 11 +++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/css/GridField.css b/css/GridField.css index dfbaf85bf..8f99fced2 100644 --- a/css/GridField.css +++ b/css/GridField.css @@ -53,11 +53,12 @@ .cms table.ss-gridfield-table tr th button.ss-gridfield-button-reset.ss-ui-button.filtered:active { background: url(../images/icons/filter-icons.png) no-repeat 8px -17px, -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ff0000), color-stop(100%, #cc0000)); background: url(../images/icons/filter-icons.png) no-repeat 8px -17px, -webkit-linear-gradient(#ff0000, #cc0000); background: url(../images/icons/filter-icons.png) no-repeat 8px -17px, -moz-linear-gradient(#ff0000, #cc0000); background: url(../images/icons/filter-icons.png) no-repeat 8px -17px, -o-linear-gradient(#ff0000, #cc0000); background: url(../images/icons/filter-icons.png) no-repeat 8px -17px, -ms-linear-gradient(#ff0000, #cc0000); background: url(../images/icons/filter-icons.png) no-repeat 8px -17px, linear-gradient(#ff0000, #cc0000); -moz-box-shadow: inset 0 1px 3px #17181a, 0 1px 0 rgba(255, 255, 255, 0.6); -webkit-box-shadow: inset 0 1px 3px #17181a, 0 1px 0 rgba(255, 255, 255, 0.6); -o-box-shadow: inset 0 1px 3px #17181a, 0 1px 0 rgba(255, 255, 255, 0.6); box-shadow: inset 0 1px 3px #17181a, 0 1px 0 rgba(255, 255, 255, 0.6); } .cms table.ss-gridfield-table tr th input.ss-gridfield-sort { padding: 2px; } .cms table.ss-gridfield-table tr th input.ss-gridfield-sort:focus { -moz-box-shadow: none; -webkit-box-shadow: none; box-shadow: none; } -.cms table.ss-gridfield-table tr th span.non-sortable { padding: .4em 1em; } +.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 { position: absolute; left: 50%; margin-left: -160px; } +.cms table.ss-gridfield-table tr td.bottom-all .datagrid-pagination { 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: 20px; 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; } .cms table.ss-gridfield-table tr td.bottom-all .datagrid-pagination button.ss-gridfield-previouspage span { text-indent: -9999em; } .cms table.ss-gridfield-table tr td.bottom-all .datagrid-pagination button.ss-gridfield-nextpage { background: url(../images/icons/pagination-arrows.png) no-repeat -47px 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 f2ebfd3a4..7e108d6ae 100644 --- a/scss/GridField.scss +++ b/scss/GridField.scss @@ -67,7 +67,7 @@ $gf_grid_x: 16px; background: transparent; tr.filter-header { .fieldgroup { - max-width:512px; + max-width:$gf_grid_x*32; } } } @@ -78,7 +78,7 @@ $gf_grid_x: 16px; button { border: none; background: none; - margin: 0 0 0 2px; + margin: 0 0 0 $gf_grid_x/8; padding: 0; width: auto; text-shadow: none; @@ -128,7 +128,7 @@ $gf_grid_x: 16px; background: $gf_colour_gradient_dark; border-top: 1px solid $gf_colour_border; padding: 5px; - min-height: 40px; + min-height: $gf_grid_y*3 + 4; @include background-image(linear-gradient($gf_colour_gradient_light, $gf_colour_gradient_dark)); @include border-top-radius($gf_border_radius); @include single-text-shadow($gf_colour_text_shadow, 0px, -1px, 0); @@ -136,7 +136,7 @@ $gf_grid_x: 16px; padding: 0px; font-size: $gf_grid_y*1.4; color:#fff; - margin:3px $gf_grid_x/2 0; + margin:$gf_grid_y/4 $gf_grid_x/2 0; display:inline-block; } .new{ @@ -209,7 +209,6 @@ $gf_grid_x: 16px; span{ @include single-text-shadow($gf_colour_text_shadow, 0px, -1px, 0); } - } &.extra { background: $gf_colour_subheader; @@ -255,7 +254,7 @@ $gf_grid_x: 16px; border:none; width:100%; text-align: left; - padding: 4px 0; + padding: $gf_grid_y/3 0; @include single-text-shadow($gf_colour_text_shadow, 0px, -1px, 0); color: #fff; @include border-radius(0);