Skip to content

Commit f8b9dc0

Browse files
committed
Tailwind and major UI updates
1 parent 0fb6cbe commit f8b9dc0

File tree

5 files changed

+14
-12
lines changed

5 files changed

+14
-12
lines changed

packages/app/package.json

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,12 @@
2929
"@tailwindcss/postcss": "^4.1.12",
3030
"@wdio/devtools-service": "workspace:*",
3131
"@wdio/reporter": "9.18.0",
32-
"postcss": "^8.5.6"
32+
"autoprefixer": "^10.4.21",
33+
"postcss": "^8.5.6",
34+
"rollup": "^4.47.0",
35+
"stylelint": "^16.24.0",
36+
"stylelint-config-recommended": "^17.0.0",
37+
"stylelint-config-tailwindcss": "^1.0.0",
38+
"tailwindcss": "~3.4.17"
3339
}
3440
}

packages/app/postcss.config.cjs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
// eslint-disable-next-line no-undef
21
module.exports = {
32
plugins: {
4-
'@tailwindcss/postcss': {},
3+
tailwindcss: {},
54
autoprefixer: {},
65
},
76
}

packages/app/src/components/workbench.ts

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ export class DevtoolsWorkbench extends Element {
3535
color: var(--vscode-foreground);
3636
background-color: var(--vscode-editor-background);
3737
position: relative;
38-
margin-left: 10px;
3938
}
4039
`]
4140

@@ -92,7 +91,7 @@ export class DevtoolsWorkbench extends Element {
9291
? (() => {
9392
const pos = this.#dragHorizontal.getPosition() // e.g. "flex-basis: 300px;"
9493
const m = pos.match(/flex-basis:\s*([\d.]+)px/)
95-
const w = m ? m[1] : '260'
94+
const w = m ? m[1] : MIN_METATAB_WIDTH
9695
// Keep drag-resize (flex-basis) but stop auto-expansion
9796
return `${pos}; flex:0 0 auto; min-width:${w}px; max-width:${w}px;`
9897
})()
@@ -105,9 +104,7 @@ export class DevtoolsWorkbench extends Element {
105104
<wdio-devtools-actions></wdio-devtools-actions>
106105
</wdio-devtools-tab>
107106
<wdio-devtools-tab label="Metadata">
108-
<div class="pl-[3px]">
109-
<wdio-devtools-metadata></wdio-devtools-metadata>
110-
</div>
107+
<wdio-devtools-metadata></wdio-devtools-metadata>
111108
</wdio-devtools-tab>
112109
<nav class="ml-auto" slot="actions">
113110
<button @click="${() => this.#toggle('workbenchSidebar')}" class="flex h-10 w-10 items-center justify-center pointer ml-auto hover:bg-toolbarHoverBackground">
@@ -129,7 +126,7 @@ export class DevtoolsWorkbench extends Element {
129126
<section class="basis-auto text-gray-500 flex items-center justify-center flex-grow">
130127
<wdio-devtools-browser></wdio-devtools-browser>
131128
</section>
132-
${this.#dragHorizontal.getSlider(this.#workbenchSidebarCollapsed ? 'hidden' : this.#toolbarCollapsed ? 'h-full' : 'h-[70%]')}
129+
${!this.#workbenchSidebarCollapsed ? this.#dragHorizontal.getSlider() : nothing}
133130
</section>
134131
<wdio-devtools-tabs cacheId="activeWorkbenchTab" class="border-t-[1px] border-t-panelBorder ${this.#toolbarCollapsed ? 'hidden' : ''}">
135132
<wdio-devtools-tab label="Source">
@@ -160,7 +157,7 @@ export class DevtoolsWorkbench extends Element {
160157
`
161158
: nothing
162159
}
163-
${this.#dragVertical.getSlider(this.#toolbarCollapsed ? 'hidden' : '')}
160+
${!this.#toolbarCollapsed ? this.#dragVertical.getSlider() : nothing}
164161
`
165162
}
166163
}

packages/app/src/utils/DragController.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ export class DragController implements ReactiveController {
226226
? 'top'
227227
: ''
228228
className += this.#options.direction === Direction.horizontal
229-
? ' cursor-col-resize left-0 w-[10px]'
229+
? ' cursor-col-resize left-0 h-full w-[10px]'
230230
: this.#options.direction === Direction.vertical
231231
? ' cursor-row-resize top-0 w-full h-[10px]'
232232
: ''

packages/service/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,11 @@
4040
"@types/ws": "^8.18.1",
4141
"@wdio/globals": "9.17.0",
4242
"@wdio/protocols": "9.16.2",
43-
"devtools": "^8.42.0",
4443
"vite-plugin-dts": "^4.5.4"
4544
},
4645
"peerDependencies": {
4746
"@wdio/protocols": "9.16.2",
47+
"devtools": "^8.42.0",
4848
"webdriverio": "^9.19.1"
4949
}
5050
}

0 commit comments

Comments
 (0)