diff --git a/Src/xWorks/CssGenerator.cs b/Src/xWorks/CssGenerator.cs index 9fd87fb7ff..d58c2876ee 100644 --- a/Src/xWorks/CssGenerator.cs +++ b/Src/xWorks/CssGenerator.cs @@ -450,7 +450,7 @@ private static List GenerateCssForSenses(ConfigurableDictionaryNode c // Not using SelectClassName here; sense and sensenumber are siblings and the configNode is for the Senses collection. // Select the base plus the node's unmodified class attribute and append the sensenumber matcher. - var senseNumberSelector = string.Format("{0} .sensenumber", senseContentSelector); + var senseNumberSelector = string.Format("{0} > .sensenumber", senseContentSelector); senseNumberRule.Value = senseNumberSelector; if(!String.IsNullOrEmpty(senseOptions.NumberStyle)) diff --git a/Src/xWorks/xWorksTests/CssGeneratorTests.cs b/Src/xWorks/xWorksTests/CssGeneratorTests.cs index ed315ac206..895cd83559 100644 --- a/Src/xWorks/xWorksTests/CssGeneratorTests.cs +++ b/Src/xWorks/xWorksTests/CssGeneratorTests.cs @@ -2337,7 +2337,7 @@ public void GenerateCssForConfiguration_SenseNumberCharStyleWorks() PopulateFieldsForTesting(entry); // SUT var cssResult = CssGenerator.GenerateCssFromConfiguration(model, m_propertyTable); - VerifyRegex(cssResult, @"\s*\.senses\s*>\s*\.sensecontent\s*\.sensenumber", "sense number style selector was not generated."); + VerifyRegex(cssResult, @"\s*\.senses\s*>\s*\.sensecontent\s*>\s*\.sensenumber", "sense number style selector was not generated."); VerifyFontInfoInCss(FontColor, FontBGColor, FontName, FontBold, FontItalic, FontSize, cssResult); } @@ -2391,7 +2391,7 @@ public void GenerateCssForConfiguration_ReversalSenseNumberWorks() // SUT var cssResult = CssGenerator.GenerateCssFromConfiguration(model, m_propertyTable); VerifyRegex(cssResult, @"^.gloss\s*{\s*font-family", "Gloss with style was not generated from reversal sense"); - VerifyRegex(cssResult, @"^\.refdsenses\s*>\s*\.sensecontent\s*\.sensenumber\s*{.*font-style\s*:\s*italic;.*}", "Sense Number missing"); + VerifyRegex(cssResult, @"^\.refdsenses\s*>\s*\.sensecontent\s*>\s*\.sensenumber\s*{.*font-style\s*:\s*italic;.*}", "Sense Number missing"); } [Test] @@ -2414,8 +2414,8 @@ public void GenerateCssForConfiguration_SenseNumberBeforeAndAfterWork() PopulateFieldsForTesting(entry); // SUT var cssResult = CssGenerator.GenerateCssFromConfiguration(model, m_propertyTable); - VerifyRegex(cssResult, @"\s*\.senses\s*>\s*\.sensecontent\s*\.sensenumber:before{.*content:'\['.*}", "Before content not applied to the sense number selector."); - VerifyRegex(cssResult, @"\s*\.senses\s*>\s*\.sensecontent\s*\.sensenumber:after{.*content:'\]'.*}", "After content not applied to the sense number selector."); + VerifyRegex(cssResult, @"\s*\.senses\s*>\s*\.sensecontent\s*>\s*\.sensenumber:before{.*content:'\['.*}", "Before content not applied to the sense number selector."); + VerifyRegex(cssResult, @"\s*\.senses\s*>\s*\.sensecontent\s*>\s*\.sensenumber:after{.*content:'\]'.*}", "After content not applied to the sense number selector."); } [Test]