@rokkit/themes 1.0.0-next.150 → 1.0.0-next.152

package/src/carbon/floating-action.css

@@ -9,24 +9,24 @@
    ============================================================================= */
 
 [data-style='carbon'] [data-fab-trigger] {
-  @apply bg-none bg-primary-z5 text-on-primary rounded-none border-0;
+  @apply bg-primary-z5 text-on-primary rounded-none border-0 bg-none;
 }
 
 [data-style='carbon'] [data-fab-trigger]:hover:not(:disabled) {
-  @apply bg-none bg-primary-z6 text-on-primary;
+  @apply bg-primary-z6 text-on-primary bg-none;
 }
 
 [data-style='carbon'] [data-fab-trigger]:focus-visible {
-  @apply outline-none border-2 border-primary-z7;
+  @apply border-primary-z7 border-2 outline-none;
 }
 
 [data-style='carbon'] [data-fab][data-open='true'] [data-fab-trigger] {
-  @apply bg-none bg-primary-z6;
+  @apply bg-primary-z6 bg-none;
   transform: rotate(45deg);
 }
 
 [data-style='carbon'] [data-fab][data-open='true'] [data-fab-trigger]:hover:not(:disabled) {
-  @apply bg-none bg-primary-z7;
+  @apply bg-primary-z7 bg-none;
 }
 
 /* =============================================================================
@@ -34,15 +34,15 @@
    ============================================================================= */
 
 [data-style='carbon'] [data-fab-item] {
-  @apply bg-none bg-surface-z3 text-surface-z8 rounded-none border-0;
+  @apply bg-surface-z3 text-surface-z8 rounded-none border-0 bg-none;
 }
 
 [data-style='carbon'] [data-fab-item]:hover:not(:disabled) {
-  @apply bg-none bg-surface-z4 text-surface-z9;
+  @apply bg-surface-z4 text-surface-z9 bg-none;
 }
 
 [data-style='carbon'] [data-fab-item]:focus-visible {
-  @apply outline-none border-2 border-primary-z5;
+  @apply border-primary-z5 border-2 outline-none;
 }
 
 /* Item icon */

package/src/carbon/floating-navigation.css

@@ -9,7 +9,7 @@
    ============================================================================= */
 
 [data-style='carbon'] [data-floating-nav] {
-  @apply bg-none bg-surface-z1 border-surface-z4 rounded-none border;
+  @apply bg-surface-z1 border-surface-z4 rounded-none border bg-none;
 }
 
 /* =============================================================================
@@ -41,15 +41,15 @@
 }
 
 [data-style='carbon'] [data-floating-nav-item]:hover {
-  @apply bg-none bg-surface-z3 text-surface-z9;
+  @apply bg-surface-z3 text-surface-z9 bg-none;
 }
 
 [data-style='carbon'] [data-floating-nav-item][data-active] {
-  @apply bg-none bg-primary-z2 text-primary-z8;
+  @apply bg-primary-z2 text-primary-z8 bg-none;
 }
 
 [data-style='carbon'] [data-floating-nav-item]:focus-visible {
-  @apply outline-none border-2 border-primary-z5;
+  @apply border-primary-z5 border-2 outline-none;
 }
 
 /* Icon */
@@ -66,5 +66,5 @@
    ============================================================================= */
 
 [data-style='carbon'] [data-floating-nav-indicator] {
-  @apply bg-none bg-primary-z5;
+  @apply bg-primary-z5 bg-none;
 }

package/src/carbon/index.css

@@ -30,4 +30,5 @@
 @import './card.css';
 @import './message.css';
 @import './status-list.css';
+@import './step-indicator.css';
 @import './chart.css';

package/src/carbon/input.css

@@ -7,7 +7,7 @@
 
 /* Input root: bottom border only, flat background */
 [data-style='carbon'] [data-input-root] {
-  @apply border-surface-z5 relative flex items-center border-b-2 border-l-0 border-r-0 border-t-0 bg-surface-z1 p-0;
+  @apply border-surface-z5 bg-surface-z1 relative flex items-center border-t-0 border-r-0 border-b-2 border-l-0 p-0;
   border-radius: 0;
   background-image: none;
   transition: background-color 150ms ease;
@@ -21,7 +21,7 @@
 
 /* Focus: primary thick bottom border */
 [data-style='carbon'] [data-input-root]:focus-within {
-  @apply bg-surface-z2 border-b-2 border-primary-z5;
+  @apply bg-surface-z2 border-primary-z5 border-b-2;
   background-image: none;
 }
 

package/src/carbon/list.css

@@ -26,29 +26,27 @@
 }
 
 /* Hover and focus */
-[data-style='carbon']
-  [data-list]
-  [data-list-item]:hover:not(:disabled):not([data-disabled='true']),
+[data-style='carbon'] [data-list] [data-list-item]:hover:not(:disabled):not([data-disabled='true']),
 [data-style='carbon']
   [data-list]
   [data-list-item]:focus:not(:disabled):not([data-disabled='true']) {
-  @apply bg-none bg-surface-z2 text-surface-z9 outline-none;
+  @apply bg-surface-z2 text-surface-z9 bg-none outline-none;
 }
 
 /* Active state — muted when list not focused */
 [data-style='carbon'] [data-list] [data-list-item][data-active='true'] {
-  @apply bg-none bg-primary-z2 text-surface-z9;
+  @apply bg-primary-z2 text-surface-z9 bg-none;
 }
 
 /* Active state — full highlight when list has focus */
 [data-style='carbon'] [data-list]:focus-within [data-list-item][data-active='true'] {
-  @apply bg-none bg-primary-z2 text-primary-z8;
+  @apply bg-primary-z2 text-primary-z8 bg-none;
 }
 
 /* Active + hover/focus */
 [data-style='carbon'] [data-list] [data-list-item][data-active='true']:hover:not(:disabled),
 [data-style='carbon'] [data-list] [data-list-item][data-active='true']:focus:not(:disabled) {
-  @apply bg-none bg-primary-z3 text-primary-z9;
+  @apply bg-primary-z3 text-primary-z9 bg-none;
 }
 
 /* =============================================================================
@@ -77,11 +75,11 @@
 }
 
 [data-style='carbon'] [data-list] [data-list-item] [data-item-badge] {
-  @apply bg-none text-surface-z6 border-surface-z4 rounded-none border bg-transparent;
+  @apply text-surface-z6 border-surface-z4 rounded-none border bg-transparent bg-none;
 }
 
 [data-style='carbon'] [data-list] [data-list-item][data-active='true'] [data-item-badge] {
-  @apply bg-none text-primary-z7 border-primary-z4;
+  @apply text-primary-z7 border-primary-z4 bg-none;
 }
 
 /* =============================================================================
@@ -94,7 +92,7 @@
 
 [data-style='carbon'] [data-list] [data-list-group]:hover:not(:disabled),
 [data-style='carbon'] [data-list] [data-list-group]:focus:not(:disabled) {
-  @apply bg-none bg-surface-z2 text-surface-z7;
+  @apply bg-surface-z2 text-surface-z7 bg-none;
 }
 
 /* =============================================================================
@@ -102,7 +100,7 @@
    ============================================================================= */
 
 [data-style='carbon'] [data-list] [data-list-separator] {
-  @apply bg-none bg-surface-z3;
+  @apply bg-surface-z3 bg-none;
 }
 
 /* =============================================================================
@@ -110,15 +108,15 @@
    ============================================================================= */
 
 [data-style='carbon'] [data-list] [data-list-item][data-selected='true'] {
-  @apply bg-none bg-primary-z2 text-primary-z7;
+  @apply bg-primary-z2 text-primary-z7 bg-none;
 }
 
 [data-style='carbon'] [data-list]:focus-within [data-list-item][data-selected='true'] {
-  @apply bg-none bg-primary-z2 text-primary-z8;
+  @apply bg-primary-z2 text-primary-z8 bg-none;
 }
 
 [data-style='carbon'] [data-list] [data-list-item][data-selected='true']:hover:not(:disabled) {
-  @apply bg-none bg-primary-z3 text-primary-z9;
+  @apply bg-primary-z3 text-primary-z9 bg-none;
 }
 
 [data-style='carbon'] [data-list] [data-list-item][data-selected='true'] [data-item-icon] {

package/src/carbon/menu.css

@@ -9,19 +9,19 @@
    ============================================================================= */
 
 [data-style='carbon'] [data-menu-trigger] {
-  @apply bg-none border-surface-z4 text-surface-z7 rounded-none border bg-transparent;
+  @apply border-surface-z4 text-surface-z7 rounded-none border bg-transparent bg-none;
 }
 
 [data-style='carbon'] [data-menu-trigger]:hover:not(:disabled) {
-  @apply bg-none bg-surface-z3 text-surface-z9;
+  @apply bg-surface-z3 text-surface-z9 bg-none;
 }
 
 [data-style='carbon'] [data-menu-trigger]:focus-visible {
-  @apply outline-none border-2 border-primary-z5;
+  @apply border-primary-z5 border-2 outline-none;
 }
 
 [data-style='carbon'] [data-menu][data-open='true'] [data-menu-trigger] {
-  @apply bg-none bg-surface-z3 border-surface-z5;
+  @apply bg-surface-z3 border-surface-z5 bg-none;
 }
 
 /* Trigger elements */
@@ -42,7 +42,7 @@
    ============================================================================= */
 
 [data-style='carbon'] [data-menu-dropdown] {
-  @apply bg-none bg-surface-z1 border-surface-z3 rounded-none border;
+  @apply bg-surface-z1 border-surface-z3 rounded-none border bg-none;
 }
 
 /* =============================================================================
@@ -50,12 +50,12 @@
    ============================================================================= */
 
 [data-style='carbon'] [data-menu-item] {
-  @apply text-surface-z7 rounded-none border-0 border-b border-surface-z2;
+  @apply text-surface-z7 border-surface-z2 rounded-none border-0 border-b;
 }
 
 [data-style='carbon'] [data-menu-item]:hover:not(:disabled),
 [data-style='carbon'] [data-menu-item]:focus:not(:disabled) {
-  @apply bg-none bg-surface-z2 text-surface-z9 outline-none;
+  @apply bg-surface-z2 text-surface-z9 bg-none outline-none;
 }
 
 /* Item elements */
@@ -84,5 +84,5 @@
    ============================================================================= */
 
 [data-style='carbon'] [data-menu-separator] {
-  @apply bg-none bg-surface-z3;
+  @apply bg-surface-z3 bg-none;
 }

package/src/carbon/range.css

@@ -13,7 +13,7 @@
 }
 
 [data-style='carbon'] [data-range-selected] {
-  @apply bg-none bg-primary-z5;
+  @apply bg-primary-z5 bg-none;
 }
 
 /* =============================================================================
@@ -29,7 +29,7 @@
 }
 
 [data-style='carbon'] [data-range-thumb]:focus-visible {
-  @apply bg-primary-z5 outline-none border-2 border-primary-z7;
+  @apply bg-primary-z5 border-primary-z7 border-2 outline-none;
 }
 
 /* =============================================================================

package/src/carbon/search-filter.css

@@ -9,7 +9,7 @@
    ============================================================================= */
 
 [data-style='carbon'] [data-search-input] {
-  @apply text-surface-z7 border-b-2 border-surface-z5 rounded-none border-l-0 border-r-0 border-t-0 bg-surface-z1;
+  @apply text-surface-z7 border-surface-z5 bg-surface-z1 rounded-none border-t-0 border-r-0 border-b-2 border-l-0;
 }
 
 [data-style='carbon'] [data-search-input]:focus {
@@ -37,7 +37,7 @@
    ============================================================================= */
 
 [data-style='carbon'] [data-search-tag] {
-  @apply bg-none text-surface-z7 border-surface-z4 rounded-none border bg-surface-z2;
+  @apply text-surface-z7 border-surface-z4 bg-surface-z2 rounded-none border bg-none;
 }
 
 [data-style='carbon'] [data-search-tag-remove] {

package/src/carbon/select.css

@@ -9,19 +9,19 @@
    ============================================================================= */
 
 [data-style='carbon'] [data-select-trigger] {
-  @apply bg-none text-surface-z7 border-b-2 border-surface-z5 rounded-none border-l-0 border-r-0 border-t-0 bg-surface-z1;
+  @apply text-surface-z7 border-surface-z5 bg-surface-z1 rounded-none border-t-0 border-r-0 border-b-2 border-l-0 bg-none;
 }
 
 [data-style='carbon'] [data-select-trigger]:hover:not(:disabled) {
-  @apply bg-none bg-surface-z2 border-surface-z6 text-surface-z8;
+  @apply bg-surface-z2 border-surface-z6 text-surface-z8 bg-none;
 }
 
 [data-style='carbon'] [data-select-trigger]:focus-visible {
-  @apply outline-none border-b-2 border-primary-z5;
+  @apply border-primary-z5 border-b-2 outline-none;
 }
 
 [data-style='carbon'] [data-select][data-open='true'] [data-select-trigger] {
-  @apply bg-none bg-surface-z2 border-b-primary-z5;
+  @apply bg-surface-z2 border-b-primary-z5 bg-none;
 }
 
 /* =============================================================================
@@ -49,7 +49,7 @@
    ============================================================================= */
 
 [data-style='carbon'] [data-select-tag] {
-  @apply bg-none text-surface-z7 border-surface-z4 rounded-none border bg-surface-z2;
+  @apply text-surface-z7 border-surface-z4 bg-surface-z2 rounded-none border bg-none;
 }
 
 [data-style='carbon'] [data-select-tag-remove] {
@@ -65,7 +65,7 @@
    ============================================================================= */
 
 [data-style='carbon'] [data-select-dropdown] {
-  @apply bg-none bg-surface-z1 border-surface-z3 rounded-none border;
+  @apply bg-surface-z1 border-surface-z3 rounded-none border bg-none;
 }
 
 /* =============================================================================
@@ -79,19 +79,19 @@
 /* Hover and focus */
 [data-style='carbon'] [data-select-option]:hover:not(:disabled),
 [data-style='carbon'] [data-select-option]:focus:not(:disabled) {
-  @apply bg-none bg-surface-z2 text-surface-z9 outline-none;
+  @apply bg-surface-z2 text-surface-z9 bg-none outline-none;
 }
 
 /* Selected state */
 [data-style='carbon'] [data-select-option][data-selected='true'] {
-  @apply bg-none bg-primary-z2 text-surface-z8;
+  @apply bg-primary-z2 text-surface-z8 bg-none;
 }
 
 /* Selected state — full highlight when dropdown has focus */
 [data-style='carbon']
   [data-select-dropdown]:focus-within
   [data-select-option][data-selected='true'] {
-  @apply bg-none bg-primary-z2 text-primary-z7;
+  @apply bg-primary-z2 text-primary-z7 bg-none;
 }
 
 /* Check mark */
@@ -101,11 +101,11 @@
 
 /* Checkbox */
 [data-style='carbon'] [data-select-checkbox] {
-  @apply bg-none border-surface-z5 rounded-none bg-transparent;
+  @apply border-surface-z5 rounded-none bg-transparent bg-none;
 }
 
 [data-style='carbon'] [data-select-checkbox][data-checked='true'] {
-  @apply bg-none bg-primary-z5 border-primary-z5 text-white rounded-none;
+  @apply bg-primary-z5 border-primary-z5 rounded-none bg-none text-white;
 }
 
 /* Item elements */
@@ -130,7 +130,7 @@
    ============================================================================= */
 
 [data-style='carbon'] [data-select-divider] {
-  @apply bg-none bg-surface-z3;
+  @apply bg-surface-z3 bg-none;
 }
 
 /* =============================================================================
@@ -142,7 +142,7 @@
 }
 
 [data-style='carbon'] [data-select-filter-input] {
-  @apply text-surface-z7 border-b-2 border-surface-z4 rounded-none border-l-0 border-r-0 border-t-0 bg-transparent;
+  @apply text-surface-z7 border-surface-z4 rounded-none border-t-0 border-r-0 border-b-2 border-l-0 bg-transparent;
 }
 
 [data-style='carbon'] [data-select-filter-input]:focus {

package/src/carbon/status-list.css

@@ -62,5 +62,5 @@
 
 /* Count badge */
 [data-style='carbon'] [data-status-count] {
-  @apply bg-none text-surface-z6 font-semibold;
+  @apply text-surface-z6 bg-none font-semibold;
 }

package/src/carbon/step-indicator.css

@@ -0,0 +1,40 @@
+/* StepIndicator — carbon theme (square, flat fills, no border-radius) */
+
+[data-style='carbon'] [data-step-item][data-step-state='complete'] [data-step-number] {
+  @apply bg-primary-z5 border-primary-z5 text-on-primary bg-none;
+  border-radius: 0;
+}
+
+[data-style='carbon'] [data-step-item][data-step-state='current'] [data-step-number] {
+  @apply bg-transparent border-primary-z5 text-primary-z7 bg-none;
+  border-radius: 0;
+  outline: 2px solid;
+  @apply outline-primary-z4;
+  outline-offset: 2px;
+}
+
+[data-style='carbon'] [data-step-item][data-step-state='upcoming'] [data-step-number] {
+  @apply bg-surface-z2 border-surface-z4 text-surface-z5 bg-none;
+  border-radius: 0;
+}
+
+[data-style='carbon'] [data-step-item][data-step-state='complete'] [data-step-label] {
+  @apply text-primary-z7 bg-none;
+}
+
+[data-style='carbon'] [data-step-item][data-step-state='current'] [data-step-label] {
+  @apply text-surface-z9 font-semibold bg-none;
+}
+
+[data-style='carbon'] [data-step-item][data-step-state='upcoming'] [data-step-label] {
+  @apply text-surface-z5 bg-none;
+}
+
+[data-style='carbon'] [data-step-item][data-step-state='complete']::after {
+  @apply bg-primary-z5;
+}
+
+[data-style='carbon'] [data-step-item][data-step-state='current']::after,
+[data-style='carbon'] [data-step-item][data-step-state='upcoming']::after {
+  @apply bg-surface-z4;
+}

package/src/carbon/switch.css

@@ -5,7 +5,7 @@
  */
 
 [data-style='carbon'] [data-switch-track] {
-  @apply bg-none border-surface-z5 border-2 bg-transparent rounded-none;
+  @apply border-surface-z5 rounded-none border-2 bg-transparent bg-none;
 }
 
 [data-style='carbon'] [data-switch] [data-switch-thumb] {
@@ -14,12 +14,12 @@
 }
 
 [data-style='carbon'] [data-switch]:focus-visible [data-switch-track] {
-  @apply border-2 border-primary-z5;
+  @apply border-primary-z5 border-2;
 }
 
 /* On state */
 [data-style='carbon'] [data-switch][aria-checked='true'] [data-switch-track] {
-  @apply bg-none bg-primary-z5 border-primary-z5;
+  @apply bg-primary-z5 border-primary-z5 bg-none;
 }
 
 [data-style='carbon'] [data-switch][aria-checked='true'] [data-switch-thumb] {

package/src/carbon/table.css

@@ -9,7 +9,7 @@
    ============================================================================= */
 
 [data-style='carbon'] [data-table-header] th {
-  @apply text-surface-z7 border-surface-z4 border-b bg-surface-z3;
+  @apply text-surface-z7 border-surface-z4 bg-surface-z3 border-b;
 }
 
 [data-style='carbon'] [data-table-header-cell][data-sortable='true']:hover {
@@ -49,26 +49,26 @@
 }
 
 [data-style='carbon'] [data-table-row]:hover {
-  @apply bg-none bg-surface-z2 text-surface-z9;
+  @apply bg-surface-z2 text-surface-z9 bg-none;
 }
 
 [data-style='carbon'] [data-table-row]:focus {
-  @apply bg-none bg-surface-z2 text-surface-z9 outline-none border-2 border-primary-z5;
+  @apply bg-surface-z2 text-surface-z9 border-primary-z5 border-2 bg-none outline-none;
 }
 
 [data-style='carbon'] [data-table-row][data-selected='true'] {
-  @apply bg-none bg-primary-z2 text-primary-z8;
+  @apply bg-primary-z2 text-primary-z8 bg-none;
 }
 
 /* =============================================================================
    Striped — alternating rows
    ============================================================================= */
 
-[data-style='carbon'] [data-striped='true'] [data-table-body] tr:nth-child(even) {
+[data-style='carbon'] [data-table-striped] [data-table-body] tr:nth-child(even) {
   @apply bg-surface-z1;
 }
 
-[data-style='carbon'] [data-striped='true'] [data-table-body] tr:nth-child(odd) {
+[data-style='carbon'] [data-table-striped] [data-table-body] tr:nth-child(odd) {
   @apply bg-surface-z0;
 }
 

package/src/carbon/tabs.css

@@ -32,9 +32,11 @@
    ============================================================================= */
 
 [data-style='carbon'] [data-tabs-trigger] {
-  @apply bg-transparent text-surface-z5 border-b-[3px] border-b-transparent rounded-none;
+  @apply text-surface-z5 rounded-none border-b-[3px] border-b-transparent bg-transparent;
   font-weight: 400;
-  transition: color 150ms ease, border-color 150ms ease;
+  transition:
+    color 150ms ease,
+    border-color 150ms ease;
 }
 
 [data-style='carbon'] [data-tabs-trigger]:hover:not(:disabled):not([data-disabled]) {
@@ -42,7 +44,7 @@
 }
 
 [data-style='carbon'] [data-tabs-trigger][data-selected] {
-  @apply bg-none text-surface-z9 border-b-primary-z5;
+  @apply text-surface-z9 border-b-primary-z5 bg-none;
   font-weight: 600;
 }
 
@@ -67,7 +69,7 @@
 
 /* Horizontal after (tabs below content): top border */
 [data-style='carbon'] [data-tabs][data-position='after'] [data-tabs-trigger] {
-  @apply border-b-0 border-t-[3px] border-t-transparent rounded-none;
+  @apply rounded-none border-t-[3px] border-b-0 border-t-transparent;
 }
 
 [data-style='carbon']
@@ -90,7 +92,7 @@
 
 /* Vertical before (tabs on left): right border */
 [data-style='carbon'] [data-tabs][data-orientation='vertical'] [data-tabs-trigger] {
-  @apply border-b-0 border-r-[3px] border-r-transparent rounded-none;
+  @apply rounded-none border-r-[3px] border-b-0 border-r-transparent;
 }
 
 [data-style='carbon']
@@ -108,19 +110,19 @@
 [data-style='carbon']
   [data-tabs][data-orientation='vertical'][data-position='after']
   [data-tabs-trigger] {
-  @apply border-t-0 border-b-0 border-r-0 border-l-[3px] border-l-transparent rounded-none;
+  @apply rounded-none border-t-0 border-r-0 border-b-0 border-l-[3px] border-l-transparent;
 }
 
 [data-style='carbon']
   [data-tabs][data-orientation='vertical'][data-position='after']
   [data-tabs-trigger]:hover:not(:disabled):not([data-disabled]) {
-  @apply border-t-0 border-b-0 border-r-0 border-l-surface-z4;
+  @apply border-l-surface-z4 border-t-0 border-r-0 border-b-0;
 }
 
 [data-style='carbon']
   [data-tabs][data-orientation='vertical'][data-position='after']
   [data-tabs-trigger][data-selected] {
-  @apply border-t-0 border-b-0 border-r-0 border-l-primary-z5;
+  @apply border-l-primary-z5 border-t-0 border-r-0 border-b-0;
   font-weight: 600;
 }
 

package/src/carbon/toc.css

@@ -14,9 +14,9 @@
 
 [data-style='carbon'] [data-toc] [data-toc-item]:hover,
 [data-style='carbon'] [data-toc] [data-toc-item][data-toc-focused] {
-  @apply bg-none bg-surface-z2 text-surface-z9 outline-none;
+  @apply bg-surface-z2 text-surface-z9 bg-none outline-none;
 }
 
 [data-style='carbon'] [data-toc] [data-toc-item][data-toc-active] {
-  @apply text-primary-z7 border-l-2 border-l-primary-z5;
+  @apply text-primary-z7 border-l-primary-z5 border-l-2;
 }

package/src/carbon/toggle.css

@@ -9,7 +9,7 @@
    ============================================================================= */
 
 [data-style='carbon'] [data-toggle] {
-  @apply bg-none border-surface-z3 rounded-none border bg-transparent;
+  @apply border-surface-z3 rounded-none border bg-transparent bg-none;
 }
 
 /* =============================================================================
@@ -22,12 +22,12 @@
 
 [data-style='carbon'] [data-toggle-option]:hover:not(:disabled):not([data-disabled='true']),
 [data-style='carbon'] [data-toggle-option]:focus:not(:disabled):not([data-disabled='true']) {
-  @apply bg-none bg-surface-z3 text-surface-z8;
+  @apply bg-surface-z3 text-surface-z8 bg-none;
 }
 
 /* Selected state */
 [data-style='carbon'] [data-toggle-option][data-selected='true'] {
-  @apply bg-none bg-primary-z5 text-on-primary border-b-primary-z5 border-b-2;
+  @apply bg-primary-z5 text-on-primary border-b-primary-z5 border-b-2 bg-none;
 }
 
 /* =============================================================================

package/src/carbon/toolbar.css

@@ -9,7 +9,7 @@
    ============================================================================= */
 
 [data-style='carbon'] [data-toolbar] {
-  @apply bg-none bg-transparent;
+  @apply bg-transparent bg-none;
 }
 
 /* Position-based borders */
@@ -39,21 +39,20 @@
 }
 
 [data-style='carbon'] [data-toolbar-item]:hover:not(:disabled):not([data-disabled='true']) {
-  @apply bg-none bg-surface-z3 text-surface-z9;
+  @apply bg-surface-z3 text-surface-z9 bg-none;
 }
 
-[data-style='carbon']
-  [data-toolbar-item]:focus-visible:not(:disabled):not([data-disabled='true']) {
-  @apply bg-none text-surface-z9 outline-none border-2 border-primary-z5;
+[data-style='carbon'] [data-toolbar-item]:focus-visible:not(:disabled):not([data-disabled='true']) {
+  @apply text-surface-z9 border-primary-z5 border-2 bg-none outline-none;
 }
 
 /* Active/pressed state */
 [data-style='carbon'] [data-toolbar-item][data-active='true'] {
-  @apply bg-none bg-primary-z2 text-primary-z7;
+  @apply bg-primary-z2 text-primary-z7 bg-none;
 }
 
 [data-style='carbon'] [data-toolbar-item][data-active='true']:hover:not(:disabled) {
-  @apply bg-none bg-primary-z3 text-primary-z8;
+  @apply bg-primary-z3 text-primary-z8 bg-none;
 }
 
 /* =============================================================================
@@ -77,9 +76,9 @@
    ============================================================================= */
 
 [data-style='carbon'] [data-toolbar-separator] {
-  @apply bg-none bg-surface-z3;
+  @apply bg-surface-z3 bg-none;
 }
 
 [data-style='carbon'] [data-toolbar-divider] {
-  @apply bg-none bg-surface-z3;
+  @apply bg-surface-z3 bg-none;
 }