From c599f876afab8d69e350491294a8cf27ba6010eb Mon Sep 17 00:00:00 2001 From: James Cocker Date: Fri, 8 Aug 2014 15:25:38 +0100 Subject: [PATCH] GridFieldBulkUpload CSS Improvements --- bulkUpload/css/GridFieldBulkUpload.css | 22 ++++++++++++-------- bulkUpload/css/GridFieldBulkUpload.scss | 27 +++++++++++++++++-------- 2 files changed, 33 insertions(+), 16 deletions(-) diff --git a/bulkUpload/css/GridFieldBulkUpload.css b/bulkUpload/css/GridFieldBulkUpload.css index a602df5..3c10ca6 100644 --- a/bulkUpload/css/GridFieldBulkUpload.css +++ b/bulkUpload/css/GridFieldBulkUpload.css @@ -26,9 +26,11 @@ overflow: hidden; width: 98%; padding: 5px 1% 5px 1%; - border: none; } + border: none; + border-top: 1px solid rgba(0, 0, 0, 0.1); + background-color: #eceff1; } .bulkUpload .component div.ss-uploadfield .ss-uploadfield-files .ss-uploadfield-item:nth-child(2n-1) { - background-color: rgba(0, 0, 0, 0.1); } + background-color: #e6eaed; } .bulkUpload .component div.ss-uploadfield .ss-uploadfield-files .ss-uploadfield-item .ss-uploadfield-item-preview { width: 30px; height: 30px; @@ -45,7 +47,9 @@ height: 100%; line-height: 40px; } .bulkUpload .component div.ss-uploadfield .ss-uploadfield-files .ss-uploadfield-item .ss-uploadfield-item-info .ss-uploadfield-item-name .name { - color: #eee; } + color: #343434; } + .bulkUpload .component div.ss-uploadfield .ss-uploadfield-files .ss-uploadfield-item .ss-uploadfield-item-info .ss-uploadfield-item-name .size { + font-weight: normal; } .bulkUpload .component div.ss-uploadfield .ss-uploadfield-files .ss-uploadfield-item .ss-uploadfield-item-info .ss-uploadfield-item-name .ss-uploadfield-item-status { float: left; width: auto; @@ -53,7 +57,7 @@ text-align: left; max-width: none; } .bulkUpload .component div.ss-uploadfield .ss-uploadfield-files .ss-uploadfield-item .ss-uploadfield-item-info .ss-uploadfield-item-name .ss-uploadfield-item-status.ui-state-warning-text { - color: #f2be08; } + color: #f29500; } .bulkUpload .component div.ss-uploadfield .ss-uploadfield-files .ss-uploadfield-item .ss-uploadfield-item-info .ss-uploadfield-item-name .ss-uploadfield-item-status.ui-state-success-text { color: #298530; } .bulkUpload .component div.ss-uploadfield .ss-uploadfield-files .ss-uploadfield-item .ss-uploadfield-item-info .ss-uploadfield-item-actions { @@ -110,7 +114,9 @@ margin: 0; } .bulkUpload .component div.ss-uploadfield .ss-uploadfield-addfile .ss-uploadfield-item-info .ss-uploadfield-item-name { height: auto; - margin-bottom: 2px; } + margin-bottom: 5px !important; } + .bulkUpload .component div.ss-uploadfield .ss-uploadfield-addfile .ss-uploadfield-item-info .ss-uploadfield-item-name small { + font-weight: normal !important; } .bulkUpload .component div.ss-uploadfield .ss-uploadfield-addfile .ss-uploadfield-item-info .ss-ui-button .ui-button-text .ui-button-text { padding: 0px; } .bulkUpload .component div.ss-uploadfield .ss-uploadfield-addfile .ss-uploadfield-item-info .ss-uploadfield-fromcomputer { @@ -123,7 +129,7 @@ float: left; width: 98%; padding: 6px 1% 6px 1%; - border-top: 1px solid rgba(0, 0, 0, 0.1); } + background-color: #8898a3; } .bulkUpload .component div.ss-uploadfield .colymba-bulkupload-buttons button { float: left; margin: 0 6px 0 0; } @@ -134,7 +140,7 @@ margin: 0 0 0 6px; } .bulkUpload .component div.ss-uploadfield .colymba-bulkupload-buttons .colymba-bulkupload-info { float: left; - margin: 0 6px 0 0; + margin: 0 6px 0 6px; line-height: 28px; height: 28px; - color: #73818a; } + color: #ffffff; } diff --git a/bulkUpload/css/GridFieldBulkUpload.scss b/bulkUpload/css/GridFieldBulkUpload.scss index 37a9045..e074b63 100644 --- a/bulkUpload/css/GridFieldBulkUpload.scss +++ b/bulkUpload/css/GridFieldBulkUpload.scss @@ -50,11 +50,13 @@ padding: 5px 1% 5px 1%; border: none; - //border-top: 1px solid rgba(0, 0, 0, 0.1); + border-top: 1px solid rgba(0, 0, 0, 0.1); + + background-color: #eceff1; &:nth-child(2n-1) { - background-color: rgba(0,0,0,.1); // #4a4b4d; + background-color: #e6eaed; } .ss-uploadfield-item-preview @@ -82,7 +84,11 @@ .name { - color: #eee; + color: #343434; + } + + .size { + font-weight: normal; } .ss-uploadfield-item-status @@ -95,7 +101,7 @@ &.ui-state-warning-text { - color: #f2be08; + color: #f29500; } &.ui-state-success-text { @@ -208,7 +214,10 @@ .ss-uploadfield-item-name { height: auto; - margin-bottom: 2px; + margin-bottom: 5px !important; + small { + font-weight: normal !important; + } } .ss-ui-button @@ -242,7 +251,9 @@ width: 98%; padding: 6px 1% 6px 1%; - border-top: 1px solid rgba(0, 0, 0, 0.1); + // border-top: 1px solid rgba(0, 0, 0, 0.1); + + background-color: #8898a3; button { @@ -268,10 +279,10 @@ .colymba-bulkupload-info { float: left; - margin: 0 6px 0 0; + margin: 0 6px 0 6px; line-height: 28px; height: 28px; - color: #73818a; + color: #ffffff; } }