Skip to content

Commit 21f7a34

Browse files
committed
remove inline styles
1 parent 4a1157c commit 21f7a34

File tree

4 files changed

+55
-14
lines changed

4 files changed

+55
-14
lines changed

client/app/styles/main.scss

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,47 @@
11

22
// bower:scss
33
// endbower
4+
#mainquestion {
5+
font-size: 30px;
6+
}
7+
#mainq {
8+
font-size:20px;
9+
}
10+
.mainoptions {
11+
font-size:20px;
12+
margin:0 5px;
13+
padding:0 0 15px 0;
14+
}
15+
.card {
16+
padding-bottom: 20px;
17+
}
18+
.progress {
19+
height:30px;
20+
}
21+
.determinate {
22+
height:30px;
23+
}
24+
.question {
25+
font-size:20px;
26+
position:absolute;
27+
left:10px;
28+
z-index:100;
29+
width: 100px;
30+
}
31+
#mainquestionlabel {
32+
font-size: 20px;
33+
}
34+
.card-action {
35+
margin-left:25px;
36+
margin-right:25px;
37+
}
38+
.questions {
39+
font-size:20px;
40+
margin:10px;
41+
}
42+
#pieChart {
43+
padding: 20px;
44+
}
445
@media only screen and (max-device-width: 480px) {
546
body {
647
font-size: 14px;

client/app/views/main.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@
33
<div class="card blue darken-3">
44
<div class="card-content white-text">
55
<div class="input-field col s12 m12 l12">
6-
<input id="mainquestion" ng-model="title" type="text" class="validate" style="font-size:20px">
7-
<label for="mainquestion" id="mainquestionlabel" style="font-size:20px">Type your questions or options here</label>
6+
<input id="mainq" ng-model="title" type="text" class="validate">
7+
<label for="mainq" id="mainquestionlabel">Type your questions or options here</label>
88
</div>
99
<div class="input-field col s12 m12 l12" ng-repeat="option in options">
1010
<input id="option1" ng-model="option.name" ng-focus="addOption()" type="text" class="validate">
1111
<label ng-class="{active:option.name}" for="option{{$index + 1}}">Option {{$index + 1}}</label>
1212
</div>
1313
<div style="clear:both"></div>
1414
</div>
15-
<div class="card-action" style="margin-left:25px;margin-right:25px;">
15+
<div class="card-action">
1616
<p>
1717
<input type="checkbox" ng-model="multiple" id="multiple" />
1818
<label for="multiple" class='red-text text-lighten-5'>Allow multiple poll choices?</label>

client/app/views/results.html

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
<div class="row">
22
<div class="col s12 m12 l12">
3-
<div class="card blue darken-3" style="padding-bottom: 20px;">
3+
<div class="card blue darken-3">
44
<div class="card-content white-text">
55
<div class="col s12 m12 l12">
6-
<p style="font-size:30px" id="mainquestion">{{title}}</p>
6+
<p id="mainquestion">{{title}}</p>
77
</div>
88
<div class="col s6 m6 l6">
99
<div class="col s12 m12 l12" ng-repeat="option in options">
10-
<p style="font-size:20px;margin:0px 5px;padding:0px 0 15px 0;">
11-
<label for="test{{$index}}" style="font-size:20px" class='red-text text-lighten-5 questions'>{{option.name}}</label>
12-
<div class="progress" style="height:30px;background-color:{{option.highlight}}">
13-
<div class="determinate" style="background-color:{{option.color}} ;width: {{option.percent}};height:30px;">
14-
<p class="questions" style="font-size:20px;position:absolute;left:10px;z-index:100;width: 100px">Votes: {{option.votes}}</p>
10+
<p class="mainoptions">
11+
<label for="test{{$index}}" class='red-text text-lighten-5 questions'>{{option.name}}</label>
12+
<div class="progress" style="background-color:{{option.highlight}}">
13+
<div class="determinate" style="background-color:{{option.color}} ;width: {{option.percent}};">
14+
<p class="question">Votes: {{option.votes}}</p>
1515
</div>
1616
</div>
1717
</p>
1818
</div>
1919
</div>
2020
<div class="col s6 m6 l6">
21-
<canvas id="pieChart" width="100" height="100" style="padding: 20px;"></canvas>
21+
<canvas id="pieChart" width="100" height="100"></canvas>
2222
</div>
2323
<div style="clear:both"></div>
2424
</div>

client/app/views/vote.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@
33
<div class="card blue darken-3">
44
<div class="card-content white-text">
55
<div class="col s12 m12 l12">
6-
<p style="font-size:30px" id="mainquestion">{{title}}</p>
6+
<p id="mainquestion">{{title}}</p>
77
</div>
88
<div class="col s12 m12 l12" ng-repeat="option in options">
99
<p>
1010
<input ng-model="option.checked" ng-click="updateSelection($index, options)" type="checkbox" id="test{{$index}}" />
11-
<label for="test{{$index}}" style="font-size:20px;margin:10px" class='red-text text-lighten-5 questions'>{{option.name}}</label>
11+
<label for="test{{$index}}" class='red-text text-lighten-5 questions'>{{option.name}}</label>
1212
</p>
1313
</div>
1414
<div style="clear:both"></div>
1515
</div>
16-
<div class="card-action" style="margin-left:25px;margin-right:25px;">
16+
<div class="card-action">
1717
<a ng-click="vote(options)" class="waves-effect waves-light btn red lighten-2 red-text text-lighten-5">Submit Vote</a>
1818
</div>
1919
</div>

0 commit comments

Comments
 (0)