From 950833583a6662146f87f7f9e4699fdbaccff5ea Mon Sep 17 00:00:00 2001 From: Ryan O'Hara Date: Mon, 27 Aug 2012 11:49:09 +1200 Subject: [PATCH] BUGFIX: Styling for related links --- css/DMSMainCMS.css | 5 +++-- javascript/DMSGridField.js | 14 ++++++-------- scss/DMSMainCMS.scss | 15 +++++++++++++-- 3 files changed, 22 insertions(+), 12 deletions(-) diff --git a/css/DMSMainCMS.css b/css/DMSMainCMS.css index c523655..77bd699 100644 --- a/css/DMSMainCMS.css +++ b/css/DMSMainCMS.css @@ -49,11 +49,12 @@ #SectionID .middleColumn ul li.selected :after { box-shadow: 0 1px 1px 0 #DDD; } #SectionID .middleColumn ul li label { display: table-cell; vertical-align: middle; text-align: center; padding: 0 10px; } -#Form_ItemEditForm h3:first-child { display: inline-block; float: left; } -#Form_ItemEditForm ul.SelectionGroup { display: inline-block; position: relative; padding: 0; margin-top: 9px; margin-left: 10px; } +#Form_ItemEditForm h3:first-child { display: inline-block; float: left; width: 184px; } +#Form_ItemEditForm ul.SelectionGroup { display: inline-block; position: relative; padding: 0; margin-top: 9px; margin-left: 0; height: 110px; background: none; border: none; } #Form_ItemEditForm ul.SelectionGroup li { width: auto; clear: none; display: inline; margin-right: 4px; } #Form_ItemEditForm ul.SelectionGroup li input.selector { display: none; } #Form_ItemEditForm ul.SelectionGroup li label.ui-button { padding: 0.4em 0.8em; } #Form_ItemEditForm ul.SelectionGroup li div.field { margin-left: 0px; margin-bottom: 1em; width: 600px; position: absolute; left: 0; margin-top: 13px; padding: 10px; background: white; border: 1px solid #B3B3B3; -webkit-border-radius: 4px; -moz-border-radius: 4px; -ms-border-radius: 4px; -o-border-radius: 4px; border-radius: 4px; background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #efefef), color-stop(10%, #ffffff), color-stop(90%, #ffffff), color-stop(100%, #efefef)); background-image: -webkit-linear-gradient(#efefef, #ffffff 10%, #ffffff 90%, #efefef); background-image: -moz-linear-gradient(#efefef, #ffffff 10%, #ffffff 90%, #efefef); background-image: -o-linear-gradient(#efefef, #ffffff 10%, #ffffff 90%, #efefef); background-image: -ms-linear-gradient(#efefef, #ffffff 10%, #ffffff 90%, #efefef); background-image: linear-gradient(#efefef, #ffffff 10%, #ffffff 90%, #efefef); } #Form_ItemEditForm ul.SelectionGroup li.selected label.ui-button { border-bottom: 1px solid #C0C0C2; background: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #c0c0c0), color-stop(100%, #e6e6e6)); background: -webkit-linear-gradient(#c0c0c0, #e6e6e6); background: -moz-linear-gradient(#c0c0c0, #e6e6e6); background: -o-linear-gradient(#c0c0c0, #e6e6e6); background: -ms-linear-gradient(#c0c0c0, #e6e6e6); background: linear-gradient(#c0c0c0, #e6e6e6); filter: progid:DXImageTransform.Microsoft.gradient(GradientType=0,startColorstr='#C0C0C2', endColorstr='#E6E6E6'); /* IE6 & IE7 */ -ms-filter: "progid:DXImageTransform.Microsoft.gradient(GradientType=0,startColorstr='#C0C0C2', endColorstr='#E6E6E6')"; /* IE8 */ box-shadow: 0 1px 1px 0 #A0A0A0 inset; } #Form_ItemEditForm ul.SelectionGroup li.selected label.ui-button:after { content: ''; display: block; position: absolute; top: 33px; left: 50%; margin-left: -6px; width: 12px; height: 12px; background: #F8F8F8; border-right: 1px solid #B3B3B3; border-top: 1px solid #B3B3B3; -moz-transform: rotate(-45deg); -webkit-transform: rotate(-45deg); pointer-events: none; z-index: 10; } +#Form_ItemEditForm ul.SelectionGroup .treedropdownfield-panel ul li { display: block; clear: both; } diff --git a/javascript/DMSGridField.js b/javascript/DMSGridField.js index d7210ec..258fedb 100644 --- a/javascript/DMSGridField.js +++ b/javascript/DMSGridField.js @@ -4,15 +4,13 @@ $.entwine('ss', function($) { $('#Form_ItemEditForm ul.selectiongroup li').entwine({ - onadd: function() { - this.closest('ul').removeClass('ui-tabs-nav ui-widget-header'); + onmatch: function() { + this.closest('ul').removeClass('ui-tabs-nav ui-widget ui-widget-header'); + //this.closest('form').removeClass('ui-tabs ss-tabset ui-widget-header'); this.find('label').first().addClass('ui-button ss-ui-button ui-corner-all ui-state-default ui-widget ui-button-text-only'); - } - }); - - $('#Form_ItemEditForm ul.selectiongroup li input').entwine({ - onclick: function(){ - this.closest('ul').animate({height: '110px'}, 100); +/* if ((this).hasClass('ui-state-active')){ + this.removeClass() + }*/ } }); diff --git a/scss/DMSMainCMS.scss b/scss/DMSMainCMS.scss index 09e9080..49fafd6 100644 --- a/scss/DMSMainCMS.scss +++ b/scss/DMSMainCMS.scss @@ -203,14 +203,17 @@ $gf_colour_zebra: #F0F4F7; h3:first-child{ display: inline-block; float: left; + width: 184px; } ul.SelectionGroup{ - //height: 90px; display: inline-block; position: relative; padding: 0; margin-top: 9px; - margin-left: 10px; + margin-left: 0; + height: 110px; + background: none; + border: none; li{ width: auto; clear: none; @@ -245,5 +248,13 @@ $gf_colour_zebra: #F0F4F7; } } } + .treedropdownfield-panel{ + ul{ + li{ + display: block; + clear: both; + } + } + } } } \ No newline at end of file