Author: humbedooh
Date: Tue Mar 17 15:09:16 2015
New Revision: 1667324
URL: http://svn.apache.org/r1667324
Log:
tidy up some transition effects, work in some prettier numbers
Modified:
steve/trunk/www/htdocs/steve_interactive.css
steve/trunk/www/htdocs/steve_interactive.js
Modified: steve/trunk/www/htdocs/steve_interactive.css
URL:
http://svn.apache.org/viewvc/steve/trunk/www/htdocs/steve_interactive.css?rev=1667324&r1=1667323&r2=1667324&view=diff
==============================================================================
--- steve/trunk/www/htdocs/steve_interactive.css (original)
+++ steve/trunk/www/htdocs/steve_interactive.css Tue Mar 17 15:09:16 2015
@@ -292,4 +292,27 @@ body, html {
* {
-webkit-user-select: none;
+}
+
+#ballot {
+ list-style: none;
+ text-align: left;
+}
+#ballot .ballotNumber {
+ /*background: linear-gradient(to bottom, #fccd41 0%,#cea202 100%);*/
+ background: linear-gradient(to bottom, #4f7bff 0%,#1444bc 100%);
+ border-radius: 12px;
+ border: 3px solid #FFF;
+ border-bottom-width: 4px;
+ color: #FFF;
+ box-shadow: 0px 2px 2px 0px rgba(153,153,153,1);
+ width: 20px;
+ float: left;
+ text-align: center;
+ font-family: sans-serif;
+ margin-right: 8px;
+ height: 16px;
+ font-size: 12px;
+ margin-bottom: 4px;
+ padding-top: 3px;
}
\ No newline at end of file
Modified: steve/trunk/www/htdocs/steve_interactive.js
URL:
http://svn.apache.org/viewvc/steve/trunk/www/htdocs/steve_interactive.js?rev=1667324&r1=1667323&r2=1667324&view=diff
==============================================================================
--- steve/trunk/www/htdocs/steve_interactive.js (original)
+++ steve/trunk/www/htdocs/steve_interactive.js Tue Mar 17 15:09:16 2015
@@ -343,6 +343,11 @@ function drawList() {
// Set style
outer.setAttribute("class", "ballotbox")
+ var no = document.createElement('div');
+ no.setAttribute("class", "ballotNumber")
+ no.innerHTML = (s)
+
+
// Above/below cutaway line? If so, draw it
if (s == seats) {
outer.style.borderBottom = "1px solid #A00"
@@ -366,14 +371,14 @@ function drawList() {
outer.setAttribute("draggable", "true")
outer.setAttribute("ondragstart", "dragVote(event)")
outer.setAttribute("ondragenter", "showLines(event)")
+ inner.append(no)
outer.appendChild(inner)
outer.setAttribute("title", "Drag to move " + el + " up or down on
the list")
outer.setAttribute("ondrop", "dropVote(event, false)")
if (el == source) {
- outer.style.transform = "scaleY(0)"
- outer.style.minHeight = "0px"
+ outer.style.opacity = "0"
}
// Add to box
@@ -435,9 +440,6 @@ function fadeIn(x, y) {
x = 1
}
document.getElementById(source).style.opacity = String(x)
- document.getElementById(source).style.height = (x*22) + "px"
- document.getElementById(source).style.fontSize = (x*16) + "px"
- document.getElementById(source).style.transform = "scaleY(" + x + ")"
document.getElementById(source).setAttribute("class", "ballotSelected")
