diff options
| -rw-r--r-- | f/styles/style.css | 33 | ||||
| -rw-r--r-- | f/templates/adm.html | 11 | ||||
| -rw-r--r-- | f/templates/index.html | 5 |
3 files changed, 36 insertions, 13 deletions
diff --git a/f/styles/style.css b/f/styles/style.css index 639f4ff..246a201 100644 --- a/f/styles/style.css +++ b/f/styles/style.css @@ -1,7 +1,6 @@ body{
background-color:black;
color:white;
- width:600px;
}
#container_main{
font-size:24px;
@@ -13,17 +12,39 @@ body{ td:first-child{
text-align:right;
}
-#que td{
- padding-left:20px;
-}
#que{
-margin-top:50px;
+ margin-top:50px;
+ background-color:#202020;
+}
+#que table,#que th,#que td{
+ border:1px solid white;
+}
+#que td,th{
+ padding-left:10px;
+ padding-right:10px;
+}
+#que tr:nth-child(2){
+ background-color:darkgreen;
}
#addform{
-
+
}
#addbutton{
width:60px;
margin-left:auto;
margin-right:auto;
}
+#adminscreen{
+ border:3px solid #202020;
+ background-color:darkgreen;
+ font-size:72px;
+ width:400px;
+ margin-left:auto;
+ margin-top:50px;
+ margin-right:auto;
+ padding-left:20px;
+ padding-right:20px;
+}
+#adminscreen td {
+ padding-left:10px;
+}
diff --git a/f/templates/adm.html b/f/templates/adm.html index e8fd0f0..bd78764 100644 --- a/f/templates/adm.html +++ b/f/templates/adm.html @@ -1,6 +1,7 @@ <!doctype HTML> <html > <head> +<link rel="stylesheet" type="text/css" href="/f/styles/style.css"> <script src="f/scripts/angular/angular.min.js"></script> <script src="/socket.io/socket.io.js"></script> <script src="/f/scripts/client.js"></script> @@ -8,11 +9,11 @@ </head> <body ng-app="ioc" > <div ng-controller="ioctrl"> - <div ng-click="popfirst()" class="adminscreen"> - <div>Jonoa: {{qsize}}</div> - <div>Rivi: {{que[0].row}}</div> - <div>Nimi: {{que[0].name}}</div> - </div> + <table ng-click="popfirst()" id="adminscreen"> + <tr><td> Jonoa:</td><td> {{qsize}}</td></tr> + <tr><td>Nimi: </td><td> {{que[0].name}}</td></tr> + <tr><td>Rivi: </td><td> {{que[0].row}}</td></tr> + </table> </div> </body> </html> diff --git a/f/templates/index.html b/f/templates/index.html index ca72485..b75ee8a 100644 --- a/f/templates/index.html +++ b/f/templates/index.html @@ -23,12 +23,13 @@ <option value="9">9</option> <option value="10">10</option> </select></td></tr> - <tr><td> Nimi:</td> <td><input type="text" ng-model="name"></input></td></tr> + <tr><td> Nimi</td> <td><input type="text" ng-model="name"></input></td></tr> <tr><td></td><td> <button id="addbutton" ng-click="submit();">Lisää</button></td></tr> </table> <table id="que"> +<tr><th>Rivi</th><th>Nimi</th></tr> <tr ng-repeat="person in que"> - <td >Rivi {{person.row}}:</td> + <td >Rivi {{person.row}}</td> <td >{{person.name}}</td> </tr> </table> |