From def4a9eea51ae25d45f34a5a78d66c6c960f9ffc Mon Sep 17 00:00:00 2001 From: FluffyCube9343 Date: Sat, 15 Oct 2022 14:58:33 -0400 Subject: [PATCH] (manually) merged option bar and input --- static/src/main.css | 45 +++++++++----------- templates/base.html | 100 +++++++++++++++++++++++++++----------------- 2 files changed, 81 insertions(+), 64 deletions(-) diff --git a/static/src/main.css b/static/src/main.css index 8ce4cd4..fe0a52e 100644 --- a/static/src/main.css +++ b/static/src/main.css @@ -4,6 +4,7 @@ @tailwind components; @tailwind utilities; +/* common.css import */ * { padding: 0; margin: 0; @@ -11,6 +12,25 @@ color: white; box-sizing: border-box; } + +.main-container { + display: flex; + justify-content: space-around; + align-items: stretch; + background-color: black; + gap: 0.33333333vw; + height: 99.5vh; +} +.main-element { + display: inline-block; + height: 99.5vh; + width: 32vw; + text-align: center; + background-color: #181c20; + position: relative; +} + +/*style.css import*/ .robotimg { height: 99.5vh; width: 32vw; @@ -194,28 +214,3 @@ a:link, a:visited { text-decoration: none; } - -* { - padding: 0; - margin: 0; - background-color: #181c20; - color: white; - box-sizing: border-box; -} - -.main-container { - display: flex; - justify-content: space-around; - align-items: stretch; - background-color: black; - gap: 0.33333333vw; - height: 99.5vh; -} -.main-element { - display: inline-block; - height: 99.5vh; - width: 32vw; - text-align: center; - background-color: #181c20; - position: relative; -} diff --git a/templates/base.html b/templates/base.html index 49d0fc6..bf2ce36 100644 --- a/templates/base.html +++ b/templates/base.html @@ -12,7 +12,7 @@ Potentia Robotics GUI -
+
@@ -21,43 +21,68 @@

360

+ + + +

Deg

- -
-
- Position - Percent - Velocity - Force

- Voltage +
+

360

+ + + +

Deg

- -
-
- Position - Percent - Velocity - Force

- Voltage +
+

360

+ + + +

Deg

- +
-
- Position - Percent - Velocity - Force

- Voltage -
-
@@ -83,12 +108,10 @@

Angle Rotation

- -
-

1

+

1

@@ -98,66 +121,65 @@

2

- +

57

3

- +

57

4

- +

57

5

- +

57

6

- +

57

7

- +

57

8

- +

57

9

- +

57

10

- +

57

-