Skip to content

Commit

Permalink
Merged with master
Browse files Browse the repository at this point in the history
  • Loading branch information
FlorianRappl committed Jun 11, 2020
2 parents 7a9d412 + 7aa7f93 commit fe08360
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 4 deletions.
9 changes: 7 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,15 @@
# 0.14.1
# 0.14.2

Released on Thursday, June 11 2020.

- Fixed issue for representation of `counter()` and `counters()` (#58)
- Fixed parsing of numerical font-weight in font shorthand (#57)
- Updated `ComputeDeclarations` and `ComputeCascadedStyle` to support `IEnumerable<ICssStyleRule>` (#54)

# 0.14.1

Released on Monday, May 4 2020.

- Updated `ComputeDeclarations` and `ComputeCascadedStyle` to support `IEnumerable<ICssStyleRule>` (#53)

# 0.14.0

Expand Down
4 changes: 2 additions & 2 deletions src/AngleSharp.Css/Extensions/StyleCollectionExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public static IStyleCollection GetStyleCollection(this IWindow window)
/// <param name="element">The element that is questioned.</param>
/// <param name="pseudoSelector">The optional pseudo selector to use.</param>
/// <returns>The style declaration containing all the declarations.</returns>
public static ICssStyleDeclaration ComputeDeclarations(this IStyleCollection rules, IElement element, String pseudoSelector = null)
public static ICssStyleDeclaration ComputeDeclarations(this IEnumerable<ICssStyleRule> rules, IElement element, String pseudoSelector = null)
{
var computedStyle = new CssStyleDeclaration(element.Owner?.Context);
var nodes = element.GetAncestors().OfType<IElement>();
Expand Down Expand Up @@ -74,7 +74,7 @@ public static ICssStyleDeclaration ComputeDeclarations(this IStyleCollection rul
/// <param name="element">The element to compute the cascade for.</param>
/// <param name="parent">The potential parent for the cascade.</param>
/// <returns>Returns the cascaded read-only style declaration.</returns>
public static ICssStyleDeclaration ComputeCascadedStyle(this IStyleCollection styleCollection, IElement element, ICssStyleDeclaration parent = null)
public static ICssStyleDeclaration ComputeCascadedStyle(this IEnumerable<ICssStyleRule> styleCollection, IElement element, ICssStyleDeclaration parent = null)
{
var computedStyle = new CssStyleDeclaration(element.Owner?.Context);
var rules = styleCollection.SortBySpecificity(element);
Expand Down

0 comments on commit fe08360

Please sign in to comment.