Skip to content

Commit 5464405

Browse files
suthar26suthar26
committed
auto styling done
1 parent 99b1db2 commit 5464405

File tree

6 files changed

+252
-132
lines changed

6 files changed

+252
-132
lines changed

‎.idea/workspace.xml

Lines changed: 152 additions & 71 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎auto-form.html

Lines changed: 45 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -3,27 +3,44 @@
33
<link rel="import" href="bower_components/paper-radio-button/paper-radio-button.html">
44
<link rel="import" href="bower_components/core-label/core-label.html">
55
<link rel="import" href="bower_components/paper-radio-group/paper-radio-group.html">
6-
<link rel="import" href="bower_components/paper-toggle-button/paper-toggle-button.html">
76

87

98
<polymer-element name="auto-form">
109
<template>
10+
<style id="style">
11+
.labels{
12+
padding: 7px 7px 7px 7px;
13+
height: 50px;
14+
}
15+
.labels > l
16+
{
17+
margin: 0;
18+
position: relative;
19+
top: 34%;
20+
}
21+
22+
23+
</style>
1124
<bs-container>
1225
<bs-row>
13-
<bs-col xs="6"><h4>Recycle Bin from Staging zone</h4></bs-col>
14-
<bs-col xs="6"><h4>Totes from from Staging zone</h4></bs-col>
26+
<bs-col xs="6">
27+
<div><h4>Recycle Bins form Staging Zone</h4></div>
28+
</bs-col>
29+
<bs-col xs="6">
30+
<div><h4>Totes form Staging Zone</h4></div>
31+
</bs-col>
1532
</bs-row>
1633

1734
<bs-row>
18-
<bs-col xs="2" style="padding-top: 10px">
19-
<l>Moved</l>
35+
<bs-col xs="2">
36+
<div class="labels"><l>Moved</l></div>
2037
</bs-col>
2138
<bs-col xs="4">
2239
<number-counter id = "BinStagingMoved" values = [0] valueLimits = [3]></number-counter>
2340

2441
</bs-col>
25-
<bs-col xs="2" style="padding-top: 10px">
26-
<l>Moved</l>
42+
<bs-col xs="2">
43+
<div class="labels"><l>Moved</l></div>
2744
</bs-col>
2845
<bs-col xs="4">
2946
<number-counter id = "TotesStagingMoved" values = [0] valueLimits = [3]></number-counter>
@@ -33,14 +50,14 @@
3350

3451

3552
<bs-row>
36-
<bs-col xs=2 style="padding-top: 10px">
37-
<l>Scored</l>
53+
<bs-col xs=2>
54+
<div class="labels"><l>Scored</l></div>
3855
</bs-col>
3956
<bs-col xs="4">
4057
<number-counter id = "BinStagingScored" values = [0] valueLimits = [3]></number-counter>
4158
</bs-col>
42-
<bs-col xs="2" style="padding-top: 10px">
43-
<l>Scored</l>
59+
<bs-col xs="2">
60+
<div class="labels"><l>Scored</l></div>
4461
</bs-col>
4562
<bs-col xs="4">
4663
<number-counter id = "TotesStagingScored" values = [0] valueLimits = [3]></number-counter>
@@ -50,51 +67,52 @@
5067

5168
<bs-row>
5269
<bs-col xs="6"></bs-col>
53-
<bs-col xs="2" style="padding-top: 10px"> <l>Stack Scored</l>
70+
<bs-col xs="2">
71+
<div class="labels"><l>Stack Scored</l></div>
5472
</bs-col>
5573
<bs-col xs="4">
56-
<paper-toggle-button id="stackScored" checked="{{StackScored}}" style="height: 50px; padding-top: 25px"></paper-toggle-button>
74+
<paper-toggle-button id="stackScored" checked="{{StackScored}}" style="height: 50px; padding-top: 30px; padding-left: 25px"></paper-toggle-button>
5775
</bs-col>
5876
</bs-row>
5977

6078
<bs-row>
6179
<bs-col xs="6"><h4>Recycle Bins from Step</h4></bs-col>
62-
<bs-col xs="6"><h4>Mobility</h4></bs-col>
80+
<bs-col xs="6"><div><h4>Mobility</h4></div></bs-col>
6381
</bs-row>
6482
<bs-row>
6583

66-
<bs-col xs="2" style="padding-top: 25px">
67-
<l>Acquired</l>
84+
<bs-col xs="2">
85+
<div class="labels"><l>Acquired</l></div>
6886
</bs-col>
6987
<bs-col xs="4">
7088
<number-counter id = "BinsStep" values = [0] valueLimits = [4]></number-counter>
7189
</bs-col>
72-
<bs-col xs="2" style="padding-top: 10px">
73-
<l>Auto Zone</l>
90+
<bs-col xs="2">
91+
<div class="labels"><l>Auto Zone</l></div>
7492
</bs-col>
7593
<bs-col xs="4">
76-
<paper-toggle-button id="mobility" checked="{{auto}}" style="height: 50px; padding-top: 25px">Auto Mobility</paper-toggle-button>
94+
<paper-toggle-button id="mobility" checked="{{auto}}" style="height: 50px; padding-top: 25px ; padding-left: 25px">Auto Mobility</paper-toggle-button>
7795
</bs-col>
7896
</bs-row>
7997

8098

8199
<bs-row>
82-
<bs-col xs="6"><h4>Totes from Step</h4></bs-col>
83-
<bs-col xs="6"><h4>Totes from Landfill</h4></bs-col>
100+
<bs-col xs="6"><div><h4>Totes from Step</h4></div></bs-col>
101+
<bs-col xs="6"><div><h4>Totes form Landfill</h4></div></bs-col>
84102
</bs-row>
85103

86104
<bs-row>
87-
<bs-col xs="2" style="padding-top: 25px">
88-
<l>Acquired</l>
105+
<bs-col xs="2">
106+
<div class="labels"><l>Acquired</l></div>
89107
</bs-col>
90108
<bs-col xs="4">
91-
<paper-toggle-button id="totesStep" checked="{{TotesStep}}" style="height: 50px; padding-top: 25px">Auto Mobility</paper-toggle-button>
109+
<paper-toggle-button id="totesStep" checked="{{TotesStep}}" style="height: 50px; padding-top: 25px; padding-left: 25px">Auto Mobility</paper-toggle-button>
92110
</bs-col>
93-
<bs-col xs="2" style="padding-top: 25px">
94-
<l>Acquired</l>
111+
<bs-col xs="2">
112+
<div class="labels"><l>Acquired</l></div>
95113
</bs-col>
96114
<bs-col xs="4">
97-
<paper-toggle-button id="totesLandfill" checked="{{TotesLandfill}}" style="height: 50px; padding-top: 25px"></paper-toggle-button>
115+
<paper-toggle-button id="totesLandfill" checked="{{TotesLandfill}}" style="height: 50px; padding-top: 25px; padding-left: 25px"></paper-toggle-button>
98116
</bs-col>
99117
</bs-row>
100118

‎index.html

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
<link rel="import" href="bower_components/core-pages/core-pages.html">
1515
<link rel="import" href="bower_components/paper-dialog/paper-dialog.html">
1616
<link rel="import" href="bower_components/paper-shadow/paper-shadow.html">
17+
<link rel="import" href="bower_components/paper-toggle-button/paper-toggle-button.html">
1718
<link rel="import" href="number-counter.html">
1819
<link rel="import" href="outpost-engage.html">
1920
<link rel="import" href="outpost-header.html">
@@ -30,27 +31,31 @@
3031
background-color: #ffffff;
3132
font-family: 'RobotoDraft', sans-serif;
3233
}
34+
3335
core-header-panel {
34-
height: 100%;
35-
overflow: auto;
36-
-webkit-overflow-scrolling: touch;
36+
height: 100%;
37+
overflow: auto;
38+
-webkit-overflow-scrolling: touch;
39+
}
40+
core-scaffold /deep/ core-toolbar{
41+
background-color: #E53935;
42+
/* ff888b lighter red*/
43+
}
44+
html /deep/ paper-toggle-button::shadow [checked] .toggle {
45+
background-color: #FF1744;
3746
}
38-
core-scaffold /deep/ core-toolbar{
39-
background-color: #E53935;
40-
/* ff888b lighter red*/
41-
}
4247
core-toolbar {
43-
color: white;
48+
color: white;
4449
}
4550
core-menu /deep/ core-icon
51+
{
52+
margin-right: 20px;
53+
}
54+
core-scaffold::shadow core-header-panel
4655
{
47-
margin-right: 20px;
56+
57+
background-color: white;
4858
}
49-
core-scaffold::shadow core-header-panel
50-
{
51-
52-
background-color: white;
53-
}
5459
</style>
5560

5661
<body unresolved fullbleed>
@@ -103,12 +108,6 @@
103108
</template>
104109
</template>
105110
<script>
106-
Polymer ({
107-
editMatch: function (){
108-
this.$.overlay.toggle();
109-
}
110-
});
111-
112111
var extBind = document.querySelector('#external-binding');
113112
var style = document.querySelector('#style');
114113

@@ -142,7 +141,8 @@
142141
{
143142
if(window.sessionStorage.getItem('instanceId').search(/blue/i) > -1)
144143
{
145-
style.sheet.cssRules[2].style.backgroundColor = "#039BE5"
144+
style.sheet.cssRules[2].style.backgroundColor = "#039BE5";
145+
style.sheet.cssRules[3].style.backgroundColor = "#2979FF";
146146
}
147147
extBind.mode = 0;
148148
extBind.scout = true;

‎index.php

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

66
$slim = new \Slim\Slim();
77
$slim->response->headers->set('Content-Type', 'application/json');
8-
$data = openDatabase('team188_scout');
8+
$data = openDatabase('scouttesting');
99

1010
#get match schedule
1111
$slim->get('/matches', function () use($data, $slim){

‎number-counter.html

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,29 +7,28 @@
77
padding: 7px 7px 7px 7px;
88
}
99
#decreaseButton /deep/ core-icon{
10-
color: red;
10+
color: #FF1744;
1111
height: 32px;
1212
width: 32px;
1313
}
1414
#increaseButton /deep/ core-icon{
15-
color: red;
15+
color: #00E676;
1616
height: 32px;
1717
width: 32px;
1818
}
1919
</style>
2020

21-
<!-- <strong style="text-align:centre">{{id}}</strong> -->
2221
<template repeat="{{value, i in values}}">
2322
<div id = "unit">
2423
<core-icon-button
2524
id="decreaseButton"
26-
icon="expand-more"
25+
icon="remove"
2726
on-tap="{{decrease}}">
2827
</core-icon-button>
2928
<label id="valueDisplay"> {{value}} </label>
3029
<core-icon-button
3130
id="increaseButton"
32-
icon="expand-less"
31+
icon="add"
3332
on-tap="{{increase}}">
3433
</core-icon-button>
3534
</div>

‎test.html

Lines changed: 29 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,34 @@
11
<!DOCTYPE html>
22
<html>
3-
<form>
4-
<input id="teamId" type="text" name="teamId">
5-
<input type="file" name="photo" accept="image/*" capture>
6-
</form>
7-
8-
<div id="response"></div>
9-
3+
<link rel="import" href="auto-form.html">
4+
<link rel="import" href="bower_components/twbs-grid/twbs-grid.html">
5+
<link rel="import" href="number-counter.html">
6+
<link rel="import" href="bower_components/font-roboto/roboto.html">
7+
<link rel="import" href="bower_components/core-scaffold/core-scaffold.html">
8+
<link rel="import" href="bower_components/core-header-panel/core-header-panel.html">
9+
<link rel="import" href="bower_components/core-toolbar/core-toolbar.html">
10+
<link rel="import" href="bower_components/core-menu/core-menu.html">
11+
<link rel="import" href="bower_components/paper-item/paper-item.html">
12+
<link rel="import" href="bower_components/core-pages/core-pages.html">
13+
<link rel="import" href="bower_components/paper-dialog/paper-dialog.html">
14+
<link rel="import" href="bower_components/paper-shadow/paper-shadow.html">
15+
<link rel="import" href="number-counter.html">
16+
<link rel="import" href="outpost-engage.html">
17+
<link rel="import" href="outpost-header.html">
18+
<link rel="import" href="tele-op.html">
19+
<link rel="import" href="misc-input-panel.html">
20+
<link rel="import" href="auto-form.html">
21+
<link rel="import" href="strategy-screen.html">
22+
<link rel="import" href="bower_components/paper-toggle-button/paper-toggle-button.html">
23+
24+
<!--<form>-->
25+
<!--<input id="teamId" type="text" name="teamId">-->
26+
<!--<input type="file" name="photo" accept="image/*" capture>-->
27+
<!--</form>-->
28+
<!---->
29+
<!--<div id="response"></div>-->
30+
<!---->
31+
<auto-form></auto-form>
1032
<script type="text/javascript">
1133
var input = document.querySelector('input[type=file]');
1234

0 commit comments

Comments
 (0)