merge everything back from mainline branch

[selectricity] / public / stylesheets / voter.css

diff --git a/public/stylesheets/voter.css b/public/stylesheets/voter.css
index ec14c847e48c6f4f55b198ed9964c643c2306ebe..5a38cae6f0edc054b19fc0f6cc630a9eba18840e 100644 (file)
--- a/public/stylesheets/voter.css
+++ b/public/stylesheets/voter.css
@@ -2,11 +2,25 @@ a {
     color: #005cd9;
 }
 
-#page-title .header {
+#title-header .header {
        background-color: #005cd9;
 }
 
-#page-title .subheader {
+#title-header .subheader {
        color: #005cd9;
        background-color: #e5e5e5;
 }
+
+#sortable_list {
+  display: float;
+  float: left;
+}
+
+li.moveable {
+  background-color: #c0d9fb;
+  border:1px solid #005cd9;
+  cursor: move;
+  padding: 4px;
+  margin: 4px;
+}
+