From 2015329bd794eb97f401165006a258ebd79db2dd Mon Sep 17 00:00:00 2001 From: Ryan O'Hara Date: Wed, 8 Aug 2012 14:18:29 +1200 Subject: [PATCH] MINOR: Remove border from under actions buttons --- css/DMSDocumentCMSFields.css | 6 ++++-- javascript/DMSDocumentCMSFields.js | 3 ++- scss/DMSDocumentCMSFields.scss | 7 ++++++- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/css/DMSDocumentCMSFields.css b/css/DMSDocumentCMSFields.css index 5aab9f3..4e86bfc 100644 --- a/css/DMSDocumentCMSFields.css +++ b/css/DMSDocumentCMSFields.css @@ -18,15 +18,17 @@ form.small .field input.text, form.small .field textarea, form.small .field sele #DocumentTypeID ul li.selected :after { box-shadow: 0 1px 1px 0 #DDD; } #DocumentTypeID ul li label { padding: .4em 1em; display: inline-block; line-height: 1.4; white-space: normal; max-width: 60px; } +#Actions { box-shadow: none; border: none; padding: 0; } #Actions li { margin-left: 2px; } #Actions li:first-child { margin-left: 0; } +#ActionsPanel { display: none; } #ActionsPanel .middleColumn { margin-left: 184px; } #ActionsPanel label.fieldholder-small-label { display: none; } #ActionsPanel .fieldgroup-field { float: none; width: auto; } #ActionsPanel .fieldgroup-field .fieldholder-small label { float: none; width: auto; margin: 0; padding: 0; } #ActionsPanel .fieldgroup-field .fieldholder-small label.ss-ui-button { float: left; margin: 0 10px 0 0; } -#Form_ItemEditForm fieldset table.ss-gridfield-table { width: auto; } -#Form_ItemEditForm fieldset table.ss-gridfield-table tr th.main { min-width: 200px; } +#Form_ItemEditForm fieldset table.ss-gridfield-table { width: auto; max-width: 508px; } +#Form_ItemEditForm fieldset table.ss-gridfield-table tr th.main { min-width: 175px; } #Form_ItemEditForm fieldset table.ss-gridfield-table tr th.main.col-action_SetOrderID { width: 60px; min-width: 60px; } diff --git a/javascript/DMSDocumentCMSFields.js b/javascript/DMSDocumentCMSFields.js index aab3041..1b5ebbe 100644 --- a/javascript/DMSDocumentCMSFields.js +++ b/javascript/DMSDocumentCMSFields.js @@ -31,7 +31,8 @@ onclick: function(e) { //TODO - Fix so when clicking on an action it toggles the correct details inside the ActionsPanel // Currently this just hides the whole ActionsPanel when you click an action button - this.parents('fieldset').find('#ActionsPanel').hide(); + e.preventDefault(); + this.parents('fieldset').find('#ActionsPanel').toggle(); } }); diff --git a/scss/DMSDocumentCMSFields.scss b/scss/DMSDocumentCMSFields.scss index 8e4b370..9df7797 100644 --- a/scss/DMSDocumentCMSFields.scss +++ b/scss/DMSDocumentCMSFields.scss @@ -88,6 +88,9 @@ form.small .field .TreeDropdownField, } } #Actions{ + box-shadow:none; + border:none; + padding:0; li{ margin-left: 2px; &:first-child{ @@ -97,6 +100,7 @@ form.small .field .TreeDropdownField, } #ActionsPanel{ + display: none; .middleColumn{ margin-left:184px; } @@ -125,9 +129,10 @@ form.small .field .TreeDropdownField, fieldset{ table.ss-gridfield-table{ width: auto; + max-width:508px; tr{ th.main{ - min-width:200px; + min-width:175px; &.col-action_SetOrderID{ width:60px; min-width:60px;