From 68d1ba6a37bdc124dc531f7876eaa9b2d5e94ff9 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Wed, 26 Jan 2022 13:19:51 +0600 Subject: [PATCH 1/2] start 0.0.28 --- CHANGELOG.md | 2 ++ gradle.properties | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 56c5668..5831407 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,7 @@ # Changelog +## 0.0.28 + ## 0.0.27 * `TextField` has been renamed to `StandardInput` diff --git a/gradle.properties b/gradle.properties index 47d4930..4d44381 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,4 +9,4 @@ android.enableJetifier=true # Project data group=dev.inmo -version=0.0.27 +version=0.0.28 From a3c8cdcc9619a67b2b9f62acfcb9ed6a8fd110d6 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Wed, 26 Jan 2022 13:20:14 +0600 Subject: [PATCH 2/2] Fixes in UIKitWidth --- CHANGELOG.md | 2 ++ .../dev/inmo/jsuikit/modifiers/UIKitBase.kt | 14 ++++++++ .../dev/inmo/jsuikit/modifiers/UIKitWidth.kt | 34 +++++++++---------- 3 files changed, 33 insertions(+), 17 deletions(-) create mode 100644 src/jsMain/kotlin/dev/inmo/jsuikit/modifiers/UIKitBase.kt diff --git a/CHANGELOG.md b/CHANGELOG.md index 5831407..5c00c92 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## 0.0.28 +* Fixes in `UIKitWidth` + ## 0.0.27 * `TextField` has been renamed to `StandardInput` diff --git a/src/jsMain/kotlin/dev/inmo/jsuikit/modifiers/UIKitBase.kt b/src/jsMain/kotlin/dev/inmo/jsuikit/modifiers/UIKitBase.kt new file mode 100644 index 0000000..f8036d7 --- /dev/null +++ b/src/jsMain/kotlin/dev/inmo/jsuikit/modifiers/UIKitBase.kt @@ -0,0 +1,14 @@ +package dev.inmo.jsuikit.modifiers + +sealed class UIKitBase(classname: String) : UIKitModifier { + override val classes: Array = arrayOf(classname) + + sealed class Heading(suffix: String) : UIKitBase("uk-h$suffix") { + object H1 : Heading("1") + object H2 : Heading("2") + object H3 : Heading("3") + object H4 : Heading("4") + object H5 : Heading("5") + object H6 : Heading("6") + } +} diff --git a/src/jsMain/kotlin/dev/inmo/jsuikit/modifiers/UIKitWidth.kt b/src/jsMain/kotlin/dev/inmo/jsuikit/modifiers/UIKitWidth.kt index 724b879..e81a5fd 100644 --- a/src/jsMain/kotlin/dev/inmo/jsuikit/modifiers/UIKitWidth.kt +++ b/src/jsMain/kotlin/dev/inmo/jsuikit/modifiers/UIKitWidth.kt @@ -1,29 +1,29 @@ package dev.inmo.jsuikit.modifiers sealed class UIKitWidth(classname: String) : UIKitModifier { - override val classes: Array = arrayOf("uk-width-$classname") + override val classes: Array = arrayOf(classname) - object Auto : UIKitWidth("auto") - object Expand : UIKitWidth("expand") - object Full : UIKitWidth("1-1") + object Auto : UIKitWidth("uk-width-auto") + object Expand : UIKitWidth("uk-width-expand") + object Full : UIKitWidth("uk-width-1-1") - object Half : UIKitWidth("1-2") + object Half : UIKitWidth("uk-width-1-2") - object OneThird : UIKitWidth("1-3") - object TwoThird : UIKitWidth("2-3") + object OneThird : UIKitWidth("uk-width-1-3") + object TwoThird : UIKitWidth("uk-width-2-3") - object OneFourth : UIKitWidth("1-4") - object ThreeFourth : UIKitWidth("3-4") + object OneFourth : UIKitWidth("uk-width-1-4") + object ThreeFourth : UIKitWidth("uk-width-3-4") - object OneFifth : UIKitWidth("1-5") - object TwoFifth : UIKitWidth("2-5") - object ThreeFifth : UIKitWidth("3-5") - object FourFifth : UIKitWidth("4-5") + object OneFifth : UIKitWidth("uk-width-1-5") + object TwoFifth : UIKitWidth("uk-width-2-5") + object ThreeFifth : UIKitWidth("uk-width-3-5") + object FourFifth : UIKitWidth("uk-width-4-5") - object OneSixth : UIKitWidth("1-6") - object FiveSixth : UIKitWidth("5-6") + object OneSixth : UIKitWidth("uk-width-1-6") + object FiveSixth : UIKitWidth("uk-width-5-6") - sealed class Child(suffix: String) : UIKitWidth("child-$suffix") { + sealed class Child(suffix: String) : UIKitWidth("uk-child-width-$suffix") { object Full : Child("1-1") object Half : Child("1-2") @@ -57,7 +57,7 @@ sealed class UIKitWidth(classname: String) : UIKitModifier { } } - sealed class Fixed(suffix: String) : UIKitWidth("fixed-$suffix") { + sealed class Fixed(suffix: String) : UIKitWidth("uk-width-fixed-$suffix") { object Small : Fixed("small") object Medium : Fixed("medium")