Merge pull request #14 from apuignav/master

Aesthetic modifications to draggable interface.
lhcb · Apr 8, 2015 · 48d7dfa · 48d7dfa
2 parents 349567f + 598b646
commit 48d7dfa
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/Condorcet/static/css/main.css b/Condorcet/static/css/main.css
@@ -95,6 +95,8 @@ input[type=submit] {
   background: #0073bb;
   border: none;
   font-size: 24px;
+  -webkit-border-radius: 50px;
+  -moz-border-radius: 50px;
   border-radius: 50px;
   color: #daf2fc;
 }
@@ -120,16 +122,21 @@ input[type=submit]:disabled {
   width: 100%;
   padding-left: 5% ;
   padding-right: 5% ;
-  margin-bottom: 20px;
+  margin-bottom: 30px;
+  margin-top: 30px;
   position: relative;
   overflow: hidden;
   -moz-box-sizing: border-box;
   box-sizing: border-box;
 }
 
 .block {
-  border:solid 1px;
+  border:solid 2px;
+  -webkit-border-radius: 20px;
+  -moz-border-radius: 20px;
+  border-radius: 20px;
   width: 40%;
+  padding-top: 10px;
   /* height: 250px; */
   position: relative;
   margin-left: auto;
@@ -140,6 +147,7 @@ input[type=submit]:disabled {
 .boxtitle {
   font-weight: bold;
   text-align: center;
+  /* color: #0073bb; */
 }
 
 .block__list_tags:after {

diff --git a/Condorcet/static/js/draggable.js b/Condorcet/static/js/draggable.js
@@ -50,6 +50,7 @@
     byId("voteButton").disabled = true ;
     // Nasty hack to get same size boxes
     byId("ranking").style.height = byId("pool").clientHeight + 'px';
+    byId("pool").style.height = byId("pool").clientHeight + 'px';
 
 	if (!console.log) {
 		console.log = function () {