Skip to content

Commit

Permalink
Updates to padding
Browse files Browse the repository at this point in the history
  • Loading branch information
kglovern committed Aug 15, 2024
1 parent d86810a commit b8503a9
Show file tree
Hide file tree
Showing 9 changed files with 19 additions and 9 deletions.
1 change: 1 addition & 0 deletions src/app/src/App.css
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
@tailwind base;
@tailwind components;
@tailwind utilities;

3 changes: 3 additions & 0 deletions src/app/src/index.css
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,7 @@ body,
html,
#app {
height: 100%;
* {
@apply box-border;
}
}
2 changes: 1 addition & 1 deletion src/app/src/workspace/Column/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { DRO } from "../../widgets/Control/DRO";

export const Column = () => {
return (
<div className="border p-3 flex-1">
<div className="border p-3 flex-1 box-border">
<div>DRO and Jogging</div>
<DRO />
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/app/src/workspace/PrimaryArea/index.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
export const PrimaryArea = () => {
return <div className="border p-3 flex-1">Vizualizer</div>;
return <div className="border p-3 flex-1 box-border">Vizualizer</div>;
};
2 changes: 1 addition & 1 deletion src/app/src/workspace/Sidebar/index.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import {Navbar} from "../../features/navbar";

export const Sidebar = () => {
return <div className="border w-20 flex flex-col justify-end">
return <div className="border w-20 flex flex-col justify-end box-border">
<Navbar />
</div>;
};
8 changes: 4 additions & 4 deletions src/app/src/workspace/ToolArea/index.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
export const ToolArea = () => {
return (
<div className="border p-3 flex-1 flex gap-2">
<div className="w-full border p-3">File Area</div>
<div className="w-full border p-3">Job Control</div>
<div className="w-full border p-3">Tools (Probe, Macros, etc.)</div>
<div className="border p-3 flex-1 flex gap-2 box-border">
<div className="w-full border p-3 box-border">File Area</div>
<div className="w-full border p-3 box-border">Job Control</div>
<div className="w-full border p-3 box-border">Tools (Probe, Macros, etc.)</div>
</div>
);
};
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 8 additions & 1 deletion src/app/src/workspace/TopBar/index.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
import gSenderIcon from './assets/icon-round.png';

export const TopBar = () => {
return <div className="border p-3 h-20">Top bar</div>;
return <div className="border p-3 h-20 box-border">
<div className="w-[50px] h-[50px]">
<img alt="gSender Logo" src={gSenderIcon}/>
</div>

</div>;
};
1 change: 0 additions & 1 deletion tailwind.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,3 @@ module.exports = {
},
plugins: [],
};

0 comments on commit b8503a9

Please sign in to comment.