From 943037972112efd7703c2cb95168f67d8772c816 Mon Sep 17 00:00:00 2001 From: Albert Puig Date: Tue, 12 May 2015 11:17:27 +0200 Subject: [PATCH] Few updates on admin page --- Condorcet/static/css/main.css | 28 ++++++++++++++++++++++++++++ Condorcet/templates/admin.html | 24 ++++++++++++++++-------- 2 files changed, 44 insertions(+), 8 deletions(-) diff --git a/Condorcet/static/css/main.css b/Condorcet/static/css/main.css index a5f3c0c..6057a44 100644 --- a/Condorcet/static/css/main.css +++ b/Condorcet/static/css/main.css @@ -113,6 +113,12 @@ height: 25px; font-size: 14px; } +input.file_button { +width: 50%; +height: 25px; +font-size: 14px; +} + input[type=submit]:hover { background: #0068b5; color: #f1fbff; @@ -145,6 +151,23 @@ input[type="text"].focus,input[type="time"].focus, input[type="date"].focus { box-shadow: 0 0 5px 1px #969696; } +/* input[type="button"] { */ +.button { + margin: 0 0 1em 0; + background: #0073bb; + border: none; + width: 30%; + height: 25px; + font-size: 14px; + -webkit-border-radius: 50px; + -moz-border-radius: 50px; + border-radius: 50px; + color: #daf2fc; + text-align:center; + float: center; + } + + /* Draggable interface */ .container { /* height: 280px; */ @@ -159,6 +182,11 @@ input[type="text"].focus,input[type="time"].focus, input[type="date"].focus { box-sizing: border-box; } +.center { + float: center; + text-align:center; +} + .block { border:solid 2px; -webkit-border-radius: 20px; diff --git a/Condorcet/templates/admin.html b/Condorcet/templates/admin.html index 412267f..7ea6374 100644 --- a/Condorcet/templates/admin.html +++ b/Condorcet/templates/admin.html @@ -53,8 +53,8 @@

Admin page


- See results
+

@@ -67,13 +67,16 @@

Admin page


+
- -Website where to download list of authors
-
+ + + +
+
Voter list
Download current list of voters
@@ -81,12 +84,17 @@

Admin page

-Upload new list of voters: - - +Upload new list of voters
+
+

+
+ +
+
Results
+
+
{% endblock %}