From 590a5b636b4317b1b001c0e8200e10d1d9217dd6 Mon Sep 17 00:00:00 2001 From: Shagen Ogandzhanian Date: Mon, 12 Jul 2021 11:39:01 +0200 Subject: [PATCH] CSSRuleBuilderImpl is no more --- .../kotlin/org/jetbrains/compose/web/css/CSSBuilder.kt | 2 +- .../jsMain/kotlin/org/jetbrains/compose/web/css/CSSRules.kt | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/web/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/CSSBuilder.kt b/web/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/CSSBuilder.kt index f2ecdb8bba..a80575000f 100644 --- a/web/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/CSSBuilder.kt +++ b/web/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/CSSBuilder.kt @@ -11,7 +11,7 @@ class CSSBuilderImpl( override val root: CSSSelector, override val self: CSSSelector, rulesHolder: CSSRulesHolder -) : CSSRuleBuilderImpl(), CSSBuilder, CSSRulesHolder by rulesHolder { +) : StyleBuilderImpl(), CSSBuilder, CSSRulesHolder by rulesHolder { override fun style(selector: CSSSelector, cssRule: CSSBuilder.() -> Unit) { val (style, rules) = buildCSS(root, selector, cssRule) rules.forEach { add(it) } diff --git a/web/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/CSSRules.kt b/web/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/CSSRules.kt index 7fe9b6cc4b..fdc50f8fae 100644 --- a/web/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/CSSRules.kt +++ b/web/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/CSSRules.kt @@ -2,9 +2,6 @@ package org.jetbrains.compose.web.css import org.jetbrains.compose.web.css.selectors.CSSSelector - -open class CSSRuleBuilderImpl : StyleBuilderImpl() - @Suppress("EqualsOrHashCode") interface CSSRuleDeclaration { val header: String @@ -32,7 +29,7 @@ typealias CSSRuleDeclarationList = List typealias MutableCSSRuleDeclarationList = MutableList fun buildCSSStyleRule(cssRule: StyleBuilder.() -> Unit): StyleHolder { - val builder = CSSRuleBuilderImpl() + val builder = StyleBuilderImpl() builder.cssRule() return builder }