Skip to content

Fix/clockwise ordering #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kristentr wants to merge 6 commits into
base: main
Choose a base branch
from
Open

Fix/clockwise ordering #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ccf2a55
Re-sort inset utilities to clockwise
thecrypticace Apr 4, 2023
2373079
Update tests
thecrypticace Apr 4, 2023
5d27614
Sort utilities clockwise
thecrypticace Apr 4, 2023
2ea7d3e
Update test
thecrypticace Apr 4, 2023
9805036
Reorganize plugins
thecrypticace Apr 10, 2023
e3b8db1
Work on utility order some more
thecrypticace Apr 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
354 changes: 158 additions & 196 deletions src/corePlugins.js
View file
Open in desktop

Large diffs are not rendered by default.

24 changes: 12 additions & 12 deletions tests/any-type.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,18 +197,18 @@ crosscheck(({ stable, oxide }) => {
top: var(--any-value);
bottom: var(--any-value);
}
.top-\[var\(--any-value\)\] {
top: var(--any-value);
}
.right-\[var\(--any-value\)\] {
right: var(--any-value);
}
.bottom-\[var\(--any-value\)\] {
bottom: var(--any-value);
}
.left-\[var\(--any-value\)\] {
left: var(--any-value);
}
.right-\[var\(--any-value\)\] {
right: var(--any-value);
}
.top-\[var\(--any-value\)\] {
top: var(--any-value);
}
.z-\[var\(--any-value\)\] {
z-index: var(--any-value);
}
Expand Down Expand Up @@ -751,18 +751,18 @@ crosscheck(({ stable, oxide }) => {
top: var(--any-value);
bottom: var(--any-value);
}
.top-\[var\(--any-value\)\] {
top: var(--any-value);
}
.right-\[var\(--any-value\)\] {
right: var(--any-value);
}
.bottom-\[var\(--any-value\)\] {
bottom: var(--any-value);
}
.left-\[var\(--any-value\)\] {
left: var(--any-value);
}
.right-\[var\(--any-value\)\] {
right: var(--any-value);
}
.top-\[var\(--any-value\)\] {
top: var(--any-value);
}
.z-\[var\(--any-value\)\] {
z-index: var(--any-value);
}
Expand Down
169 changes: 84 additions & 85 deletions tests/arbitrary-values.oxide.test.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,18 @@
top: var(--value);
bottom: var(--value);
}
.top-\[11px\] {
top: 11px;
}
.top-\[var\(--value\)\] {
top: var(--value);
}
.right-\[11px\] {
right: 11px;
}
.right-\[var\(--value\)\] {
right: var(--value);
}
.bottom-\[11px\] {
bottom: 11px;
}
Expand All @@ -32,18 +44,6 @@
.left-\[var\(--value\)\] {
left: var(--value);
}
.right-\[11px\] {
right: 11px;
}
.right-\[var\(--value\)\] {
right: var(--value);
}
.top-\[11px\] {
top: 11px;
}
.top-\[var\(--value\)\] {
top: var(--value);
}
.z-\[123\] {
z-index: 123;
}
Expand Down Expand Up @@ -85,20 +85,20 @@
margin-top: 7px;
margin-bottom: 7px;
}
.mb-\[7px\] {
margin-bottom: 7px;
.mt-\[7px\] {
margin-top: 7px;
}
.ml-\[7px\] {
margin-left: 7px;
.mt-\[clamp\(30px\,100px\)\] {
margin-top: clamp(30px, 100px);
}
.mr-\[7px\] {
margin-right: 7px;
}
.mt-\[7px\] {
margin-top: 7px;
.mb-\[7px\] {
margin-bottom: 7px;
}
.mt-\[clamp\(30px\,100px\)\] {
margin-top: clamp(30px, 100px);
.ml-\[7px\] {
margin-left: 7px;
}
.aspect-\[16\/9\] {
aspect-ratio: 16 / 9;
Expand Down Expand Up @@ -134,13 +134,13 @@
min-height: var(--height);
}
.w-\[\'\)\(\)\'\] {
width: ")()";
width: ')()';
}
.w-\[\'\]\[\]\'\] {
width: "][]";
width: '][]';
}
.w-\[\'\}\{\}\'\] {
width: "}{}";
width: '}{}';
}
.w-\[\(\(\)\)\] {
width: (());
Expand Down Expand Up @@ -176,10 +176,10 @@
width: var(--width, calc(100% + 1rem));
}
.w-\[\{\{\}\}\] {
width: {{} }
width: {{}};
}
.w-\[\{\}\] {
width: {}
width: {};
}
.min-w-\[3\.23rem\] {
min-width: 3.23rem;
Expand Down Expand Up @@ -345,10 +345,10 @@
cursor: pointer;
}
.cursor-\[url\(\'\.\/path_to_hand\.cur\'\)_2_2\,pointer\] {
cursor: url("./path_to_hand.cur") 2 2, pointer;
cursor: url('./path_to_hand.cur') 2 2, pointer;
}
.cursor-\[url\(hand\.cur\)_2_2\,pointer\] {
cursor: url("hand.cur") 2 2, pointer;
cursor: url('hand.cur') 2 2, pointer;
}
.cursor-\[var\(--value\)\] {
cursor: var(--value);
Expand All @@ -364,20 +364,20 @@
scroll-margin-top: 7px;
scroll-margin-bottom: 7px;
}
.scroll-mb-\[7px\] {
scroll-margin-bottom: 7px;
.scroll-mt-\[7px\] {
scroll-margin-top: 7px;
}
.scroll-ml-\[7px\] {
scroll-margin-left: 7px;
.scroll-mt-\[var\(--scroll-margin\)\] {
scroll-margin-top: var(--scroll-margin);
}
.scroll-mr-\[7px\] {
scroll-margin-right: 7px;
}
.scroll-mt-\[7px\] {
scroll-margin-top: 7px;
.scroll-mb-\[7px\] {
scroll-margin-bottom: 7px;
}
.scroll-mt-\[var\(--scroll-margin\)\] {
scroll-margin-top: var(--scroll-margin);
.scroll-ml-\[7px\] {
scroll-margin-left: 7px;
}
.scroll-p-\[7px\] {
scroll-padding: 7px;
Expand All @@ -390,29 +390,29 @@
scroll-padding-top: 7px;
scroll-padding-bottom: 7px;
}
.scroll-pb-\[7px\] {
scroll-padding-bottom: 7px;
.scroll-pt-\[7px\] {
scroll-padding-top: 7px;
}
.scroll-pl-\[7px\] {
scroll-padding-left: 7px;
.scroll-pt-\[var\(--scroll-padding\)\] {
scroll-padding-top: var(--scroll-padding);
}
.scroll-pr-\[7px\] {
scroll-padding-right: 7px;
}
.scroll-pt-\[7px\] {
scroll-padding-top: 7px;
.scroll-pb-\[7px\] {
scroll-padding-bottom: 7px;
}
.scroll-pt-\[var\(--scroll-padding\)\] {
scroll-padding-top: var(--scroll-padding);
.scroll-pl-\[7px\] {
scroll-padding-left: 7px;
}
.list-\[\'\\1f44d\'\] {
list-style-type: "👍";
list-style-type: '👍';
}
.list-\[var\(--value\)\] {
list-style-type: var(--value);
}
.list-image-\[url\(\.\/my-image\.png\)\] {
list-style-image: url("./my-image.png");
list-style-image: url('./my-image.png');
}
.list-image-\[var\(--value\)\] {
list-style-image: var(--value);
Expand Down Expand Up @@ -505,40 +505,52 @@
.rounded-\[11px\] {
border-radius: 11px;
}
.rounded-b-\[var\(--radius\)\] {
border-bottom-right-radius: var(--radius);
border-bottom-left-radius: var(--radius);
}
.rounded-l-\[var\(--radius\)\] {
.rounded-t-\[var\(--radius\)\] {
border-top-left-radius: var(--radius);
border-bottom-left-radius: var(--radius);
border-top-right-radius: var(--radius);
}
.rounded-r-\[var\(--radius\)\] {
border-top-right-radius: var(--radius);
border-bottom-right-radius: var(--radius);
}
.rounded-t-\[var\(--radius\)\] {
border-top-left-radius: var(--radius);
border-top-right-radius: var(--radius);
}
.rounded-bl-\[var\(--radius\)\] {
.rounded-b-\[var\(--radius\)\] {
border-bottom-right-radius: var(--radius);
border-bottom-left-radius: var(--radius);
}
.rounded-br-\[var\(--radius\)\] {
border-bottom-right-radius: var(--radius);
.rounded-l-\[var\(--radius\)\] {
border-top-left-radius: var(--radius);
border-bottom-left-radius: var(--radius);
}
.rounded-tl-\[var\(--radius\)\] {
border-top-left-radius: var(--radius);
}
.rounded-tr-\[var\(--radius\)\] {
border-top-right-radius: var(--radius);
}
.rounded-br-\[var\(--radius\)\] {
border-bottom-right-radius: var(--radius);
}
.rounded-bl-\[var\(--radius\)\] {
border-bottom-left-radius: var(--radius);
}
.border-\[2\.5px\] {
border-width: 2.5px;
}
.border-\[length\:var\(--value\)\] {
border-width: var(--value);
}
.border-t-\[2\.5px\] {
border-top-width: 2.5px;
}
.border-t-\[length\:var\(--value\)\] {
border-top-width: var(--value);
}
.border-r-\[2\.5px\] {
border-right-width: 2.5px;
}
.border-r-\[length\:var\(--value\)\] {
border-right-width: var(--value);
}
.border-b-\[2\.5px\] {
border-bottom-width: 2.5px;
}
Expand All @@ -551,18 +563,6 @@
.border-l-\[length\:var\(--value\)\] {
border-left-width: var(--value);
}
.border-r-\[2\.5px\] {
border-right-width: 2.5px;
}
.border-r-\[length\:var\(--value\)\] {
border-right-width: var(--value);
}
.border-t-\[2\.5px\] {
border-top-width: 2.5px;
}
.border-t-\[length\:var\(--value\)\] {
border-top-width: var(--value);
}
.border-\[\#f00\] {
border-color: red;
}
Expand Down Expand Up @@ -653,7 +653,7 @@
background-image: linear-gradient(to left, rgb(var(--green)), blue);
}
.bg-\[url\(\'\/path-to-image\.png\'\)\] {
background-image: url("/path-to-image.png");
background-image: url('/path-to-image.png');
}
.bg-\[url\:var\(--url\)\] {
background-image: var(--url);
Expand Down Expand Up @@ -713,7 +713,7 @@
fill: #da5b66;
}
.fill-\[url\(\#icon-gradient\)\] {
fill: url("#icon-gradient");
fill: url('#icon-gradient');
}
.fill-\[var\(--value\)\] {
fill: var(--value);
Expand All @@ -725,7 +725,7 @@
stroke: var(--value);
}
.stroke-\[url\(\#icon-gradient\)\] {
stroke: url("#icon-gradient");
stroke: url('#icon-gradient');
}
.stroke-\[20px\] {
stroke-width: 20px;
Expand Down Expand Up @@ -753,20 +753,20 @@
padding-top: 7px;
padding-bottom: 7px;
}
.pb-\[7px\] {
padding-bottom: 7px;
.pt-\[7px\] {
padding-top: 7px;
}
.pl-\[7px\] {
padding-left: 7px;
.pt-\[clamp\(30px\,100px\)\] {
padding-top: clamp(30px, 100px);
}
.pr-\[7px\] {
padding-right: 7px;
}
.pt-\[7px\] {
padding-top: 7px;
.pb-\[7px\] {
padding-bottom: 7px;
}
.pt-\[clamp\(30px\,100px\)\] {
padding-top: clamp(30px, 100px);
.pl-\[7px\] {
padding-left: 7px;
}
.indent-\[50\%\] {
text-indent: 50%;
Expand All @@ -787,7 +787,7 @@
font-family: Some Font, sans-serif;
}
.font-\[\'Some_Font\'\,var\(--other-font\)\] {
font-family: "Some Font", var(--other-font);
font-family: 'Some Font', var(--other-font);
}
.font-\[Georgia\,serif\] {
font-family: Georgia, serif;
Expand Down Expand Up @@ -1062,11 +1062,11 @@
will-change: var(--will-change);
}
.content-\[\'\>\'\] {
--tw-content: ">";
--tw-content: '>';
content: var(--tw-content);
}
.content-\[\'hello\'\] {
--tw-content: "hello";
--tw-content: 'hello';
content: var(--tw-content);
}
.content-\[attr\(content-before\)\] {
Expand All @@ -1078,4 +1078,3 @@
grid-template-columns: 200px repeat(auto-fill, minmax(15%, 100px)) 300px;
}
}

Loading