Skip to content

Commit 6cd448d

Browse files
authored
Merge pull request #93 from andrei-zhidkov/fix-divide-x
Fix output for divide-x tw class
2 parents dbcbf85 + dbd68d0 commit 6cd448d

File tree

3 files changed

+23
-6
lines changed

3 files changed

+23
-6
lines changed

example/reagent-demo/src/acme/frontend/app.cljc

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,32 @@
2727
[:div.flex-1.p-4.text-center.text-4xl.text-cat-orange.bg-cat-black "Miaw!!!"]]
2828

2929
[:div.flex.my-10
30-
;; Demonstrates a fix on the `divide-*` classes.
30+
;; Demonstrates a fix on the `divide-x` class.
31+
[:div.mx-auto.p-6.bg-gray-100
32+
[:div.flex.flex-row.bg-white.divide-x-10.divide-red-400-50
33+
[:div.p-3 "item 1"]
34+
[:div.p-3 "item 2"]
35+
[:div.p-3 {:hidden true} "item 3"]
36+
[:div.p-3 "item 4"]]]
37+
38+
;; Demonstrates the `divide-x-reverse` class.
39+
[:div.mx-auto.p-6.bg-gray-100
40+
[:div.flex.flex-row-reverse.bg-white.divide-x-10.divide-x-reverse.divide-red-400-50
41+
[:div.p-3 "reverse item 1"]
42+
[:div.p-3 "reverse item 2"]
43+
[:div.p-3 {:hidden true} "reverse item 3"]
44+
[:div.p-3 "reverse item 4"]]]]
45+
46+
[:div.flex.my-10
47+
;; Demonstrates a fix on the `divide-y` class.
3148
[:div.mx-auto.p-6.bg-gray-100
3249
[:div.flex.flex-col.bg-white.divide-y-10.divide-red-400-50
3350
[:div.p-3 "item 1"]
3451
[:div.p-3 "item 2"]
3552
[:div.p-3 {:hidden true} "item 3"]
3653
[:div.p-3 "item 4"]]]
3754

38-
;; Demonstrates the `divide-*-reverse` classes.
55+
;; Demonstrates the `divide-y-reverse` class.
3956
[:div.mx-auto.p-6.bg-gray-100
4057
[:div.flex.flex-col-reverse.bg-white.divide-y-10.divide-y-reverse.divide-red-400-50
4158
[:div.p-3 "reverse item 1"]

lib/girouette/src/girouette/tw/border.cljc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,8 +137,8 @@
137137
(case axis
138138
"x" (if (nil? divide-width-reverse)
139139
{:--gi-divide-x-reverse 0
140-
:border-right-width (str "calc(" width " * calc(1 - var(--gi-divide-x-reverse)))")
141-
:border-left-width (str "calc(" width " * var(--gi-divide-x-reverse))")}
140+
:border-right-width (str "calc(" width " * var(--gi-divide-x-reverse))")
141+
:border-left-width (str "calc(" width " * calc(1 - var(--gi-divide-x-reverse)))")}
142142
{:--gi-divide-x-reverse 1})
143143
"y" (if (nil? divide-width-reverse)
144144
{:--gi-divide-y-reverse 0

lib/girouette/test/girouette/tw/border_test.cljc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,8 @@
8282
"divide-x"
8383
[".divide-x" [(garden.selectors.CSSSelector. "&>:not([hidden])~:not([hidden])")
8484
{:--gi-divide-x-reverse 0
85-
:border-right-width "calc(1px * calc(1 - var(--gi-divide-x-reverse)))"
86-
:border-left-width "calc(1px * var(--gi-divide-x-reverse))"}]]
85+
:border-right-width "calc(1px * var(--gi-divide-x-reverse))"
86+
:border-left-width "calc(1px * calc(1 - var(--gi-divide-x-reverse)))"}]]
8787

8888
"divide-y-2"
8989
[".divide-y-2" [(garden.selectors.CSSSelector. "&>:not([hidden])~:not([hidden])")

0 commit comments

Comments
 (0)