From 8ca97342320de833968a0b22eb49e8b9b81957f5 Mon Sep 17 00:00:00 2001 From: Ryan O'Hara Date: Thu, 23 Aug 2012 15:53:14 +1200 Subject: [PATCH] BUGFIX: Target correct selector for link section buttons to work --- css/DMSMainCMS.css | 18 +++++++++--------- javascript/DMSGridField.js | 6 +++--- scss/DMSMainCMS.scss | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/css/DMSMainCMS.css b/css/DMSMainCMS.css index ac74326..c523655 100644 --- a/css/DMSMainCMS.css +++ b/css/DMSMainCMS.css @@ -39,15 +39,15 @@ #Form_EditForm_RelatedLinks table { padding: 1em 0; } #Form_EditForm_RelatedLinks table thead h2 { display: none; } -#LinkSectionID .middleColumn { overflow: auto; min-width: 800px; } -#LinkSectionID .middleColumn ul { padding: 0; } -#LinkSectionID .middleColumn ul input[type="radio"] { display: none; } -#LinkSectionID .middleColumn ul li { display: table; padding: 0; width: 125px; height: 40px; white-space: normal; margin-right: -1px; border-radius: 0; } -#LinkSectionID .middleColumn ul li:first-child { border-radius: 6px 0 0 6px; border-left: 1px solid #C0C0C2; } -#LinkSectionID .middleColumn ul li:last-child { border-radius: 0 6px 6px 0; } -#LinkSectionID .middleColumn ul li.selected { 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; } -#LinkSectionID .middleColumn ul li.selected :after { box-shadow: 0 1px 1px 0 #DDD; } -#LinkSectionID .middleColumn ul li label { display: table-cell; vertical-align: middle; text-align: center; padding: 0 10px; } +#SectionID .middleColumn { overflow: auto; min-width: 800px; } +#SectionID .middleColumn ul { padding: 0; } +#SectionID .middleColumn ul input[type="radio"] { display: none; } +#SectionID .middleColumn ul li { display: table; padding: 0; width: 125px; height: 40px; white-space: normal; margin-right: -1px; border-radius: 0; } +#SectionID .middleColumn ul li:first-child { border-radius: 6px 0 0 6px; border-left: 1px solid #C0C0C2; } +#SectionID .middleColumn ul li:last-child { border-radius: 0 6px 6px 0; } +#SectionID .middleColumn ul li.selected { 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; } +#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; } diff --git a/javascript/DMSGridField.js b/javascript/DMSGridField.js index 4f8c853..d7210ec 100644 --- a/javascript/DMSGridField.js +++ b/javascript/DMSGridField.js @@ -16,14 +16,14 @@ } }); - $('#LinkSectionID ul li').entwine({ + $('#SectionID ul li').entwine({ onadd: function() { this.addClass('ui-button ss-ui-button ui-corner-all ui-state-default ui-widget ui-button-text-only'); this.parents('ul').removeClass('ui-tabs-nav'); } }); - $('#LinkSectionID input[type=radio]').entwine({ + $('#SectionID input[type=radio]').entwine({ onadd: function() { // Checks to see what radio button is selected if (this.is(':checked')) { @@ -32,7 +32,7 @@ }, onchange: function(e) { // Remove selected class from radio buttons - $('#LinkSectionID').find('li').removeClass('selected'); + $('#SectionID').find('li').removeClass('selected'); //If radio button is checked then add the selected class if (this.is(':checked')) { this.parent('li').addClass('selected'); diff --git a/scss/DMSMainCMS.scss b/scss/DMSMainCMS.scss index bcf3f54..09e9080 100644 --- a/scss/DMSMainCMS.scss +++ b/scss/DMSMainCMS.scss @@ -195,7 +195,7 @@ $gf_colour_zebra: #F0F4F7; } } -#LinkSectionID{ +#SectionID{ @include tabButtons; }