Skip to content
This repository was archived by the owner on Jan 15, 2018. It is now read-only.

Commit 9c19938

Browse files
17mahera17mahera
committed
position fix
1 parent bd32496 commit 9c19938

File tree

4 files changed

+84
-65
lines changed

4 files changed

+84
-65
lines changed

‎AkiUI_MainPageCSS.css

Lines changed: 47 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313

1414
.buttonactive{
1515
text-shadow:0 1px 0 #fff;
16-
background-image:-webkit-linear-gradient(top,#fff 0,##980000 100%);
16+
background-image:-webkit-linear-gradient(top,#fff 0,#980000 100%);
1717
background-image:-o-linear-gradient(top,#fff 0,#980000 100%);
1818
background-image:-webkit-gradient(linear,left top,left bottom,from(#fff),to(#980000));
19-
background-image:linear-gradient(to bottom,#fff 0,#b31c18 100%);
19+
background-image:linear-gradient(to bottom,#fff 0,#980000 100%);
2020
filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#111242', GradientType=0);
2121
filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);
2222
background-repeat:repeat-x;
@@ -28,7 +28,7 @@
2828
margin: 5vh auto;
2929
height:14vh;
3030
width:16vw;
31-
31+
margin-left:0.5vw;
3232
font-size:4vmin;
3333
}
3434

@@ -51,37 +51,49 @@
5151
}
5252

5353
#leftSection {
54-
position: fixed;
54+
position: fixed;
5555
left: 1vw;
56-
top: 1vw;
57-
56+
top: 2vh;
57+
5858
width: 28vw;
59-
height: 26.5vw;
59+
height: 54vh;
6060
}
6161

6262
#leftSection ul {
6363
border: none;
6464
}
65-
65+
#camtab li{
66+
width: 4.75vw;
67+
height: 3vh;
68+
font-size:2.5vmin;
69+
}
6670
#frontcam-tab {
6771
width: 30vw;
6872
}
6973

7074
.webcam-img {
75+
position: fixed;
76+
left: 2vw;
77+
top: 10.25vh;
7178
width: 26vw;
72-
height: 21.5vw;
79+
height: 44.5vh;
80+
}
81+
#AutoPathHolder{
82+
position: fixed;
83+
top: 25vh;
84+
right: 6vw;
85+
width: 37vw;
7386
}
74-
7587
#hammertime {
7688
position: fixed;
77-
top: 28.5vw;
89+
top: 76vh;
7890
left: 11vw;
7991
}
8092

8193
#RobotDiagram{
8294
position: fixed;
8395
left: 29.5vw;
84-
top: 1vw;
96+
top: 2vh;
8597
height: 96vh;
8698
width: 50vw;
8799

@@ -95,7 +107,7 @@
95107

96108
#AutoBox{
97109
position: fixed;
98-
top: 1vw;
110+
top: 2vh;
99111
right: 1vw;
100112
width: 19vw;
101113
height: 96vh;
@@ -160,7 +172,6 @@
160172
overflow:scroll;
161173
height: 65vh;
162174
width: 50vw;
163-
border: 5px inset grey;
164175
border-radius: 2vmin;
165176
display:block;
166177
position: fixed;
@@ -271,63 +282,71 @@
271282
#dog
272283
{
273284
position:fixed;
274-
top:55vh;
275-
left:45vw;
276-
height:19px;
285+
top:65vh;
286+
left:43vw;
287+
height:5vh;
288+
width:4vw;
277289
}
278290
#do
279291
{
280292
position:fixed;
281-
top:55vh;
282-
right:44.75vw;
283-
height:19px;
293+
top:65vh;
294+
right:34.5vw;
295+
height:5vh;
296+
width:4vw;
284297
}
285298
#robotsv
286299
{
287300

288301
position:fixed;
289-
height:90vh;
290-
right:38.5vw;
291-
top:5vh;
302+
height:80vh;
303+
right:39.5vw;
304+
width:13vw;
305+
top:10vh;
292306

293307
}
294308
#binArm
295309
{
296310
position:fixed;
297311
height:15vh;
298-
right:50.625vw;
312+
right:51.625vw;
313+
width:6vw;
299314
top:50vh;
300315
}
301316

302317
#toteArm1
303318
{
304319
position:fixed;
305320
height:100vh;
306-
right:20.225vw;
321+
width:27.5vw;
322+
right:21.225vw;
307323
top:5vh;
308324

309325
}
310326
#toteArm2
311327
{
312328
position:fixed;
313329
height:100vh;
314-
right:20.225vw;
330+
width:27.5vw;
331+
right:21.225vw;
315332
top:-5vh;
316333

317334
}
318335
#toteArm3
319336
{
320337
position:fixed;
321338
height:100vh;
322-
right:20.225vw;
339+
width:27.5vw;
340+
right:21.225vw;
323341
top:-15vh;
324342

325343
}
326344
#toteArm4
327345
{
328346
position:fixed;
329347
height:100vh;
330-
right:20.225vw;
348+
width:27.5vw;
349+
right:21.225vw;
331350
top:-25vh;
332351

333352
}

‎Aton.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,22 +16,22 @@
1616

1717
<body class="UIPage">
1818

19-
<div id="AutoPathHolder">
19+
<div class="MainDivide" id="AutoPathHolder">
2020
<select id="AutoPathChoice">
2121
</select>
2222
<button class="btn-primary BinsLiftLevels" id="BinButton7" onclick="Socket.setKeyValue('binTo',7000,'write',true)">Bin 7000</button>
2323
</div>
2424
<br>
25-
<div class="settingsBox">
25+
<div class="MainDivide settingsBox">
2626

2727
</div>
2828

2929
<script type="text/javascript" src="/networktables/networktables.js"></script>
3030
<script type="text/javascript" src="writeSettings.js"></script>
3131
<script>
32-
32+
3333
/*
34-
34+
3535
//var arr=new Array();
3636
function findSelectedMode(){
3737
var arr=new Array();

‎Robot.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
<body class="UIPage">
1717

18-
<div class="settingsBox">
18+
<div class="MainDivide settingsBox">
1919
</div>
2020
<script type="text/javascript" src="/networktables/networktables.js"></script>
2121
<script type="text/javascript" src="writeSettings.js"></script>

0 commit comments

Comments
 (0)